Pleets / dronephp

src/FileSystem/Shell.php

Spacing +12 added lines, -12 removed lines

@@ -92,22 +92,22 @@ 
             {
                 foreach ($contents as $i)
                 {
-                    if (is_file($directory.'/'.$i))
+                    if (is_file($directory . '/' . $i))
                     {
                         $allContents[] = $i;
 
-                        $this->buffer = $directory.'/'.$i;
+                        $this->buffer = $directory . '/' . $i;
                         call_user_func($fileCallback, $this);
                     }
-                    else if (is_dir($directory.'/'.$i))
+                    else if (is_dir($directory . '/' . $i))
                     {
                         $allContents[] = $i;
-                        $contents = $this->getContents($directory.'/'.$i, $fileCallback, $dirCallback);
+                        $contents = $this->getContents($directory . '/' . $i, $fileCallback, $dirCallback);
 
                         if (count($contents))
                             $allContents[] = $contents;
 
-                        $this->buffer = $directory.'/'.$i;
+                        $this->buffer = $directory . '/' . $i;
                         call_user_func($dirCallback, $this);
                     }
                 }
@@ -181,7 +181,7 @@ 
                 if (!empty($path))
                     if (!strlen(stristr($item, $path)) > 0)
                         continue;
-                if (strstr($item,'~') === false && $item != '.' && $item != '..')
+                if (strstr($item, '~') === false && $item != '.' && $item != '..')
                     $filesToReturn[] = $item;
             }
         }
@@ -319,7 +319,7 @@ 
                     {
                         foreach ($files["folders"] as $folder)
                         {
-                            if (!file_exists($dest.'/'.$folder))
+                            if (!file_exists($dest . '/' . $folder))
                                 mkdir("$dest/$folder", 0777, true);
                         }
 
@@ -328,7 +328,7 @@ 
                             foreach ($files["files"] as $item)
                             {
                                 if (!file_exists("$dest/$files"))
-                                    copy($item, $dest.'/'.$item);
+                                    copy($item, $dest . '/' . $item);
                             }
                         }
                     }
@@ -336,7 +336,7 @@ 
             );
         }
         else if (is_dir($dest))
-            copy($file, $dest.'/'.$file);
+            copy($file, $dest . '/' . $file);
         else
             copy($file, $dest);
 
@@ -357,12 +357,12 @@ 
             throw new \InvalidArgumentException("Missing first parameter");
 
         if (is_dir($newfile))
-                $newfile .= '/'.basename($oldfile);
+                $newfile .= '/' . basename($oldfile);
 
         if ($oldfile == $newfile)
             throw new \Exception("'$oldfile' and '$newfile' are the same file");
 
-        if(!rename($oldfile, $newfile))
+        if (!rename($oldfile, $newfile))
             return false;
 
         return true;
@@ -392,7 +392,7 @@ 
         else {
             if (!is_dir($dir))
             {
-                if(!mkdir("$dir", 0777))
+                if (!mkdir("$dir", 0777))
                     return false;
             }
         }

Braces +95 added lines, -74 removed lines

@@ -84,8 +84,9 @@ 
         {
             foreach ($this->ls($directory) as $item)
             {
-                if ($item != '.' && $item != '..')
-                    $contents[] = $item;
+                if ($item != '.' && $item != '..') {
+                                    $contents[] = $item;
+                }
             }
 
             if (count($contents) > 0)
@@ -98,28 +99,29 @@ 
 
                         $this->buffer = $directory.'/'.$i;
                         call_user_func($fileCallback, $this);
-                    }
-                    else if (is_dir($directory.'/'.$i))
+                    } else if (is_dir($directory.'/'.$i))
                     {
                         $allContents[] = $i;
                         $contents = $this->getContents($directory.'/'.$i, $fileCallback, $dirCallback);
 
-                        if (count($contents))
-                            $allContents[] = $contents;
+                        if (count($contents)) {
+                                                    $allContents[] = $contents;
+                        }
 
                         $this->buffer = $directory.'/'.$i;
                         call_user_func($dirCallback, $this);
                     }
                 }
             }
