Merge 01b5e25 into 647f004

amphp · Mar 6, 2020 · ff27854 · ff27854
2 parents 647f004 + 01b5e25
commit ff27854
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 16 deletions.
diff --git a/src/EioDriver.php b/src/EioDriver.php
@@ -64,7 +64,7 @@ private function parseMode(string $mode): int
 
     private function onOpenHandle(array $openArr, $result, $req): void
     {
-        list($mode, $path, $deferred) = $openArr;
+        [$mode, $path, $deferred] = $openArr;
 
         if ($result === -1) {
             $deferred->fail(new FilesystemException(\eio_get_last_error($req)));
@@ -79,7 +79,7 @@ private function onOpenHandle(array $openArr, $result, $req): void
 
     private function onOpenFtruncate(array $openArr, $result, $req): void
     {
-        list($fh, $mode, $path, $deferred) = $openArr;
+        [$fh, $mode, $path, $deferred] = $openArr;
 
         if ($result === -1) {
             $deferred->fail(new FilesystemException(\eio_get_last_error($req)));
@@ -91,7 +91,7 @@ private function onOpenFtruncate(array $openArr, $result, $req): void
 
     private function onOpenFstat(array $openArr, $result, $req): void
     {
-        list($fh, $mode, $path, $deferred) = $openArr;
+        [$fh, $mode, $path, $deferred] = $openArr;
         if ($result === -1) {
             $deferred->fail(new FilesystemException(\eio_get_last_error($req)));
         } else {
@@ -122,7 +122,7 @@ public function stat(string $path): Promise
 
     private function onStat(array $data, $result, $req): void
     {
-        list($deferred, $path) = $data;
+        [$deferred, $path] = $data;
         if ($result === -1) {
             $deferred->resolve(null);
         } else {
@@ -379,7 +379,7 @@ public function unlink(string $path): Promise
 
     private function onUnlink(array $data, $result, $req): void
     {
-        list($deferred, $path) = $data;
+        [$deferred, $path] = $data;
 
         if ($result === -1) {
             $deferred->fail(new FilesystemException(\eio_get_last_error($req)));
@@ -449,7 +449,7 @@ public function rmdir(string $path): Promise
 
     private function onRmdir(array $data, $result, $req): void
     {
-        list($deferred, $path) = $data;
+        [$deferred, $path] = $data;
 
         if ($result === -1) {
             $deferred->fail(new FilesystemException(\eio_get_last_error($req)));
@@ -559,7 +559,7 @@ private function onGetOpen(Deferred $deferred, $result, $req): void
 
     private function onGetFstat(array $fhAndPromisor, $result, $req): void
     {
-        list($fh, $deferred) = $fhAndPromisor;
+        [$fh, $deferred] = $fhAndPromisor;
 
         if ($result === -1) {
             $deferred->fail(new FilesystemException(\eio_get_last_error($req)));
@@ -574,7 +574,7 @@ private function onGetFstat(array $fhAndPromisor, $result, $req): void
 
     private function onGetRead(array $fhAndPromisor, $result, $req): void
     {
-        list($fh, $deferred) = $fhAndPromisor;
+        [$fh, $deferred] = $fhAndPromisor;
 
         \eio_close($fh);
 
@@ -605,7 +605,7 @@ public function put(string $path, string $contents): Promise
 
     private function onPutOpen(array $data, $result, $req): void
     {
-        list($contents, $deferred) = $data;
+        [$contents, $deferred] = $data;
 
         if ($result === -1) {
             $deferred->fail(new FilesystemException(\eio_get_last_error($req)));
@@ -621,7 +621,7 @@ private function onPutOpen(array $data, $result, $req): void
 
     private function onPutWrite(array $fhAndPromisor, $result, $req): void
     {
-        list($fh, $deferred) = $fhAndPromisor;
+        [$fh, $deferred] = $fhAndPromisor;
 
         \eio_close($fh);
 

diff --git a/src/ParallelDriver.php b/src/ParallelDriver.php
@@ -34,7 +34,7 @@ public function open(string $path, string $mode): Promise
         return call(function () use ($path, $mode) {
             $worker = $this->pool->getWorker();
             try {
-                list($id, $size, $mode) = yield $worker->enqueue(new Internal\FileTask("fopen", [$path, $mode]));
+                [$id, $size, $mode] = yield $worker->enqueue(new Internal\FileTask("fopen", [$path, $mode]));
             } catch (TaskException $exception) {
                 throw new FilesystemException("Could not open file", $exception);
             } catch (WorkerException $exception) {

diff --git a/src/UvDriver.php b/src/UvDriver.php
@@ -60,7 +60,7 @@ public function open(string $path, string $mode): Promise
             if ($fh) {
                 $this->onOpenHandle($fh, $openArr);
             } else {
-                list(, $path, $deferred) = $openArr;
+                [, $path, $deferred] = $openArr;
                 $deferred->fail(new FilesystemException(
                     "Failed opening file handle to $path"
                 ));
@@ -93,14 +93,14 @@ private function parseMode(string $mode): int
 
     private function onOpenHandle($fh, array $openArr): void
     {
-        list($mode) = $openArr;
+        [$mode] = $openArr;
 
         if ($mode[0] === "w") {
             \uv_fs_ftruncate($this->loop, $fh, $length = 0, function ($fh) use ($openArr): void {
                 if ($fh) {
                     $this->finalizeHandle($fh, $size = 0, $openArr);
                 } else {
-                    list(, $path, $deferred) = $openArr;
+                    [, $path, $deferred] = $openArr;
                     $deferred->fail(new FilesystemException(
                         "Failed truncating file $path"
                     ));
@@ -112,7 +112,7 @@ private function onOpenHandle($fh, array $openArr): void
                     StatCache::set($openArr[1], $stat);
                     $this->finalizeHandle($fh, $stat["size"], $openArr);
                 } else {
-                    list(, $path, $deferred) = $openArr;
+                    [, $path, $deferred] = $openArr;
                     $deferred->fail(new FilesystemException(
                         "Failed reading file size from open handle pointing to $path"
                     ));
@@ -123,7 +123,7 @@ private function onOpenHandle($fh, array $openArr): void
 
     private function finalizeHandle($fh, $size, array $openArr): void
     {
-        list($mode, $path, $deferred) = $openArr;
+        [$mode, $path, $deferred] = $openArr;
         $handle = new UvFile($this->driver, $this->poll, $fh, $path, $mode, $size);
         $deferred->resolve($handle);
     }