Issue #1088 - Use TaskAccessor trait in Task\Archive\Extract (#1089)

consolidation · Jan 24, 2022 · 1daaeae · 1daaeae
1 parent ffaf2a7
commit 1daaeae
Showing 1 changed file with 9 additions and 11 deletions.
diff --git a/src/Task/Archive/Extract.php b/src/Task/Archive/Extract.php
@@ -4,10 +4,9 @@
 
 use Robo\Result;
 use Robo\Task\BaseTask;
-use Robo\Task\Filesystem\FilesystemStack;
-use Robo\Task\Filesystem\DeleteDir;
+use Robo\Task\Filesystem\Tasks as FilesystemTaskLoader;
 use Robo\Contract\BuilderAwareInterface;
-use Robo\Common\BuilderAwareTrait;
+use Robo\TaskAccessor;
 
 /**
  * Extracts an archive.
@@ -34,7 +33,8 @@
  */
 class Extract extends BaseTask implements BuilderAwareInterface
 {
-    use BuilderAwareTrait;
+    use TaskAccessor;
+    use FilesystemTaskLoader;
 
     /**
      * @var string
@@ -131,16 +131,14 @@ public function run()
             $filesInExtractLocation = glob("$extractLocation/*");
             $hasEncapsulatingFolder = ((count($filesInExtractLocation) == 1) && is_dir($filesInExtractLocation[0]));
             if ($hasEncapsulatingFolder && !$this->preserveTopDirectory) {
-                $result = (new FilesystemStack())
-                    ->inflect($this)
+                $this
+                    ->taskFilesystemStack()
                     ->rename($filesInExtractLocation[0], $this->to)
-                    ->run();
-                (new DeleteDir($extractLocation))
-                    ->inflect($this)
+                    ->remove($extractLocation)
                     ->run();
             } else {
-                $result = (new FilesystemStack())
-                    ->inflect($this)
+                $this
+                    ->taskFilesystemStack()
                     ->rename($extractLocation, $this->to)
                     ->run();
             }