drop chevere/filesystem

Author: rodber

composer.json

@@ -21,12 +21,12 @@
         "php": "^8.1",
         "ext-curl": "*",
         "ext-json": "*",
-        "chevere/filesystem": "^1.0.3",
         "chevere/message": "^1.0.0",
+        "chevere/parameter": "^2.0.x-dev",
         "chevere/standard": "^1.0.1",
         "chevere/throwable-handler": "^1.0.7",
         "chevere/trace": "^2.0.2",
-        "chevere/var-dump": "^2.0.6",
+        "chevere/var-dump": "^2.0.x-dev",
         "phpseclib/phpseclib": "~3.0"
     },
     "require-dev": {
@@ -61,7 +61,7 @@
         ],
         "infection": [
             "Composer\\Config::disableProcessTimeout",
-            "infection --only-covered -j10"
+            "infection -j10"
         ],
         "infection-filter": "sh -c 'sh -c \"composer infection -- --filter=$0 --test-framework-options=--filter=$0\"' $1",
         "phpstan": "vendor/bin/phpstan analyze src/ --memory-limit 512M --level 9",

src/Interfaces/XrInterface.php

@@ -13,16 +13,14 @@
 
 namespace Chevere\xrDebug\PHP\Interfaces;
 
-use Chevere\Filesystem\Interfaces\DirectoryInterface;
-
 /**
  * Describes the component in charge of defining XR.
  */
 interface XrInterface
 {
     public const CONFIG_NAMES = ['isEnabled', 'isHttps', 'host', 'port', 'key'];
 
-    public function withConfigDir(DirectoryInterface $config): self;
+    public function withConfigDir(string $config): self;
 
     public function isEnabled(): bool;
 

src/Xr.php

@@ -13,19 +13,21 @@
 
 namespace Chevere\xrDebug\PHP;
 
-use Chevere\Filesystem\Interfaces\DirectoryInterface;
 use Chevere\xrDebug\PHP\Interfaces\ClientInterface;
 use Chevere\xrDebug\PHP\Interfaces\XrInterface;
 use phpseclib3\Crypt\EC\PrivateKey;
 use phpseclib3\Crypt\PublicKeyLoader;
 use Throwable;
-use function Chevere\Filesystem\filePhpReturnForPath;
+use function Chevere\Parameter\arrayp;
+use function Chevere\Parameter\bool;
+use function Chevere\Parameter\int;
+use function Chevere\Parameter\string;
 
 final class Xr implements XrInterface
 {
     private ClientInterface $client;
 
-    private DirectoryInterface $directory;
+    private string $directory;
 
     private string $configFile = '';
 
@@ -46,7 +48,7 @@ public function __construct(
         $this->setClient();
     }
 
-    public function withConfigDir(DirectoryInterface $config): XrInterface
+    public function withConfigDir(string $config): XrInterface
     {
         $new = clone $this;
         $new->directory = $config;
@@ -99,9 +101,17 @@ public function key(): string
 
     private function setConfigFromFile(): void
     {
+        $arrayp = arrayp(
+            isEnabled: bool(),
+            isHttps: bool(),
+            host: string(),
+            port: int(),
+            key: string(),
+        )->withMakeOptional();
+
         try {
             /** @var array<string, string|int|bool> $return */
-            $return = filePhpReturnForPath($this->configFile)->cast()->array();
+            $return = $arrayp(require $this->configFile);
             foreach (static::CONFIG_NAMES as $prop) {
                 // @phpstan-ignore-next-line
                 $this->{$prop} = $return[$prop] ?? $this->{$prop};
@@ -116,7 +126,7 @@ private function setConfigFromFile(): void
 
     private function getConfigFile(): string
     {
-        $configDirectory = $this->directory->path()->__toString();
+        $configDirectory = $this->directory;
         while (is_dir($configDirectory)) {
             foreach ($this->configNames as $configName) {
                 $configFullPath = $configDirectory . $configName;

src/functions.php

@@ -19,7 +19,6 @@
     use LogicException;
     use phpseclib3\Crypt\EC\PrivateKey;
     use Throwable;
-    use function Chevere\Filesystem\directoryForPath;
     use function Chevere\Writer\streamTemp;
     use function getcwd;
 
@@ -44,10 +43,7 @@ function getXr(): XrInterface
             if ($cwd === false) {
                 throw new LogicException('Unable to get current working directory');
             }
-            $xr = (new Xr())
-                ->withConfigDir(
-                    directoryForPath($cwd)
-                );
+            $xr = (new Xr())->withConfigDir($cwd);
 
             return (new XrInstance($xr))::get();
         }

tests/XrTest.php

@@ -19,7 +19,6 @@
 use phpseclib3\Crypt\EC;
 use phpseclib3\Crypt\PublicKeyLoader;
 use PHPUnit\Framework\TestCase;
-use function Chevere\Filesystem\directoryForPath;
 
 final class XrTest extends TestCase
 {
@@ -57,27 +56,23 @@ public function testConstructWithArguments(): void
     public function testConstructWithoutSettingsFileSubfolder(): void
     {
         $xr = new Xr();
-        $with = $xr->withConfigDir(
-            directoryForPath(__DIR__ . '/_empty/_empty/')
-        );
+        $with = $xr->withConfigDir(__DIR__ . '/_empty/_empty/');
         $this->assertNotSame($xr, $with);
         $this->assertSame(true, $with->isEnabled());
         $this->assertEquals(new Client(), $with->client());
     }
 
     public function testConstructWithDirNotExists(): void
     {
-        $xr = (new Xr())->withConfigDir(
-            directoryForPath(__DIR__ . '/_not-found/')
-        );
+        $xr = (new Xr())->withConfigDir(__DIR__ . '/_not-found/');
         $this->assertSame(true, $xr->isEnabled());
         $this->assertEquals(new Client(), $xr->client());
     }
 
     public function testConstructWithSettingsFile(): void
     {
-        $configDir = directoryForPath(__DIR__ . '/src/');
-        $return = include $configDir->path()->getChild('xr.php')->__toString();
+        $configDir = __DIR__ . '/src/';
+        $return = include "{$configDir}/xr.php";
         $xr = (new Xr())->withConfigDir($configDir);
         $this->assertSame($return['isEnabled'], $xr->isEnabled());
         $return['privateKey'] = PublicKeyLoader::load($return['key']);