add symfony filesystem package - refactor delete commands

Author: harris21

composer.json

@@ -20,6 +20,7 @@
         "symfony/console": "^2.7|^3.0",
         "symfony/process": "^2.7|^3.0",
         "symfony/finder": "^2.7|^3.0",
+        "symfony/filesystem": "^2.7|^3.0",
         "stevebauman/log-reader": "^1.1",
         "phploc/phploc": "^3.0"
     }

src/Commands/FeatureDeleteCommand.php

@@ -62,7 +62,7 @@ public function fire()
             if (!$this->exists($feature = $this->findFeaturePath($service, $title))) {
                 $this->error('Feature class '.$title.' cannot be found.');
             } else {
-                $this->deleteFile($feature);
+                $this->delete($feature);
 
                 $this->info('Feature class <comment>'.$title.'</comment> deleted successfully.');
             }

src/Commands/JobDeleteCommand.php

@@ -62,10 +62,10 @@ public function fire()
             if (!$this->exists($job = $this->findJobPath($domain, $title))) {
                 $this->error('Job class '.$title.' cannot be found.');
             } else {
-                $this->deleteFile($job);
+                $this->delete($job);
 
                 if (count($this->listJobs($domain)->first()) === 0) {
-                    $this->deleteDirectory($this->findDomainPath($domain));
+                    $this->delete($this->findDomainPath($domain));
                 }
 
                 $this->info('Job class <comment>'.$title.'</comment> deleted successfully.');

src/Commands/ServiceDeleteCommand.php

@@ -77,7 +77,7 @@ public function fire()
             if (!$this->exists($service = $this->findServicePath($name))) {
                 $this->error('Service '.$name.' cannot be found.');
             } else {
-                $this->deleteDirectory($service);
+                $this->delete($service);
 
                 $this->info('Service <comment>'.$name.'</comment> deleted successfully.'."\n");
 

src/Filesystem.php

@@ -11,6 +11,8 @@
 
 namespace Lucid\Console;
 
+use Symfony\Component\Filesystem\Filesystem as SymfonyFilesystem;
+
 /**
  * @author Abed Halawi <[email protected]>
  * @author Charalampos Raftopoulos <[email protected]>
@@ -62,41 +64,16 @@ public function createDirectory($path, $mode = 0755, $recursive = true, $force =
     }
 
     /**
-     * Delete an existing directory at the given path.
+     * Delete an existing file or directory at the given path.
      *
      * @param string $path
      *
      * @return bool
      */
-    public function deleteDirectory($path)
+    public function delete($path)
     {
-        if ($handle = opendir($path)) {
-            while (false !== ($file = readdir($handle))) {
-                if ($file != '.' && $file != '..') {
-                    if (is_dir($path.'/'.$file)) {
-                        if (!@rmdir($path.'/'.$file)) {
-                            $this->deleteDirectory($path.'/'.$file.'/');
-                        }
-                    } else {
-                        @unlink($path.'/'.$file);
-                    }
-                }
-            }
-            closedir($handle);
-
-            return @rmdir($path);
-        }
-    }
+        $filesystem = new SymfonyFilesystem();
 
-    /**
-     * Delete an existing file at the given path.
-     *
-     * @param string $path
-     *
-     * @return bool
-     */
-    public function deleteFile($path)
-    {
-        return @unlink($path);
+        $filesystem->remove($path);
     }
 }