Pleets / dronephp

src/FileSystem/Shell.php

Spacing +16 added lines, -16 removed lines

@@ -94,20 +94,20 @@ 
             {
                 foreach ($contents as $i)
                 {
-                    if (is_file($directory.'/'.$i))
+                    if (is_file($directory . '/' . $i))
                     {
-                        $allContents[] = $directory.'/'.$i;
+                        $allContents[] = $directory . '/' . $i;
 
-                        $this->buffer = $directory.'/'.$i;
+                        $this->buffer = $directory . '/' . $i;
                         call_user_func($fileCallback, $this);
                     }
-                    elseif (is_dir($directory.'/'.$i))
+                    elseif (is_dir($directory . '/' . $i))
                     {
-                        $allContents[] = $directory.'/'.$i;
+                        $allContents[] = $directory . '/' . $i;
 
-                        $this->getContents($directory.'/'.$i, $fileCallback, $dirCallback);
+                        $this->getContents($directory . '/' . $i, $fileCallback, $dirCallback);
 
-                        $this->buffer = $directory.'/'.$i;
+                        $this->buffer = $directory . '/' . $i;
                         call_user_func($dirCallback, $this);
 
                         /*$directory = scandir($directory);
@@ -207,7 +207,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;
             }
         }
@@ -344,7 +344,7 @@ 
                     {
                         foreach ($files["folders"] as $folder)
                         {
-                            if (!file_exists($dest.'/'.$folder))
+                            if (!file_exists($dest . '/' . $folder))
                                 mkdir("$dest/$folder", 0777, true);
                         }
                     }
@@ -354,7 +354,7 @@ 
                         foreach ($files["files"] as $item)
                         {
                             if (!file_exists("$dest/$files"))
-                                copy($item, $dest.'/'.$item);
+                                copy($item, $dest . '/' . $item);
                         }
                     }
                 }
@@ -364,7 +364,7 @@ 
         if (is_dir($dest))
         {
             if (!$recursive)
-                copy($file, $dest.'/'.$file);
+                copy($file, $dest . '/' . $file);
             else {
 
                 $files = array();
@@ -383,14 +383,14 @@ 
 
                     foreach ($files[1] as $item)
                     {
-                        if (!file_exists($dest.'/'.$item))
+                        if (!file_exists($dest . '/' . $item))
                             mkdir("$dest/$item", 0777, true);
                     }
 
                     foreach ($files[0] as $item)
                     {
                         if (!file_exists("$dest/$files"))
-                            copy($item, $dest.'/'.$item);
+                            copy($item, $dest . '/' . $item);
                     }
                 });
             }
@@ -415,12 +415,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;
@@ -450,7 +450,7 @@ 
         else {
             if (!is_dir($dir))
             {
-                if(!mkdir("$dir", 0777))
+                if (!mkdir("$dir", 0777))
                     return false;
             }
         }

Braces +106 added lines, -82 removed lines

@@ -84,8 +84,9 @@ 
         {
             foreach ($this->ls($directory) as $item)
             {
-                if ($item != '.' && $item != '..')
-                    $contents[] = $item;
+                if ($item != '.' && $item != '..') {
+                                    $contents[] = $item;
+                }
             }
 
             $allContents = $contents;
@@ -100,8 +101,7 @@ 
 
                         $this->buffer = $directory.'/'.$i;
                         call_user_func($fileCallback, $this);
-                    }
-                    elseif (is_dir($directory.'/'.$i))
+                    } elseif (is_dir($directory.'/'.$i))
                     {
                         $allContents[] = $directory.'/'.$i;
 
@@ -117,14 +117,15 @@ 
                     }
                 }
             }
+        } 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;
     }
@@ -136,10 +137,11 @@ 
      */
     public function pwd()
     {
-        if (getcwd())
-            $this->buffer = getcwd();
-        else
-            return false;
+        if (getcwd()) {
+                    $this->buffer = getcwd();
+        } else {
+                    return false;
+        }
 
         return $this->buffer;
     }
@@ -158,9 +160,9 @@ 
 
         $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);
 
@@ -181,34 +183,37 @@ 
                     }
                 );
 
