Pleets / dronephp

test/Db/Driver/MySQLTest.php

Indentation +5 added lines, -5 removed lines

@@ -240,7 +240,7 @@ 
         try
         {
             $sql = "INSERT INTO MYTABLE (DESCRIPTION, WRONG) VALUES ('Hello world!')";
-	        $result = $conn->execute($sql);
+            $result = $conn->execute($sql);
         }
         catch (\Exception $e)
         {
@@ -511,11 +511,11 @@ 
 
         try
         {
-	        $sql = "INSERT INTO MYTABLE (DESCRIPTION) VALUES ('TRANS_SHORTCUT_1')";
-	        $result = $conn->execute($sql);
+            $sql = "INSERT INTO MYTABLE (DESCRIPTION) VALUES ('TRANS_SHORTCUT_1')";
+            $result = $conn->execute($sql);
 
-	        $sql = "INSERT INTO MYTABLE (DESCRIPTION, WRONG) VALUES ('TRANS_SHORTCUT_2')";
-	        $result = $conn->execute($sql);
+            $sql = "INSERT INTO MYTABLE (DESCRIPTION, WRONG) VALUES ('TRANS_SHORTCUT_2')";
+            $result = $conn->execute($sql);
         }
         catch (InvalidQueryException $e)
         {

Spacing +18 added lines, -18 removed lines

@@ -145,7 +145,7 @@ 
     public function testCannotStablishConnection()
     {
         $options = $this->options;
-        $options["dbhost"] = 'myserver';   // this server does not exists
+        $options["dbhost"] = 'myserver'; // this server does not exists
 
         $conn = new MySQL($options);
 
@@ -272,7 +272,7 @@ 
         $this->assertEquals(2, $conn->getNumFields());
         $this->assertEquals(0, $conn->getRowsAffected());
 
-        $rowset = $conn->getArrayResult();    # array with results
+        $rowset = $conn->getArrayResult(); # array with results
         $row = array_shift($rowset);
 
         $this->assertArrayHasKey("ID", $row);
@@ -299,12 +299,12 @@ 
         $result = $conn->execute($sql);
         $rowcount = count($conn->getArrayResult());
 
-        $this->assertTrue(($rowcount === 1));    # the row is available for now
+        $this->assertTrue(($rowcount === 1)); # the row is available for now
 
         # properties modified by execute() method
         $this->assertEquals(1, $conn->getNumRows());
         $this->assertEquals(2, $conn->getNumFields());
-        $this->assertEquals(0, $conn->getRowsAffected());    # nothing affected (autocommit = false)
+        $this->assertEquals(0, $conn->getRowsAffected()); # nothing affected (autocommit = false)
 
         $this->assertTrue($conn->commit());
 
@@ -313,7 +313,7 @@ 
         $result = $conn->execute($sql);
         $rowcount = count($conn->getArrayResult());
 
-        $this->assertTrue(($rowcount === 1));    # the row is available
+        $this->assertTrue(($rowcount === 1)); # the row is available
     }
 
     /**
@@ -336,12 +336,12 @@ 
         $result = $conn->execute($sql);
         $rowcount = count($conn->getArrayResult());
 
-        $this->assertTrue(($rowcount === 1));    # the row is available for now
+        $this->assertTrue(($rowcount === 1)); # the row is available for now
 
         # properties modified by execute() method
         $this->assertEquals(1, $conn->getNumRows());
         $this->assertEquals(2, $conn->getNumFields());
-        $this->assertEquals(0, $conn->getRowsAffected());    # nothing affected (autocommit = false)
+        $this->assertEquals(0, $conn->getRowsAffected()); # nothing affected (autocommit = false)
 
         $this->assertTrue($conn->rollback());
 
@@ -350,7 +350,7 @@ 
         $result = $conn->execute($sql);
         $rowcount = count($conn->getArrayResult());
 
-        $this->assertNotTrue(($rowcount === 1));    # the row is not available
+        $this->assertNotTrue(($rowcount === 1)); # the row is not available
     }
 
     /**
@@ -382,12 +382,12 @@ 
         $result = $conn->execute($sql);
         $rowcount = count($conn->getArrayResult());
 
-        $this->assertTrue(($rowcount === 4));    # the rows are available for now
+        $this->assertTrue(($rowcount === 4)); # the rows are available for now
 
         # properties modified by execute() method
         $this->assertEquals(4, $conn->getNumRows());
         $this->assertEquals(2, $conn->getNumFields());
-        $this->assertEquals(0, $conn->getRowsAffected());    # nothing affected (autocommit = false)
+        $this->assertEquals(0, $conn->getRowsAffected()); # nothing affected (autocommit = false)
 
         $this->assertTrue($conn->commit());
 
@@ -396,7 +396,7 @@ 
         $result = $conn->execute($sql);
         $rowcount = count($conn->getArrayResult());
 
-        $this->assertTrue(($rowcount === 4));    # the row is available
+        $this->assertTrue(($rowcount === 4)); # the row is available
     }
 
     /**
@@ -428,12 +428,12 @@ 
         $result = $conn->execute($sql);
         $rowcount = count($conn->getArrayResult());
 
-        $this->assertTrue(($rowcount === 4));    # the rows are available for now
+        $this->assertTrue(($rowcount === 4)); # the rows are available for now
 
         # properties modified by execute() method
         $this->assertEquals(4, $conn->getNumRows());
         $this->assertEquals(2, $conn->getNumFields());
-        $this->assertEquals(0, $conn->getRowsAffected());    # nothing affected (autocommit = false)
+        $this->assertEquals(0, $conn->getRowsAffected()); # nothing affected (autocommit = false)
 
         $this->assertTrue($conn->rollback());
 
@@ -442,7 +442,7 @@ 
         $result = $conn->execute($sql);
         $rowcount = count($conn->getArrayResult());
 
-        $this->assertNotTrue(($rowcount === 4));    # the row is available
+        $this->assertNotTrue(($rowcount === 4)); # the row is available
     }
 
     /**
@@ -473,12 +473,12 @@ 
         $result = $conn->execute($sql);
         $rowcount = count($conn->getArrayResult());
 
-        $this->assertTrue(($rowcount === 2));    # the rows are available for now
+        $this->assertTrue(($rowcount === 2)); # the rows are available for now
 
         # properties modified by execute() method
         $this->assertEquals(2, $conn->getNumRows());
         $this->assertEquals(2, $conn->getNumFields());
-        $this->assertEquals(0, $conn->getRowsAffected());    # nothing affected (autocommit = false)
+        $this->assertEquals(0, $conn->getRowsAffected()); # nothing affected (autocommit = false)
 
         # ends the transaction
         $conn->endTransaction();
@@ -488,7 +488,7 @@ 
         $result = $conn->execute($sql);
         $rowcount = count($conn->getArrayResult());
 
-        $this->assertTrue(($rowcount === 2));    # the row is available
+        $this->assertTrue(($rowcount === 2)); # the row is available
     }
 
     /**
@@ -532,6 +532,6 @@ 
         $result = $conn->execute($sql);
         $rowcount = count($conn->getArrayResult());
 
-        $this->assertNotTrue(($rowcount === 0));    # the rows are not available
+        $this->assertNotTrue(($rowcount === 0)); # the rows are not available
     }
 }
\ No newline at end of file

Braces +9 added lines, -18 removed lines

@@ -84,12 +84,10 @@ 
 
         try {
             $conn->disconnect();
-        }
-        catch (\Exception $e)
+        } catch (\Exception $e)
         {
             $errorObject = ($e instanceof \LogicException);
-        }
-        finally
+        } finally
         {
             $this->assertNotTrue($conn->isConnected());
             $this->assertTrue($errorObject, $e->getMessage());
@@ -125,12 +123,10 @@ 
 
         try {
             $conn->reconnect();
-        }
-        catch (\Exception $e)
+        } catch (\Exception $e)
         {
             $errorObject = ($e instanceof \LogicException);
-        }
-        finally
+        } finally
         {
             $this->assertTrue($errorObject, $e->getMessage());
             $this->assertNotTrue($conn->isConnected());
@@ -155,13 +151,11 @@ 
 
         try {
             $mysqliObject = $conn->connect();
-        }
-        catch (\Exception $e)
+        } catch (\Exception $e)
         {
             $errorObject = ($e instanceof ConnectionException);
             $message = $e->getMessage();
-        }
-        finally
+        } finally
         {
             $this->assertTrue($errorObject, $message);
             $this->assertNotTrue($conn->isConnected());
@@ -241,13 +235,11 @@ 
         {
             $sql = "INSERT INTO MYTABLE (DESCRIPTION, WRONG) VALUES ('Hello world!')";
 	        $result = $conn->execute($sql);
-        }
-        catch (\Exception $e)
+        } catch (\Exception $e)
         {
             $errorObject = ($e instanceof InvalidQueryException);
             $message = $e->getMessage();
-        }
-        finally
+        } finally
         {
             $this->assertTrue($errorObject, $message);
         }
@@ -516,8 +508,7 @@ 
 
 	        $sql = "INSERT INTO MYTABLE (DESCRIPTION, WRONG) VALUES ('TRANS_SHORTCUT_2')";
 	        $result = $conn->execute($sql);
-        }
-        catch (InvalidQueryException $e)
+        } catch (InvalidQueryException $e)
         {
             $message = $e->getMessage();
             #·not necessary!

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());
         }

src/Db/Driver/MySQL.php

Spacing +2 added lines, -2 removed lines

@@ -118,7 +118,7 @@ 
             {
                 if (is_string($param_values[$i]))
                     $bind_types .= 's';
-                else if(is_float($param_values[$i]))
+                else if (is_float($param_values[$i]))
                     $bind_types .= 'd';
                 # [POSSIBLE BUG] - To Future revision (What about non-string and non-decimal types ?)
                 else
@@ -178,7 +178,7 @@ 
             $this->numFields = $this->dbconn->field_count;
 
         if ($this->transac_mode)
-            $this->transac_result = is_null($this->transac_result) ? $this->result: $this->transac_result && $this->result;
+            $this->transac_result = is_null($this->transac_result) ? $this->result : $this->transac_result && $this->result;
 
         /*
          * Because mysqli_query() returns FALSE on failure, a mysqli_result object for SELECT, SHOW, DESCRIBE or EXPLAIN queries,

Braces +45 added lines, -36 removed lines

@@ -31,15 +31,17 @@ 
      */
     public function __construct($options)
     {
-        if (!array_key_exists("dbchar", $options))
-            $options["dbchar"] = "utf8";
+        if (!array_key_exists("dbchar", $options)) {
+                    $options["dbchar"] = "utf8";
+        }
 
         parent::__construct($options);
 
         $auto_connect = array_key_exists('auto_connect', $options) ? $options["auto_connect"] : true;
 
-        if ($auto_connect)
-            $this->connect();
+        if ($auto_connect) {
+                    $this->connect();
+        }
     }
 
     /**
@@ -52,13 +54,15 @@ 
      */
     public function connect()
     {
-        if (!extension_loaded('mysqli'))
-            throw new \RuntimeException("The Mysqli extension is not loaded");
+        if (!extension_loaded('mysqli')) {
+                    throw new \RuntimeException("The Mysqli extension is not loaded");
+        }
 
-        if (!is_null($this->dbport) && !empty($this->dbport))
-            $conn = @new \mysqli($this->dbhost, $this->dbuser, $this->dbpass, $this->dbname, $this->dbport);
-        else
-            $conn = @new \mysqli($this->dbhost, $this->dbuser, $this->dbpass, $this->dbname);
+        if (!is_null($this->dbport) && !empty($this->dbport)) {
+                    $conn = @new \mysqli($this->dbhost, $this->dbuser, $this->dbpass, $this->dbname, $this->dbport);
+        } else {
+                    $conn = @new \mysqli($this->dbhost, $this->dbuser, $this->dbpass, $this->dbname);
+        }
 
         if ($conn->connect_errno)
         {
@@ -68,8 +72,7 @@ 
              * the warning message "Property access is not allowed yet".
              */
             throw new Exception\ConnectionException(mysqli_connect_error(), mysqli_connect_errno());
-        }
-        else
+        } else
         {
             $this->dbconn = $conn;
             $this->dbconn->set_charset($this->dbchar);
@@ -116,13 +119,15 @@ 
 
             for ($i = 0; $i < $n_params; $i++)
             {
-                if (is_string($param_values[$i]))
-                    $bind_types .= 's';
-                else if(is_float($param_values[$i]))
-                    $bind_types .= 'd';
+                if (is_string($param_values[$i])) {
+                                    $bind_types .= 's';
+                } else if(is_float($param_values[$i])) {
+                                    $bind_types .= 'd';
+                }
                 # [POSSIBLE BUG] - To Future revision (What about non-string and non-decimal types ?)
-                else
-                    $bind_types .= 's';
+                else {
+                                    $bind_types .= 's';
+                }
 
                 $bind_values[] = '$param_values[' . $i . ']';
             }
@@ -143,12 +148,12 @@ 
                      * It is useful to prevent rollback transactions on insert statements because
                      * insert statement do not free results.
                      */
-                    if ($res)
-                        $this->result = $res;
+                    if ($res) {
+                                            $this->result = $res;
+                    }
                 }
             }
-        }
-        else
+        } else
         {
             $prev_error_handler = set_error_handler(['\Drone\Error\ErrorHandler', 'errorControlOperator'], E_ALL);
 
@@ -165,20 +170,23 @@ 
         }
 
         # identify SELECT, SHOW, DESCRIBE or EXPLAIN queries
