GH-2588: Do not generalize types for return and PHP version in status

phpactor · Mar 9, 2024 · 720c32e · 720c32e
1 parent 5f08992
commit 720c32e
Show file tree

Hide file tree

Showing 8 changed files with 80 additions and 11 deletions.
diff --git a/lib/CodeTransform/Adapter/WorseReflection/Transformer/UpdateReturnTypeTransformer.php b/lib/CodeTransform/Adapter/WorseReflection/Transformer/UpdateReturnTypeTransformer.php
@@ -40,7 +40,7 @@ public function transform(SourceCode $code): Promise
                 $classBuilder = $builder->class($method->class()->name()->short());
                 $methodBuilder = $classBuilder->method($method->name());
                 $replacement = $this->returnType($method);
-                $localReplacement = $replacement->toLocalType($method->scope())->generalize();
+                $localReplacement = $replacement->toLocalType($method->scope());
                 $notNullReplacement = $replacement->stripNullable();
 
                 foreach ($replacement->allTypes()->classLike() as $classType) {

diff --git a/lib/CodeTransform/Tests/Adapter/TolerantParser/Refactor/AbstractTolerantImportNameCase.php b/lib/CodeTransform/Tests/Adapter/TolerantParser/Refactor/AbstractTolerantImportNameCase.php
@@ -13,7 +13,7 @@
 use Phpactor\CodeTransform\Tests\Adapter\TolerantParser\TolerantTestCase;
 use Phpactor\TextDocument\TextEdits;
 
-abstract class AbstractTolerantImportNameTest extends TolerantTestCase
+abstract class AbstractTolerantImportNameCase extends TolerantTestCase
 {
     /**
      * @dataProvider provideImportClass

diff --git a/lib/CodeTransform/Tests/Adapter/TolerantParser/Refactor/TolerantImportNameOnlyTest.php b/lib/CodeTransform/Tests/Adapter/TolerantParser/Refactor/TolerantImportNameOnlyTest.php
@@ -9,7 +9,7 @@
 use Phpactor\TextDocument\ByteOffset;
 use Phpactor\TextDocument\TextEdits;
 
-class TolerantImportNameOnlyTest extends AbstractTolerantImportNameTest
+class TolerantImportNameOnlyTest extends AbstractTolerantImportNameCase
 {
     public function provideImportClass(): Generator
     {

diff --git a/lib/CodeTransform/Tests/Adapter/TolerantParser/Refactor/TolerantImportNameTest.php b/lib/CodeTransform/Tests/Adapter/TolerantParser/Refactor/TolerantImportNameTest.php
@@ -9,7 +9,7 @@
 use Phpactor\TextDocument\ByteOffset;
 use Phpactor\TextDocument\TextEdits;
 
-class TolerantImportNameTest extends AbstractTolerantImportNameTest
+class TolerantImportNameTest extends AbstractTolerantImportNameCase
 {
     public function provideImportClass(): Generator
     {

diff --git a/...deTransform/Tests/Adapter/WorseReflection/Transformer/UpdateReturnTypeTransformerTest.php b/...deTransform/Tests/Adapter/WorseReflection/Transformer/UpdateReturnTypeTransformerTest.php
@@ -175,6 +175,74 @@ private function baz(): void
                 }
                 EOT
         ];
+        yield 'adds false type' => [
+            <<<'EOT'
+                <?php
+
+                class Foobar {
+                    private function foo()
+                    {
+                        return $this->baz();
+                    }
+
+                    private function baz(): string|false
+                    {
+                    }
+                }
+                EOT
+            ,
+            <<<'EOT'
+                <?php
+
+                class Foobar {
+                    private function foo(): string|false
+                    {
+                        return $this->baz();
+                    }
+
+                    private function baz(): string|false
+                    {
+                    }
+                }
+                EOT
+        ];
+        yield 'adds array shape type' => [
+            <<<'EOT'
+                <?php
+
+                class Foobar {
+                    private function foo()
+                    {
+                        return $this->baz();
+                    }
+
+                    /**
+                     * @return array{string,string}
+                     */
+                    private function baz(): array
+                    {
+                    }
+                }
+                EOT
+            ,
+            <<<'EOT'
+                <?php
+
+                class Foobar {
+                    private function foo(): array
+                    {
+                        return $this->baz();
+                    }
+
+                    /**
+                     * @return array{string,string}
+                     */
+                    private function baz(): array
+                    {
+                    }
+                }
+                EOT
+        ];
     }
 
     /**

diff --git a/lib/Extension/Php/Model/ConstantPhpVersionResolver.php b/lib/Extension/Php/Model/ConstantPhpVersionResolver.php
@@ -16,6 +16,6 @@ public function resolve(): ?string
 
     public function name(): string
     {
-        return 'constant (user configured)';
+        return 'user configured';
     }
 }
diff --git a/lib/Extension/Php/Status/PhpStatusProvider.php b/lib/Extension/Php/Status/PhpStatusProvider.php
@@ -4,13 +4,13 @@
 
 use Phpactor\Extension\LanguageServer\Status\StatusProvider;
 use Phpactor\Extension\Php\Model\ChainResolver;
+use Phpactor\Extension\Php\Model\RuntimePhpVersionResolver;
 
 class PhpStatusProvider implements StatusProvider
 {
     public function __construct(
         private ChainResolver $chainResolver,
-    )
-    {
+    ) {
     }
 
     public function title(): string
@@ -21,8 +21,9 @@ public function title(): string
     public function provide(): array
     {
         return [
-            'version' => $this->chainResolver->resolve(),
+            'project' => $this->chainResolver->resolve(),
             'source' => $this->chainResolver->source(),
+            'runtime' => phpversion(),
         ];
     }
 }
diff --git a/lib/WorseReflection/Tests/Inference/type/false.test b/lib/WorseReflection/Tests/Inference/type/false.test
@@ -1,13 +1,13 @@
 <?php
 
+namespace Foo;
+
+wrAssertType('string|false', possiblyFalse());
 
 function possiblyFalse(array $foo): string|false
 {
 }
 
-wrAssertType('string|false', possiblyFalse());
-
-
 /**
  * @return string|false a formatted date string. If a non-numeric value is used for
  */