wip #41 remove filesystem dep

chevere · May 16, 2024 · 73835c1 · 73835c1
1 parent e11b7b1
commit 73835c1
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 42 deletions.
diff --git a/composer.json b/composer.json
@@ -20,7 +20,6 @@
  "chevere/regex": "^1.0.1"
  },
  "require-dev": {
- "chevere/filesystem": "^1.0.0",
  "phpstan/phpstan": "^1.9",
  "phpunit/phpunit": "^9.5",
  "symplify/easy-coding-standard": "^11.1"

diff --git a/tests/JobTest.php b/tests/JobTest.php
@@ -15,7 +15,6 @@
 
 use ArgumentCountError;
 use BadMethodCallException;
-use Chevere\Filesystem\Interfaces\PathInterface;
 use Chevere\Tests\src\TestActionNoParams;
 use Chevere\Tests\src\TestActionNoParamsIntResponse;
 use Chevere\Tests\src\TestActionObjectConflict;
@@ -25,6 +24,7 @@
 use InvalidArgumentException;
 use OverflowException;
 use PHPUnit\Framework\TestCase;
+use stdClass;
 use function Chevere\Workflow\response;
 use function Chevere\Workflow\variable;
 
@@ -190,7 +190,7 @@ public function testWithMissingArgument(): void
  $this->expectException(BadMethodCallException::class);
  $this->expectExceptionMessage(
  'Missing argument(s) [`'
- . PathInterface::class
+ . stdClass::class
  . ' path`] for `'
  . TestActionObjectConflict::class
  . '`'

diff --git a/tests/RunnerParallelTest.php b/tests/RunnerParallelTest.php
@@ -13,41 +13,45 @@
 
 namespace Chevere\Tests;
 
-use Chevere\Filesystem\File;
-use Chevere\Filesystem\Interfaces\DirectoryInterface;
-use Chevere\Filesystem\Interfaces\FileInterface;
 use Chevere\Tests\src\TestActionFileWrite;
 use PHPUnit\Framework\TestCase;
-use function Chevere\Filesystem\directoryForPath;
 use function Chevere\Workflow\async;
 use function Chevere\Workflow\run;
 use function Chevere\Workflow\workflow;
 
 final class RunnerParallelTest extends TestCase
 {
- private DirectoryInterface $directory;
+ private string $directory;
 
- private FileInterface $file;
+ private string $file;
 
  protected function setUp(): void
  {
- $this->directory = directoryForPath(__DIR__ . '/_resources');
- $this->directory->createIfNotExists();
- $this->file = new File(
- $this->directory->path()->getChild('output-parallel')
- );
+ $this->directory = __DIR__ . '/_resources/';
+ if (! is_dir($this->directory)) {
+ mkdir($this->directory);
+ }
+ $this->file = $this->directory . 'output-parallel';
+ if (file_exists($this->file)) {
+ unlink($this->file);
+ }
  }
 
  protected function tearDown(): void
  {
- $this->directory->removeIfExists();
+ if (file_exists($this->file)) {
+ unlink($this->file);
+ }
+ if (is_dir($this->directory)) {
+ rmdir($this->directory);
+ }
  }
 
  public function testParallelRunner(): void
  {
- $this->file->removeIfExists();
- $this->file->create();
- $this->file->put('');
+ if (file_put_contents($this->file, '') === false) {
+  $this->markTestIncomplete('Unable to write to file');
+ }
  $workflow = workflow(
  j1: async(
  new TestActionFileWrite(),
@@ -60,9 +64,8 @@ public function testParallelRunner(): void
  );
  run($workflow);
  $this->assertStringEqualsFile(
- $this->file->path()->__toString(),
+ $this->file,
  '^^$$'
  );
- $this->file->removeIfExists();
  }
 }
diff --git a/tests/RunnerSequentialTest.php b/tests/RunnerSequentialTest.php
@@ -13,41 +13,45 @@
 
 namespace Chevere\Tests;
 
-use Chevere\Filesystem\File;
-use Chevere\Filesystem\Interfaces\DirectoryInterface;
-use Chevere\Filesystem\Interfaces\FileInterface;
 use Chevere\Tests\src\TestActionFileWrite;
 use PHPUnit\Framework\TestCase;
-use function Chevere\Filesystem\directoryForPath;
 use function Chevere\Workflow\async;
 use function Chevere\Workflow\run;
 use function Chevere\Workflow\workflow;
 
 final class RunnerSequentialTest extends TestCase
 {
- private DirectoryInterface $directory;
+ private string $directory;
 
- private FileInterface $file;
+ private string $file;
 
  protected function setUp(): void
  {
- $this->directory = directoryForPath(__DIR__ . '/_resources');
- $this->directory->createIfNotExists();
- $this->file = new File(
- $this->directory->path()->getChild('output-sequential')
- );
+ $this->directory = __DIR__ . '/_resources/';
+ if (! is_dir($this->directory)) {
+ mkdir($this->directory);
+ }
+ $this->file = $this->directory . 'output-sequential';
+ if (file_exists($this->file)) {
+ unlink($this->file);
+ }
  }
 
  protected function tearDown(): void
  {
- $this->directory->removeIfExists();
+ if (file_exists($this->file)) {
+ unlink($this->file);
+ }
+ if (is_dir($this->directory)) {
+ rmdir($this->directory);
+ }
  }
 
  public function testSequentialRunner(): void
  {
- $this->file->removeIfExists();
- $this->file->create();
- $this->file->put('');
+ if (file_put_contents($this->file, '') === false) {
+  $this->markTestIncomplete('Unable to write to file');
+ }
  $workflow = workflow(
  j1: async(
  new TestActionFileWrite(),
@@ -60,9 +64,8 @@ public function testSequentialRunner(): void
  );
  run($workflow);
  $this->assertStringEqualsFile(
- $this->file->path()->__toString(),
+ $this->file,
  '^$^$'
  );
- $this->file->removeIfExists();
  }
 }
diff --git a/tests/src/TestActionFileWrite.php b/tests/src/TestActionFileWrite.php
@@ -14,7 +14,6 @@
 namespace Chevere\Tests\src;
 
 use Chevere\Action\Action;
-use Chevere\Filesystem\Interfaces\FileInterface;
 use Chevere\Parameter\Interfaces\ParameterInterface;
 use function Chevere\Parameter\null;
 
@@ -25,9 +24,9 @@ public static function return(): ParameterInterface
  return null();
  }
 
- public function main(FileInterface $file): void
+ public function main(string $file): void
  {
- $fp = fopen($file->path()->__toString(), 'a+');
+ $fp = fopen($file, 'a+');
  fwrite($fp, '^');
  usleep(200000);
  fwrite($fp, '$');

diff --git a/tests/src/TestActionObjectConflict.php b/tests/src/TestActionObjectConflict.php
@@ -14,11 +14,11 @@
 namespace Chevere\Tests\src;
 
 use Chevere\Action\Action;
-use Chevere\Filesystem\Interfaces\PathInterface;
+use stdClass;
 
 class TestActionObjectConflict extends Action
 {
- public function main(PathInterface $path, string $bar): array
+ public function main(stdClass $path, string $bar): array
  {
  return [];
  }