+        } else if (is_file($directory)) {
+                    throw new \InvalidArgumentException("'$directory' is actually a file");
+        } else {
+                    throw new \InvalidArgumentException("The directory '$directory' does not exists");
         }
-        else if (is_file($directory))
-            throw new \InvalidArgumentException("'$directory' is actually a file");
-        else
-            throw new \InvalidArgumentException("The directory '$directory' does not exists");
 
-        if (!is_null($callback))
-            call_user_func($callback, $this);
+        if (!is_null($callback)) {
+                    call_user_func($callback, $this);
+        }
 
         return $allContents;
     }
@@ -131,10 +133,11 @@ 
      */
     public function pwd()
     {
-        if (getcwd())
-            $this->buffer = getcwd();
-        else
-            return false;
+        if (getcwd()) {
+                    $this->buffer = getcwd();
+        } else {
+                    return false;
+        }
 
         return $this->buffer;
     }
@@ -153,36 +156,38 @@ 
 
         $path = (is_null($path) || empty($path)) ? '.' : $path;
 
-        if (is_file($path))
-            $filesToReturn = array($path);
-        else if (is_dir($path))
+        if (is_file($path)) {
+                    $filesToReturn = array($path);
+        } else if (is_dir($path))
         {
             $pathIns = dir($path);
 
-            if ($recursive)
-                $filesToReturn = $this->getContents($path);
-            else
+            if ($recursive) {
+                            $filesToReturn = $this->getContents($path);
+            } else
             {
                 while (($item = $pathIns->read()) !== false)
                 {
-                    if ($item != '.' && $item != '..')
-                        $filesToReturn[] = $item;
+                    if ($item != '.' && $item != '..') {
+                                            $filesToReturn[] = $item;
+                    }
                 }
 
                 $pathIns->close();
             }
-        }
-        else {
+        } else {
 
             $contents = $this->ls();
 
             foreach ($contents as $item)
             {
-                if (!empty($path))
-                    if (!strlen(stristr($item, $path)) > 0)
+                if (!empty($path)) {
+                                    if (!strlen(stristr($item, $path)) > 0)
                         continue;
-                if (strstr($item,'~') === false && $item != '.' && $item != '..')
-                    $filesToReturn[] = $item;
+                }
+                if (strstr($item,'~') === false && $item != '.' && $item != '..') {
+                                    $filesToReturn[] = $item;
+                }
             }
         }
 
@@ -202,8 +207,9 @@ 
 
         if (is_dir($path))
         {
-            if (chdir($path))
-                return true;
+            if (chdir($path)) {
+                            return true;
+            }
         }
 
         return false;