-                foreach ($dirs as $item)
-                    $filesToReturn[] = $item;
+                foreach ($dirs as $item) {
+                                    $filesToReturn[] = $item;
+                }
 
-                foreach ($files as $item)
-                    $filesToReturn[] = $item;
-            }
-            else
+                foreach ($files as $item) {
+                                    $filesToReturn[] = $item;
+                }
+            } 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;
+                }
             }
         }
 
@@ -228,8 +233,9 @@ 
 
         if (is_dir($path))
         {
-            if (chdir($path))
-                return true;
+            if (chdir($path)) {
+                            return true;
+            }
         }
 
         return false;
@@ -271,12 +277,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;
 
@@ -305,11 +312,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>>");
+        }
 
         if (is_dir($file) && (is_dir($dest) || !file_exists($dest)))
         {
@@ -318,11 +327,13 @@ 
                 "folders" => []
             ];
 
-            if (is_dir($dest))
-                $files["folders"][] = basename($file);
+            if (is_dir($dest)) {
+                            $files["folders"][] = basename($file);
+            }
 
-            if (!file_exists($dest))
-                mkdir($dest);
+            if (!file_exists($dest)) {
+                            mkdir($dest);
+            }
 
             $that = $this;
 
@@ -344,8 +355,9 @@ 
                     {
                         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);
+                            }
                         }
                     }
 
@@ -353,8 +365,9 @@ 
                     {
                         foreach ($files["files"] as $item)
                         {
-                            if (!file_exists("$dest/$files"))
-                                copy($item, $dest.'/'.$item);
+                            if (!file_exists("$dest/$files")) {
+                                                            copy($item, $dest.'/'.$item);
+                            }
                         }
                     }
                 }
@@ -363,9 +376,9 @@ 
 
         if (is_dir($dest))
         {
-            if (!$recursive)
-                copy($file, $dest.'/'.$file);
-            else {
+            if (!$recursive) {
+                            copy($file, $dest.'/'.$file);
+            } else {
 
                 $files = array();
                 $files[0] = array();
@@ -383,20 +396,22 @@ 
 
                     foreach ($files[1] as $item)
                     {
-                        if (!file_exists($dest.'/'.$item))
-                            mkdir("$dest/$item", 0777, true);
+                        if (!file_exists($dest.'/'.$item)) {
+                                                    mkdir("$dest/$item", 0777, true);
+                        }
                     }
 
                     foreach ($files[0] as $item)
                     {
-                        if (!file_exists("$dest/$files"))
-                            copy($item, $dest.'/'.$item);
+                        if (!file_exists("$dest/$files")) {
+                                                    copy($item, $dest.'/'.$item);
+                        }
                     }
                 });
             }
+        } else {
+                    copy($file, $dest);
         }
-        else
-            copy($file, $dest);
 
         return true;
     }
@@ -411,17 +426,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;
     }
@@ -437,21 +456,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;
@@ -466,12 +488,14 @@ 
      */
     public function rmdir($dir)
     {
-        if (is_null($dir) || empty($dir))
-            throw new Exception("Missing parameter for rmdir!");
+        if (is_null($dir) || empty($dir)) {
+                    throw new Exception("Missing parameter for rmdir!");
+        }
 
-        if (rmdir($dir))
-            return true;
-        else
-            return false;
+        if (rmdir($dir)) {
+                    return true;
+        } else {
+                    return false;
+        }
     }
 }
\ No newline at end of file

test/FileSystem/ShellTest.php

Indentation +1 added lines, -1 removed lines

@@ -171,5 +171,5 @@
             'foo2', // directory
             'foo4', // not a directory or file
         true);
-   }
+    }
 }
\ No newline at end of file

Braces +2 added lines, -4 removed lines

@@ -141,13 +141,11 @@
         try
         {
             $shell->cp('foo2', 'foo3');
-        }
-        catch (\Exception $e)
+        } catch (\Exception $e)
         {
             # omitting directory
             $errorObject = ($e instanceof \RuntimeException);
-        }
-        finally
+        } finally
         {
             $this->assertTrue($errorObject, $e->getMessage());
         }