Skip to content

Commit

Permalink
Update CL
Browse files Browse the repository at this point in the history
  • Loading branch information
dantleech committed Mar 9, 2024
1 parent 720c32e commit 9d96ccf
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 9 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Expand Up @@ -21,9 +21,11 @@ Improvements:
- Remove "on develop warning" service #2533
- Disable the processing of includes/requires, it doesn't work very well but
it has massive performance impact on certain projects #2580
- Include project PHP and runtime version and LSP status

Bug fixes:

- Do not generalize generated return types (i.e. false instead of bool) #2588
- Fix diagnostic process concurrency and do not lint outdated files #2538
- Upgrade `amp/process` to fix #2516 thanks to @gerardroche
- Fix division by zero edge case
Expand Down
Expand Up @@ -204,7 +204,10 @@ abstract public function provideImportFunction(): Generator;

abstract protected function importName(string $source, int $offset, NameImport $nameImport, bool $importGlobals = true): TextEdits;

private function importNameFromTestFile(string $type, string $test, string $name, string $alias = null)
/**
* @return array{string,string}
*/
private function importNameFromTestFile(string $type, string $test, string $name, string $alias = null): array
{
[$source, $expected, $offset] = $this->sourceExpectedAndOffset(__DIR__ . '/fixtures/' . $test);
$edits = TextEdits::none();
Expand Down
12 changes: 6 additions & 6 deletions lib/Extension/Php/PhpExtension.php
Expand Up @@ -5,7 +5,6 @@
use Phpactor\Container\Container;
use Phpactor\Container\ContainerBuilder;
use Phpactor\Container\Extension;
use Phpactor\Extension\LanguageServer\LanguageServerExtension;
use Phpactor\Extension\Php\Model\ChainResolver;
use Phpactor\Extension\Php\Model\ComposerPhpVersionResolver;
use Phpactor\Extension\Php\Model\ConstantPhpVersionResolver;
Expand All @@ -22,7 +21,7 @@ class PhpExtension implements Extension

public function load(ContainerBuilder $container): void
{
$container->register(PhpVersionResolver::class, function (Container $container) {
$container->register(ChainResolver::class, function (Container $container) {
$pathResolver = $container->get(FilePathResolverExtension::SERVICE_FILE_PATH_RESOLVER);
$composerPath = $pathResolver->resolve('%project_root%/composer.json');

Expand All @@ -32,12 +31,13 @@ public function load(ContainerBuilder $container): void
new RuntimePhpVersionResolver()
);
});
$container->register(PhpVersionResolver::class, function (Container $container) {
return $container->get(ChainResolver::class);
});

$container->register(PhpStatusProvider::class, function (Container $container) {
return new PhpStatusProvider($container->get(PhpVersionResolver::class));
}, [
LanguageServerExtension::TAG_STATUS_PROVIDER => [],
]);
return new PhpStatusProvider($container->get(ChainResolver::class));
}, []);
}


Expand Down
3 changes: 1 addition & 2 deletions lib/Extension/Php/Status/PhpStatusProvider.php
Expand Up @@ -4,7 +4,6 @@

use Phpactor\Extension\LanguageServer\Status\StatusProvider;
use Phpactor\Extension\Php\Model\ChainResolver;
use Phpactor\Extension\Php\Model\RuntimePhpVersionResolver;

class PhpStatusProvider implements StatusProvider
{
Expand All @@ -21,7 +20,7 @@ public function title(): string
public function provide(): array
{
return [
'project' => $this->chainResolver->resolve(),
'project' => (string)$this->chainResolver->resolve(),
'source' => $this->chainResolver->source(),
'runtime' => phpversion(),
];
Expand Down

0 comments on commit 9d96ccf

Please sign in to comment.