@@ -245,12 +251,13 @@ 
     {
         $recursive = is_null($recursive) ? false : $recursive;
 
-        if (is_null($file))
-            throw new \InvalidArgumentException("Missing first parameter");
+        if (is_null($file)) {
+                    throw new \InvalidArgumentException("Missing first parameter");
+        }
 
-        if (file_exists($file) && !$recursive)
-            unlink($file);
-        elseif (is_dir($file) && $recursive)
+        if (file_exists($file) && !$recursive) {
+                    unlink($file);
+        } elseif (is_dir($file) && $recursive)
         {
             $that = $this;
 
@@ -279,11 +286,13 @@ 
     {
         $recursive = (is_null($recursive)) ? false : $recursive;
 
-        if (empty($file) || empty($dest))
-            throw new \InvalidArgumentException("Missing parameters");
+        if (empty($file) || empty($dest)) {
+                    throw new \InvalidArgumentException("Missing parameters");
+        }
 
-        if (is_dir($file) && !$recursive)
-            throw new \RuntimeException("Ommiting directory <<$foo>>");
+        if (is_dir($file) && !$recursive) {
+                    throw new \RuntimeException("Ommiting directory <<$foo>>");
+        }
 
         $dest_exists = file_exists($dest);
 
@@ -296,8 +305,9 @@ 
 
             $files["folders"][] = is_dir($dest) ? basename($file) : $dest;
 
-            if (!$dest_exists)
-                mkdir($dest);
+            if (!$dest_exists) {
+                            mkdir($dest);
+            }
 
             $that = $this;
 
@@ -319,26 +329,28 @@ 
                     {
                         foreach ($files["folders"] as $folder)
                         {
-                            if (!file_exists($dest.'/'.$folder))
-                                mkdir("$dest/$folder", 0777, true);
+                            if (!file_exists($dest.'/'.$folder)) {
+                                                            mkdir("$dest/$folder", 0777, true);
+                            }
                         }
 
                         if (count($files["files"]))
                         {
                             foreach ($files["files"] as $item)
                             {
-                                if (!file_exists("$dest/$files"))
-                                    copy($item, $dest.'/'.$item);
+                                if (!file_exists("$dest/$files")) {
+                                                                    copy($item, $dest.'/'.$item);
+                                }
                             }
                         }
                     }
                 }
             );
+        } else if (is_dir($dest)) {
+                    copy($file, $dest.'/'.$file);
+        } else {
+                    copy($file, $dest);
         }
-        else if (is_dir($dest))
-            copy($file, $dest.'/'.$file);
-        else
-            copy($file, $dest);
 
         return true;
     }
@@ -353,17 +365,21 @@ 
      */
     public function mv($oldfile, $newfile)
     {
-        if (empty($oldfile))
-            throw new \InvalidArgumentException("Missing first parameter");
+        if (empty($oldfile)) {
+                    throw new \InvalidArgumentException("Missing first parameter");
+        }
 
-        if (is_dir($newfile))
-                $newfile .= '/'.basename($oldfile);
+        if (is_dir($newfile)) {
+                        $newfile .= '/'.basename($oldfile);
+        }
 
-        if ($oldfile == $newfile)
-            throw new \Exception("'$oldfile' and '$newfile' are the same file");
+        if ($oldfile == $newfile) {
+                    throw new \Exception("'$oldfile' and '$newfile' are the same file");
+        }
 
-        if(!rename($oldfile, $newfile))
-            return false;
+        if(!rename($oldfile, $newfile)) {
+                    return false;
+        }
 
         return true;
     }
@@ -379,21 +395,24 @@ 
      */
     public function mkdir($dir, $dest = null, $recursive = null)
     {
-        if (empty($dir))
-            throw new \InvalidArgumentException("Missing first parameter");
+        if (empty($dir)) {
+                    throw new \InvalidArgumentException("Missing first parameter");
+        }
 
-        if (empty($dest))
-            $dest = '.';
+        if (empty($dest)) {
+                    $dest = '.';
+        }
 
         $recursive = (is_null($recursive)) ? false : $recursive;
 
-        if ($recursive)
-            mkdir("$dest/$dir", 0777, true);
-        else {
+        if ($recursive) {
+                    mkdir("$dest/$dir", 0777, true);
+        } else {
             if (!is_dir($dir))
             {
-                if(!mkdir("$dir", 0777))
-                    return false;
+                if(!mkdir("$dir", 0777)) {
+                                    return false;
+                }
             }
         }
         return true;
@@ -408,12 +427,14 @@ 
      */
     public function rmdir($dir)
     {
-        if (is_null($dir) || empty($dir))
-            throw new \RuntimeException("Missing first parameter");
+        if (is_null($dir) || empty($dir)) {
+                    throw new \RuntimeException("Missing first parameter");
+        }
 
-        if (rmdir($dir))
-            return true;
-        else
-            return false;
+        if (rmdir($dir)) {
+                    return true;
+        } else {
+                    return false;
+        }
     }
 }
\ No newline at end of file