Remove traces of call invokers

reactphp · Oct 6, 2019 · 4d186f1 · 4d186f1
1 parent 4e2af61
commit 4d186f1
Show file tree

Hide file tree

Showing 26 changed files with 260 additions and 1,273 deletions.
diff --git a/examples/directory_ls.php b/examples/directory_ls.php
@@ -6,12 +6,12 @@
 
 $filesystem = \React\Filesystem\Filesystem::create($loop);
 echo 'Using ', get_class($filesystem->getAdapter()), PHP_EOL;
-$filesystem->dir(__DIR__ . DIRECTORY_SEPARATOR . 'tmp')->ls()->then(function (array $list) {
+$filesystem->dir(__DIR__)->ls()->then(function (array $list) {
     foreach ($list as $node) {
         echo get_class($node), ': ', $node->getPath(), PHP_EOL;
     }
-}, function ($e) {
-    echo $e->getMessage(), PHP_EOL;
+})->then(null, function ($error) {
+    echo (string)$error;
 });
 
 $loop->run();
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -6,7 +6,7 @@
          convertErrorsToExceptions="true"
          convertNoticesToExceptions="true"
          convertWarningsToExceptions="true"
-         processIsolation="false"
+         processIsolation="true"
          stopOnFailure="false"
          syntaxCheck="false"
          bootstrap="tests/bootstrap.php"

diff --git a/src/AdapterInterface.php b/src/AdapterInterface.php
@@ -33,14 +33,6 @@ public function getLoop();
      */
     public function setFilesystem(FilesystemInterface $filesystem);
 
-    /**
-     * Set the call invoker for this adapter.
-     *
-     * @param CallInvokerInterface $invoker
-     * @return void
-     */
-    public function setInvoker(CallInvokerInterface $invoker);
-
     /**
      * Call the underlying filesystem.
      *

diff --git a/src/CallInvokerInterface.php b/src/CallInvokerInterface.php
diff --git a/src/ChildProcess/Adapter.php b/src/ChildProcess/Adapter.php
@@ -8,7 +8,6 @@
 use React\Filesystem\ObjectStream;
 use React\Filesystem\ObjectStreamSink;
 use React\Filesystem\AdapterInterface;
-use React\Filesystem\CallInvokerInterface;
 use React\Filesystem\FilesystemInterface;
 use React\Filesystem\MappedTypeDetector;
 use React\Filesystem\ModeTypeDetector;
@@ -64,11 +63,6 @@ class Adapter implements AdapterInterface
      */
     protected $permissionFlagResolver;
 
-    /**
-     * @var CallInvokerInterface
-     */
-    protected $invoker;
-
     /**
      * @var array
      */
@@ -85,7 +79,6 @@ public function __construct(LoopInterface $loop, array $options = [])
     {
         $this->loop = $loop;
 
-        $this->invoker = \React\Filesystem\getInvoker($this, $options, 'invoker', 'React\Filesystem\InstantInvoker');
         $this->openFileLimiter = new OpenFileLimiter(\React\Filesystem\getOpenFileLimit($options));
         $this->permissionFlagResolver = new PermissionFlagResolver();
 
@@ -145,15 +138,6 @@ public function setFilesystem(FilesystemInterface $filesystem)
         ];
     }
 
-    /**
-     * @param CallInvokerInterface $invoker
-     * @return void
-     */
-    public function setInvoker(CallInvokerInterface $invoker)
-    {
-        $this->invoker = $invoker;
-    }
-
     /**
      * @param string $function
      * @param array $args
@@ -176,7 +160,7 @@ public function callFilesystem($function, $args, $errorResultCode = -1)
      */
     public function chmod($path, $mode)
     {
-        return $this->invoker->invokeCall('chmod', [
+        return $this->callFilesystem('chmod', [
             'path' => $path,
             'mode' => decoct($mode),
         ]);
@@ -189,7 +173,7 @@ public function chmod($path, $mode)
      */
     public function mkdir($path, $mode = self::CREATION_MODE)
     {
-        return $this->invoker->invokeCall('mkdir', [
+        return $this->callFilesystem('mkdir', [
             'path' => $path,
             'mode' => decoct($this->permissionFlagResolver->resolve($mode)),
         ]);
@@ -271,7 +255,7 @@ public function close($fd)
      */
     public function rmdir($path)
     {
-        return $this->invoker->invokeCall('rmdir', [
+        return $this->callFilesystem('rmdir', [
             'path' => $path,
         ]);
     }
@@ -282,7 +266,7 @@ public function rmdir($path)
      */
     public function unlink($path)
     {
-        return $this->invoker->invokeCall('unlink', [
+        return $this->callFilesystem('unlink', [
             'path' => $path,
         ]);
     }
@@ -295,7 +279,7 @@ public function unlink($path)
      */
     public function chown($path, $uid, $gid)
     {
-        return $this->invoker->invokeCall('chown', [
+        return $this->callFilesystem('chown', [
             'path' => $path,
             'uid' => $uid,
             'gid' => $gid,
@@ -308,7 +292,7 @@ public function chown($path, $uid, $gid)
      */
     public function stat($filename)
     {
-        return $this->invoker->invokeCall('stat', [
+        return $this->callFilesystem('stat', [
             'path' => $filename,
         ])->then(function ($stat) {
             $stat['atime'] = new DateTime('@' . $stat['atime']);
@@ -335,7 +319,7 @@ public function lsStream($path)
     {
         $stream = new ObjectStream();
 
-        $this->invoker->invokeCall('readdir', [
+        $this->callFilesystem('readdir', [
             'path' => $path,
             'flags' => $this->options['lsFlags'],
         ])->then(function ($result) use ($path, $stream) {
@@ -372,7 +356,7 @@ protected function processLsContents($basePath, $result, ObjectStream $stream)
      */
     public function touch($path, $mode = self::CREATION_MODE)
     {
-        return $this->invoker->invokeCall('touch', [
+        return $this->callFilesystem('touch', [
             'path' => $path,
             'mode' => decoct($this->permissionFlagResolver->resolve($mode)),
         ]);
@@ -385,7 +369,7 @@ public function touch($path, $mode = self::CREATION_MODE)
      */
     public function rename($fromPath, $toPath)
     {
-        return $this->invoker->invokeCall('rename', [
+        return $this->callFilesystem('rename', [
             'from' => $fromPath,
             'to' => $toPath,
         ]);
@@ -397,7 +381,7 @@ public function rename($fromPath, $toPath)
      */
     public function readlink($path)
     {
-        return $this->invoker->invokeCall('readlink', [
+        return $this->callFilesystem('readlink', [
             'path' => $path,
         ])->then(function ($result) {
             return \React\Promise\resolve($result['path']);
@@ -411,7 +395,7 @@ public function readlink($path)
      */
     public function symlink($fromPath, $toPath)
     {
-        return $this->invoker->invokeCall('symlink', [
+        return $this->callFilesystem('symlink', [
             'from' => $fromPath,
             'to' => $toPath,
         ])->then(function ($result) {