-        if (is_object($this->result) && property_exists($this->result, 'num_rows'))
-            $this->numRows = $this->result->num_rows;
-        else
+        if (is_object($this->result) && property_exists($this->result, 'num_rows')) {
+                    $this->numRows = $this->result->num_rows;
+        } else
         {
             # affected_rows return the same of num_rows on select statements!
-            if (property_exists($this->dbconn, 'affected_rows'))
-                $this->rowsAffected = $this->dbconn->affected_rows;
+            if (property_exists($this->dbconn, 'affected_rows')) {
+                            $this->rowsAffected = $this->dbconn->affected_rows;
+            }
         }
 
-        if (property_exists($this->dbconn, 'field_count'))
-            $this->numFields = $this->dbconn->field_count;
+        if (property_exists($this->dbconn, 'field_count')) {
+                    $this->numFields = $this->dbconn->field_count;
+        }
 
-        if ($this->transac_mode)
-            $this->transac_result = is_null($this->transac_result) ? $this->result: $this->transac_result && $this->result;
+        if ($this->transac_mode) {
+                    $this->transac_result = is_null($this->transac_result) ? $this->result: $this->transac_result && $this->result;
+        }
 
         /*
          * Because mysqli_query() returns FALSE on failure, a mysqli_result object for SELECT, SHOW, DESCRIBE or EXPLAIN queries,
@@ -247,9 +255,8 @@ 
             {
                 $data[] = $row;
             }
-        }
-        else
-            /*
+        } else {
+                    /*
              * "This kind of exception should lead directly to a fix in your code"
              * So much production tests tell us this error is throwed because developers
              * execute toArray() before execute().
@@ -257,6 +264,7 @@ 
              * Ref: http://php.net/manual/en/class.logicexception.php
              */
             throw new \LogicException('There are not data in the buffer!');
