Remove directory class

UPGRADE.md

@@ -89,3 +89,10 @@ The `Token::NAME_TYPE` has been split in four:
 - $token->getPosition();
 + $token->getLinePosition();
 ```
+
+### Directory
+
+```diff
+- (new Directory($dir))->getRelativePathTo($file);
++ FileHelper::getRelativePath($file, $dir);
+```

src/Cache/Manager/FileCacheManager.php

@@ -5,10 +5,10 @@
 namespace TwigCsFixer\Cache\Manager;
 
 use TwigCsFixer\Cache\Cache;
-use TwigCsFixer\Cache\Directory;
 use TwigCsFixer\Cache\FileHandler\CacheFileHandlerInterface;
 use TwigCsFixer\Cache\Signature;
 use TwigCsFixer\Exception\CannotWriteCacheException;
+use TwigCsFixer\File\FileHelper;
 
 /**
  * Class supports caching information about state of fixing files.
@@ -26,13 +26,13 @@ final class FileCacheManager implements CacheManagerInterface
 {
     private Cache $cache;
 
-    private Directory $cacheDirectory;
+    private string $cacheDirectory;
 
     public function __construct(
         private CacheFileHandlerInterface $handler,
         private Signature $signature
     ) {
-        $this->cacheDirectory = new Directory(\dirname($handler->getFile()));
+        $this->cacheDirectory = \dirname($handler->getFile());
 
         $this->readCache();
     }
@@ -67,14 +67,14 @@ public function __wakeup(): void
 
     public function needFixing(string $file, string $fileContent): bool
     {
-        $file = $this->cacheDirectory->getRelativePathTo($file);
+        $file = FileHelper::getRelativePath($file, $this->cacheDirectory);
 
         return !$this->cache->has($file) || $this->cache->get($file) !== $this->calcHash($fileContent);
     }
 
     public function setFile(string $file, string $fileContent): void
     {
-        $file = $this->cacheDirectory->getRelativePathTo($file);
+        $file = FileHelper::getRelativePath($file, $this->cacheDirectory);
 
         $hash = $this->calcHash($fileContent);
 

src/File/FileHelper.php

@@ -20,6 +20,25 @@ public static function detectEOL(string $content): string
         return $matches[0] ?? \PHP_EOL;
     }
 
+    public static function normalizePath(string $path): string
+    {
+        return str_replace(['\\', '/'], \DIRECTORY_SEPARATOR, $path);
+    }
+
+    public static function getRelativePath(string $path, string $baseDir): string
+    {
+        $path = static::normalizePath($path);
+
+        if (
+            '' === $baseDir
+            || 0 !== stripos($path, $baseDir.\DIRECTORY_SEPARATOR)
+        ) {
+            return $path;
+        }
+
+        return substr($path, \strlen($baseDir) + 1);
+    }
+
     public static function getAbsolutePath(string $path, ?string $workingDir = null): string
     {
         if (Path::isAbsolute($path)) {

tests/File/FileHelperTest.php

@@ -29,6 +29,34 @@ public static function detectEOLDataProvider(): iterable
         yield ["foo\r\n", "\r\n"];
     }
 
+    /**
+     * @dataProvider getRelativePathToDataProvider
+     */
+    public function testGetRelativePathTo(string $directoryName, string $file, string $expected): void
+    {
+        static::assertSame($expected, FileHelper::getRelativePath($file, $directoryName));
+    }
+
+    /**
+     * @return iterable<array-key, array{string, string, string}>
+     */
+    public static function getRelativePathToDataProvider(): iterable
+    {
+        $slash = \DIRECTORY_SEPARATOR;
+
+        yield ['', 'foo.php', 'foo.php'];
+        yield ['', '/foo.php', $slash.'foo.php'];
+        yield ['', '\foo.php', $slash.'foo.php'];
+        yield ['directory', 'foo.php', 'foo.php'];
+        yield ['directory', 'directory.php', 'directory.php'];
+        yield ['directory', 'directory/foo.php', 'foo.php'];
+        yield ['directory', 'directory\foo.php', 'foo.php'];
+        yield ['directory', '/foo.php', $slash.'foo.php'];
+        yield ['directory', '\foo.php', $slash.'foo.php'];
+        yield ['directory', '/directory/foo.php', $slash.'directory'.$slash.'foo.php'];
+        yield ['directory', '\directory\foo.php', $slash.'directory'.$slash.'foo.php'];
+    }
+
     /**
      * @dataProvider removeDotDataProvider
      */