phpactor · dantleech · Mar 29, 2024 · Mar 24, 2024 · Mar 24, 2024 · Mar 25, 2024
diff --git a/doc/reference/configuration.rst b/doc/reference/configuration.rst
@@ -894,7 +894,7 @@ FilePathResolverExtension
 """""""""""""""""""""""""""""""""""
 
 
-**Default**: ``"\/home\/daniel\/www\/phpactor\/phpactor"``
+**Default**: ``"\/home\/mamazu\/packages\/phpactor\/phpactor"``
 
 
 .. _param_file_path_resolver.app_name:
@@ -1348,7 +1348,7 @@ Amount of time (in milliseconds) to wait before responding to a shutdown notific
 Internal use only - name path to Phpactor binary
 
 
-**Default**: ``"\/home\/daniel\/www\/phpactor\/phpactor\/lib\/Extension\/LanguageServer\/..\/..\/..\/bin\/phpactor"``
+**Default**: ``"\/home\/mamazu\/packages\/phpactor\/phpactor\/lib\/Extension\/LanguageServer\/..\/..\/..\/bin\/phpactor"``
 
 
 .. _param_language_server.self_destruct_timeout:

diff --git a/lib/Filesystem/Adapter/Git/GitFilesystem.php b/lib/Filesystem/Adapter/Git/GitFilesystem.php
@@ -49,7 +49,7 @@ public function fileList(): FileList
 
     public function remove(FilePath|string $path): void
     {
-        $path = FilePath::fromUnknown($path);
+        $path = FilePath::fromFilePathOrString($path);
         if (false === $this->trackedByGit($path)) {
             parent::remove($path);
             return;
@@ -65,8 +65,8 @@ public function remove(FilePath|string $path): void
 
     public function move(FilePath|string $srcPath, FilePath|string $destPath): void
     {
-        $srcPath = FilePath::fromUnknown($srcPath);
-        $destPath = FilePath::fromUnknown($destPath);
+        $srcPath = FilePath::fromFilePathOrString($srcPath);
+        $destPath = FilePath::fromFilePathOrString($destPath);
 
         if (false === $this->trackedByGit($srcPath)) {
             parent::move($srcPath, $destPath);
@@ -82,8 +82,8 @@ public function move(FilePath|string $srcPath, FilePath|string $destPath): void
 
     public function copy(FilePath|string $srcPath, FilePath|string $destPath): CopyReport
     {
-        $srcPath = FilePath::fromUnknown($srcPath);
-        $destPath = FilePath::fromUnknown($destPath);
+        $srcPath = FilePath::fromFilePathOrString($srcPath);
+        $destPath = FilePath::fromFilePathOrString($destPath);
         $list = parent::copy($srcPath, $destPath);
         $this->exec(['add', $destPath->__toString()]);
 

diff --git a/lib/Filesystem/Adapter/Simple/SimpleFilesystem.php b/lib/Filesystem/Adapter/Simple/SimpleFilesystem.php
@@ -35,23 +35,23 @@ public function fileList(): FileList
 
     public function remove(FilePath|string $path): void
     {
-        $path = FilePath::fromUnknown($path);
+        $path = FilePath::fromFilePathOrString($path);
         $this->filesystem->remove($path);
     }
 
     public function move(FilePath|string $srcLocation, FilePath|string $destPath): void
     {
-        $srcLocation = FilePath::fromUnknown($srcLocation);
-        $destPath = FilePath::fromUnknown($destPath);
+        $srcLocation = FilePath::fromFilePathOrString($srcLocation);
+        $destPath = FilePath::fromFilePathOrString($destPath);
 
         $this->makeDirectoryIfNotExists((string) $destPath);
         $this->filesystem->rename($srcLocation->__toString(), $destPath->__toString());
     }
 
     public function copy(FilePath|string $srcLocation, FilePath|string $destPath): CopyReport
     {
-        $srcLocation = FilePath::fromUnknown($srcLocation);
-        $destPath = FilePath::fromUnknown($destPath);
+        $srcLocation = FilePath::fromFilePathOrString($srcLocation);
+        $destPath = FilePath::fromFilePathOrString($destPath);
 
         if ($srcLocation->isDirectory()) {
             return $this->copyDirectory($srcLocation, $destPath);
@@ -77,7 +77,7 @@ public function createPath(string $path): FilePath
 
     public function getContents(FilePath|string $path): string
     {
-        $path = FilePath::fromUnknown($path);
+        $path = FilePath::fromFilePathOrString($path);
         $contents = file_get_contents($path->path());
 
         if (false === $contents) {
@@ -89,13 +89,13 @@ public function getContents(FilePath|string $path): string
 
     public function writeContents(FilePath|string $path, string $contents): void
     {
-        $path = FilePath::fromUnknown($path);
+        $path = FilePath::fromFilePathOrString($path);
         file_put_contents($path->path(), $contents);
     }
 
     public function exists(FilePath|string $path): bool
     {
-        $path = FilePath::fromUnknown($path);
+        $path = FilePath::fromFilePathOrString($path);
         return file_exists($path);
     }
 

diff --git a/lib/Filesystem/Domain/FileList.php b/lib/Filesystem/Domain/FileList.php
@@ -26,7 +26,6 @@ private function __construct(private Iterator $iterator)
     {
     }
 
-
     public static function fromIterator(Iterator $iterator): self
     {
         return new self($iterator);

diff --git a/lib/Filesystem/Domain/FilePath.php b/lib/Filesystem/Domain/FilePath.php
@@ -29,6 +29,9 @@ public static function fromString(string $string): FilePath
         return new self($textDocumentUri);
     }
 
+    /**
+     * @param array<string> $parts
+     */
     public static function fromParts(array $parts): FilePath
     {
         $path = Path::join(...$parts);
@@ -45,7 +48,7 @@ public static function fromSplFileInfo(SplFileInfo $fileInfo): FilePath
         return self::fromString((string) $fileInfo);
     }
 
-    public static function fromUnknown($path): FilePath
+    public static function fromFilePathOrString(FilePath|string $path): FilePath
     {
         if ($path instanceof FilePath) {
             return $path;
@@ -54,19 +57,6 @@ public static function fromUnknown($path): FilePath
         if (is_string($path)) {
             return self::fromString($path);
         }
-
-        if (is_array($path)) {
-            return self::fromParts($path);
-        }
-
-        if ($path instanceof SplFileInfo) {
-            return self::fromSplFileInfo($path);
-        }
-
-        throw new RuntimeException(sprintf(
-            'Do not know how to create FilePath from "%s"',
-            is_object($path) ? get_class($path) : gettype($path)
-        ));
     }
 
     public function isDirectory(): bool

diff --git a/lib/Filesystem/Domain/FilesystemRegistry.php b/lib/Filesystem/Domain/FilesystemRegistry.php
@@ -8,5 +8,8 @@ public function get(string $name): Filesystem;
 
     public function has(string $name): bool;
 
+    /**
+     * @return array<string>
+     */
     public function names(): array;
 }
diff --git a/lib/Filesystem/Domain/MappedFilesystemRegistry.php b/lib/Filesystem/Domain/MappedFilesystemRegistry.php
@@ -35,7 +35,6 @@ public function has(string $name): bool
         return isset($this->filesystems[$name]);
     }
 
-    /** @return array<string> */
     public function names(): array
     {
         return array_keys($this->filesystems);

diff --git a/lib/Filesystem/Tests/Adapter/AdapterTestCase.php b/lib/Filesystem/Tests/Adapter/AdapterTestCase.php
@@ -6,8 +6,6 @@
 
 abstract class AdapterTestCase extends IntegrationTestCase
 {
-    private $filesystem;
-
     public function setUp(): void
     {
         $this->initWorkspace();

diff --git a/lib/Filesystem/Tests/Adapter/IntegrationTestCase.php b/lib/Filesystem/Tests/Adapter/IntegrationTestCase.php
@@ -17,7 +17,7 @@ protected function initWorkspace(): void
         $filesystem->mkdir($this->workspacePath());
     }
 
-    protected function workspacePath()
+    protected function workspacePath(): string
     {
         return realpath(__DIR__.'/..') . '/Workspace';
     }
@@ -31,7 +31,7 @@ protected function loadProject(): void
         exec('composer dumpautoload 2> /dev/null');
     }
 
-    protected function getProjectAutoloader()
+    protected function getProjectAutoloader(): string
     {
         return require __DIR__.'/project/vendor/autoload.php';
     }

diff --git a/lib/Filesystem/Tests/Unit/Domain/FilePathTest.php b/lib/Filesystem/Tests/Unit/Domain/FilePathTest.php
@@ -2,14 +2,14 @@
 
 namespace Phpactor\Filesystem\Tests\Unit\Domain;
 
+use Generator;
 use PHPUnit\Framework\TestCase;
 use Phpactor\Filesystem\Domain\FilePath;
 use Phpactor\TextDocument\Exception\InvalidUriException;
 use Phpactor\TextDocument\TextDocumentUri;
 use RuntimeException;
 use SplFileInfo;
 use Symfony\Component\Filesystem\Path;
-use stdClass;
 
 class FilePathTest extends TestCase
 {
@@ -30,16 +30,19 @@ public function testFromParts(): void
     }
 
     /**
-     * @dataProvider provideUnknown
+     * @dataProvider provideFilePathOrString
      */
-    public function testFromUnknownWith($path, string $expectedPath): void
+    public function testFromFilePathOrString(FilePath|string $path, string $expectedPath): void
     {
-        $filePath = FilePath::fromUnknown($path);
+        $filePath = FilePath::fromFilePathOrString($path);
         $this->assertInstanceOf(FilePath::class, $filePath);
         $this->assertEquals($expectedPath, (string) $filePath);
     }
 
-    public function provideUnknown()
+    /**
+     * @return Generator<string,array{FilePath|string,string}>
+     */
+    public function provideFilePathOrString(): Generator
     {
         yield 'FilePath instance' => [
             FilePath::fromString('/foo.php'),
@@ -65,39 +68,23 @@ public function provideUnknown()
             'phar:///foo.php',
             '/foo.php',
         ];
-
-        yield 'array' => [
-            [ 'one', 'two' ],
-            '/one/two'
-        ];
-
-        yield 'SplFileInfo' => [
-            new SplFileInfo(__FILE__),
-            Path::canonicalize(__FILE__)
-        ];
-        yield 'SplFileInfo with scheme' => [
-            new SplFileInfo((string)TextDocumentUri::fromString(__FILE__)),
-            Path::canonicalize(__FILE__)
-        ];
     }
 
     /**
      * @dataProvider provideUnsupportedInput
      */
-    public function testThrowExceptionOnUnknowableType($input, string $expectedExceptionMessage): void
+    public function testThrowExceptionOnUnknowableType(string $input, string $expectedExceptionMessage): void
     {
         $this->expectException(RuntimeException::class);
         $this->expectExceptionMessage($expectedExceptionMessage);
-        FilePath::fromUnknown($input);
+        FilePath::fromString($input);
     }
 
-    public function provideUnsupportedInput()
+    /**
+     * @return Generator<string,array{string,string}>
+     */
+    public function provideUnsupportedInput(): Generator
     {
-        yield 'object' => [
-            new stdClass(),
-            'Do not know',
-        ];
-
         yield 'unsupported scheme' => [
             'ftp://host/foo.php',
             'are supported', // only X schemes are supported
@@ -186,7 +173,7 @@ public function testIsNamed(): void
 
     public function testAsSplFileInfo(): void
     {
-        $path1 = FilePath::fromUnknown(new SplFileInfo((string)TextDocumentUri::fromString(__FILE__)));
+        $path1 = FilePath::fromSplFileInfo(new SplFileInfo((string)TextDocumentUri::fromString(__FILE__)));
         self::assertEquals(Path::canonicalize(__FILE__), $path1->__toString());
         self::assertEquals(Path::canonicalize(__FILE__), $path1->asSplFileInfo()->__toString());
     }

diff --git a/lib/Filesystem/Tests/Unit/Domain/MappedFilesystemRegistryTest.php b/lib/Filesystem/Tests/Unit/Domain/MappedFilesystemRegistryTest.php
@@ -55,7 +55,8 @@ public function testExceptionOnNotFound(): void
         $registry->get('barfoo');
     }
 
-    private function createRegistry(array $filesystems)
+    /** @param array<string, Filesystem> $filesystems */
+    private function createRegistry(array $filesystems): MappedFilesystemRegistry
     {
         return new MappedFilesystemRegistry($filesystems);
     }

diff --git a/lib/TextDocument/Location.php b/lib/TextDocument/Location.php
@@ -18,17 +18,6 @@ public static function fromPathAndOffsets(string $path, int $start, int $end): s
         );
     }
 
-    /**
-    * @deprecated Use fromPathAndOffsets instead
-    */
-    public static function fromPathAndOffset(string $path, int $offset): self
-    {
-        return new self(
-            TextDocumentUri::fromString($path),
-            ByteOffsetRange::fromInts($offset, $offset),
-        );
-    }
-
     public function uri(): TextDocumentUri
     {
         return $this->uri;

diff --git a/lib/WorseReflection/Bridge/TolerantParser/Reflection/AbstractReflectionClass.php b/lib/WorseReflection/Bridge/TolerantParser/Reflection/AbstractReflectionClass.php
@@ -11,7 +11,6 @@
 use Phpactor\WorseReflection\Core\Reflection\Collection\ReflectionMethodCollection as PhpactorReflectionMethodCollection;
 use Phpactor\WorseReflection\Core\Reflection\Collection\ReflectionTraitCollection;
 use Phpactor\WorseReflection\Core\Reflection\ReflectionClassLike;
-use Phpactor\WorseReflection\Core\Reflection\ReflectionEnum;
 use Phpactor\WorseReflection\Core\TemplateMap;
 use Phpactor\WorseReflection\Core\TypeFactory;
 use Phpactor\WorseReflection\Core\Type\ReflectedClassType;
@@ -22,21 +21,6 @@ abstract class AbstractReflectionClass extends AbstractReflectedNode implements
     abstract public function name(): ClassName;
     abstract public function docblock(): DocBlock;
 
-    public function isInterface(): bool
-    {
-        return $this instanceof ReflectionInterface;
-    }
-
-    public function isTrait(): bool
-    {
-        return $this instanceof ReflectionTrait;
-    }
-
-    public function isEnum(): bool
-    {
-        return $this instanceof ReflectionEnum;
-    }
-
     public function isClass(): bool
     {
         return $this instanceof ReflectionClass;

diff --git a/lib/WorseReflection/Bridge/TolerantParser/Reflection/ReflectionClass.php b/lib/WorseReflection/Bridge/TolerantParser/Reflection/ReflectionClass.php
@@ -300,11 +300,7 @@ public function sourceCode(): TextDocument
 
     public function isConcrete(): bool
     {
-        if (false === $this->isClass()) {
-            return false;
-        }
-
-        return false === $this->isAbstract();
+        return !$this->isAbstract();
     }
 
     public function docblock(): DocBlock

diff --git a/lib/WorseReflection/Core/Reflection/ReflectionClassLike.php b/lib/WorseReflection/Core/Reflection/ReflectionClassLike.php
@@ -32,21 +32,8 @@ public function ownMembers(): ReflectionMemberCollection;
 
     public function sourceCode(): TextDocument;
 
-    /**
-     * @deprecated Use instanceof instead
-     */
-    public function isInterface(): bool;
-
     public function isInstanceOf(ClassName $className): bool;
 
-
-    /**
-     * @deprecated Use instanceof instead
-     */
-    public function isClass(): bool;
-
-    public function isEnum(): bool;
-
     public function isConcrete(): bool;
 
     public function docblock(): DocBlock;
-Original file line number
+Diff line change
@@ Expand Up / @@ -26,7 +26,6 @@ private function __construct(private Iterator $iterator) @@
         {
         }
         public static function fromIterator(Iterator $iterator): self
         {
             return new self($iterator);
@@ Expand Down @@