+        }
 
         $this->arrayResult = $data;
 
@@ -271,7 +279,8 @@ 
     public function __destruct()
     {
         # prevent "Property access is not allowed yet" with @ on failure connections
-        if ($this->dbconn !== false && !is_null($this->dbconn))
-            @$this->dbconn->close();
+        if ($this->dbconn !== false && !is_null($this->dbconn)) {
+                    @$this->dbconn->close();
+        }
     }
 }
\ No newline at end of file

src/FileSystem/Shell.php

Spacing +16 added lines, -16 removed lines

@@ -95,19 +95,19 @@ 
             {
                 foreach ($contents as $i)
                 {
-                    if (is_file($directory.'/'.$i))
+                    if (is_file($directory . '/' . $i))
                     {
-                        $allContents[] = ($showParentPath) ? $directory.'/'.$i : $i;
+                        $allContents[] = ($showParentPath) ? $directory . '/' . $i : $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[] = ($showParentPath) ? $directory.'/'.$i : $i;
-                        $allContents[] = $this->getContents($directory.'/'.$i, $fileCallback, $dirCallback, null, false);
+                        $allContents[] = ($showParentPath) ? $directory . '/' . $i : $i;
+                        $allContents[] = $this->getContents($directory . '/' . $i, $fileCallback, $dirCallback, null, false);
 
-                        $this->buffer = $directory.'/'.$i;
+                        $this->buffer = $directory . '/' . $i;
                         call_user_func($dirCallback, $this);
                     }
                 }
@@ -202,7 +202,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;
             }
         }
@@ -339,7 +339,7 @@ 
                     {
                         foreach ($files["folders"] as $folder)
                         {
-                            if (!file_exists($dest.'/'.$folder))
+                            if (!file_exists($dest . '/' . $folder))
                                 mkdir("$dest/$folder", 0777, true);
                         }
                     }
@@ -349,7 +349,7 @@ 
                         foreach ($files["files"] as $item)
                         {
                             if (!file_exists("$dest/$files"))
-                                copy($item, $dest.'/'.$item);
+                                copy($item, $dest . '/' . $item);
                         }
                     }
                 }
@@ -359,7 +359,7 @@ 
         if (is_dir($dest))
         {
             if (!$recursive)
-                copy($file, $dest.'/'.$file);
+                copy($file, $dest . '/' . $file);
             else {
 
                 $files = array();
@@ -378,14 +378,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);
                     }
                 });
             }
@@ -410,12 +410,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;
@@ -445,7 +445,7 @@ 
         else {
             if (!is_dir($dir))
             {
-                if(!mkdir("$dir", 0777))
+                if (!mkdir("$dir", 0777))
                     return false;
             }
         }

Braces +100 added lines, -78 removed lines

@@ -85,8 +85,9 @@ 
         {
             foreach ($this->ls($directory) as $item)
             {
-                if ($item != '.' && $item != '..')
-                    $contents[] = $item;
+                if ($item != '.' && $item != '..') {
+                                    $contents[] = $item;
+                }
             }
 
             //$allContents = $contents;
@@ -101,8 +102,7 @@ 
 
                         $this->buffer = $directory.'/'.$i;
                         call_user_func($fileCallback, $this);
-                    }
-                    else if (is_dir($directory.'/'.$i))
+                    } else if (is_dir($directory.'/'.$i))
                     {
                         $allContents[] = ($showParentPath) ? $directory.'/'.$i : $i;
                         $allContents[] = $this->getContents($directory.'/'.$i, $fileCallback, $dirCallback, null, false);
@@ -112,14 +112,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;
     }
@@ -131,10 +132,11 @@ 
      */
     public function pwd()
     {
-        if (getcwd())
-            $this->buffer = getcwd();
-        else
-            return false;
+        if (getcwd()) {
+                    $this->buffer = getcwd();
+        } else {
+                    return false;
+        }
 
         return $this->buffer;
     }
@@ -153,9 +155,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,29 +183,30 @@ 
 
                 foreach ($files as $item)
                     $filesToReturn[] = $item;*/
-            }
-            else
+            } 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;
+                }
             }
         }
 
@@ -223,8 +226,9 @@ 
 
         if (is_dir($path))
         {
-            if (chdir($path))
-                return true;
+            if (chdir($path)) {
+                            return true;
+            }
         }
 
         return false;
@@ -266,12 +270,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;
 
@@ -300,11 +305,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)))
         {
@@ -313,11 +320,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;
 
@@ -339,8 +348,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);
+                            }
                         }
                     }
 
@@ -348,8 +358,9 @@ 
                     {
                         foreach ($files["files"] as $item)
                         {
-                            if (!file_exists("$dest/$files"))
-                                copy($item, $dest.'/'.$item);
+                            if (!file_exists("$dest/$files")) {
+                                                            copy($item, $dest.'/'.$item);
+                            }
                         }
                     }
                 }
@@ -358,9 +369,9 @@ 
 
         if (is_dir($dest))
         {
-            if (!$recursive)
-                copy($file, $dest.'/'.$file);
-            else {
+            if (!$recursive) {
+                            copy($file, $dest.'/'.$file);
+            } else {
 
                 $files = array();
                 $files[0] = array();
@@ -378,20 +389,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;
     }
@@ -406,17 +419,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;
     }
@@ -432,21 +449,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;
@@ -461,12 +481,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