Pleets / dronephp

src/FileSystem/Shell.php

Spacing +17 added lines, -17 removed lines

@@ -92,28 +92,28 @@ 
             {
                 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))
                     {
-                        $directory_name = basename($directory).'/'.$i;
+                        $directory_name = basename($directory) . '/' . $i;
 
                         if (strpos($directory_name, './') === 0)
                         {
                             $from = './';
-                            $from = '/'.preg_quote($from, '/').'/';
+                            $from = '/' . preg_quote($from, '/') . '/';
                             $directory_name = preg_replace($from, "", $directory_name, 1);
                         }
 
                         $allContents[$directory_name] =
-                            $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);
                     }
                 }
@@ -187,7 +187,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;
             }
         }
@@ -331,7 +331,7 @@ 
                     {
                         foreach ($files["folders"] as $folder)
                         {
-                            if (!file_exists($dest.'/'.$folder))
+                            if (!file_exists($dest . '/' . $folder))
                                 mkdir("$dest/$folder", 0777, true);
                         }
 
@@ -340,7 +340,7 @@ 
                             foreach ($files["files"] as $item)
                             {
                                 if (!file_exists("$dest/$item"))
-                                    copy($item, $dest.'/'.$item);
+                                    copy($item, $dest . '/' . $item);
                             }
                         }
                     }
@@ -350,7 +350,7 @@ 
                         array_shift($files["folders"]);
 
                         $from = "$file/";
-                        $from = '/'.preg_quote($from, '/').'/';
+                        $from = '/' . preg_quote($from, '/') . '/';
 
                         if (count($files["folders"]))
                         {
@@ -358,7 +358,7 @@ 
                             {
                                 $_folder = preg_replace($from, "", $folder, 1);
 
-                                if (!file_exists($dest.'/'.$_folder))
+                                if (!file_exists($dest . '/' . $_folder))
                                     mkdir("$dest/$_folder", 0777, true);
                             }
                         }
@@ -370,7 +370,7 @@ 
                                 $_item = preg_replace($from, "", $item, 1);
 
                                 if (!file_exists("$dest/$_item"))
-                                    copy($item, $dest.'/'.$_item);
+                                    copy($item, $dest . '/' . $_item);
                             }
                         }
                     }
@@ -380,7 +380,7 @@ 
 
         }
         else if (is_dir($dest))
-            copy($file, $dest.'/'.$file);
+            copy($file, $dest . '/' . $file);
         else
             copy($file, $dest);
 
@@ -401,12 +401,12 @@ 
             throw new \InvalidArgumentException("Missing parameters");
 
         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;
@@ -436,7 +436,7 @@ 
         else {
             if (!is_dir($dir))
             {
-                if(!mkdir("$dir", 0777))
+                if (!mkdir("$dir", 0777))
                     return false;
             }
         }

Braces +99 added lines, -78 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,8 +99,7 @@ 
 
                         $this->buffer = $directory.'/'.$i;
                         call_user_func($fileCallback, $this);
-                    }
-                    else if (is_dir($directory.'/'.$i))
+                    } else if (is_dir($directory.'/'.$i))
                     {
                         $directory_name = basename($directory).'/'.$i;
 
@@ -118,14 +118,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;
     }
@@ -137,10 +138,11 @@ 
      */
     public function pwd()
     {
-        if (getcwd())
-            $this->buffer = getcwd();
-        else
-            return false;
+        if (getcwd()) {
+                    $this->buffer = getcwd();
+        } else {
+                    return false;
+        }
 
         return $this->buffer;
     }
@@ -159,36 +161,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;
+                }
             }
         }
 
@@ -208,8 +212,9 @@ 
 
         if (is_dir($path))
         {
-            if (chdir($path))
-                return true;
+            if (chdir($path)) {
+                            return true;
+            }
         }
 
         return false;
@@ -249,12 +254,13 @@ 
      */
     public function rm($file, $recursive = false)
     {
-        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;
 
@@ -291,11 +297,13 @@ 
      */
     public function cp($file, $dest, $recursive = false)
     {
-        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);
 
@@ -308,8 +316,9 @@ 
 
             $files["folders"][] = is_dir($dest) ? basename($file) : $dest;
 
-            if (!$dest_exists)
-                mkdir($dest);
+            if (!$dest_exists) {
+                            mkdir($dest);
+            }
 
             $that = $this;
 
@@ -331,20 +340,21 @@ 
                     {
                         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/$item"))
-                                    copy($item, $dest.'/'.$item);
+                                if (!file_exists("$dest/$item")) {
+                                                                    copy($item, $dest.'/'.$item);
+                                }
                             }
                         }
-                    }
-                    else
+                    } else
                     {
                         # directory previoulsy created
                         array_shift($files["folders"]);
@@ -358,8 +368,9 @@ 
                             {
                                 $_folder = preg_replace($from, "", $folder, 1);
 
-                                if (!file_exists($dest.'/'.$_folder))
-                                    mkdir("$dest/$_folder", 0777, true);
+                                if (!file_exists($dest.'/'.$_folder)) {
+                                                                    mkdir("$dest/$_folder", 0777, true);
+                                }
                             }
                         }
 
@@ -369,8 +380,9 @@ 
                             {
                                 $_item = preg_replace($from, "", $item, 1);
 
-                                if (!file_exists("$dest/$_item"))
-                                    copy($item, $dest.'/'.$_item);
+                                if (!file_exists("$dest/$_item")) {
+                                                                    copy($item, $dest.'/'.$_item);
+                                }
                             }
                         }
                     }
@@ -378,11 +390,11 @@ 
             );
 
 
+        } 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;
     }
@@ -397,17 +409,21 @@ 
      */
     public function mv($oldfile, $newfile)
     {
-        if (empty($oldfile) || empty($newfile))
-            throw new \InvalidArgumentException("Missing parameters");
+        if (empty($oldfile) || empty($newfile)) {
+                    throw new \InvalidArgumentException("Missing parameters");
+        }
 
-        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;
     }
@@ -423,21 +439,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;
@@ -452,12 +471,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

src/Network/Socket/Server.php

Spacing +1 added lines, -1 removed lines

@@ -74,7 +74,7 @@
     public function listen(Array $eventHandlers = array())
     {
         $event = $eventHandlers;
-        $clousure = function(){};
+        $clousure = function() {};
 
         if (!array_key_exists('success', $event))
             $event["success"] = $clousure;

Braces +10 added lines, -8 removed lines

@@ -76,11 +76,13 @@ 
         $event = $eventHandlers;
         $clousure = function(){};
 
-        if (!array_key_exists('success', $event))
-            $event["success"] = $clousure;
+        if (!array_key_exists('success', $event)) {
+                    $event["success"] = $clousure;
+        }
 
-        if (!array_key_exists('error', $event))
-            $event["error"] = $clousure;
+        if (!array_key_exists('error', $event)) {
+                    $event["error"] = $clousure;
+        }
 
         $listener = false;
 
@@ -90,8 +92,7 @@ 
             $this->error($errno, socket_strerror($errno));
 
             throw new \RuntimeException("Could not set socket to listen");
-        }
-        else {
+        } else {
 
             echo "\n";
             echo "Server Started : " . date('Y-m-d H:i:s') . "\n";
@@ -114,8 +115,9 @@ 
             socket_close($spawn);
         }
 
-        if (!$listener)
-            call_user_func($event["error"], $this->getLastError());
+        if (!$listener) {
+                    call_user_func($event["error"], $this->getLastError());
+        }
 
         return $listener;
     }

test/Db/Driver/MySQLTest.php

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());
@@ -156,13 +152,11 @@ 
         try
         {
             $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());
@@ -242,13 +236,11 @@ 
         {
             $sql = "INSERT INTO MYTABLE (DESCRIPTION, WRONG) VALUES ('Hello world!')";
             $conn->execute($sql);
-        }
-        catch (\Exception $e)
+        } catch (\Exception $e)
         {
             $errorObject = ($e instanceof InvalidQueryException);
             $message = $e->getMessage();
-        }
-        finally
+        } finally
         {
             $this->assertTrue($errorObject, $message);
         }
@@ -517,8 +509,7 @@ 
 
             $sql = "INSERT INTO MYTABLE (DESCRIPTION, WRONG) VALUES ('TRANS_SHORTCUT_2')";
             $conn->execute($sql);
-        }
-        catch (InvalidQueryException $e)
+        } catch (InvalidQueryException $e)
         {
             $message = $e->getMessage();
             #·not necessary!

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);
 
@@ -273,7 +273,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);
@@ -300,12 +300,12 @@ 
         $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());
 
@@ -314,7 +314,7 @@ 
         $conn->execute($sql);
         $rowcount = count($conn->getArrayResult());
 
-        $this->assertTrue(($rowcount === 1));    # the row is available
+        $this->assertTrue(($rowcount === 1)); # the row is available
     }
 
     /**
@@ -337,12 +337,12 @@ 
         $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());
 
@@ -351,7 +351,7 @@ 
         $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
     }
 
     /**
@@ -383,12 +383,12 @@ 
         $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());
 
@@ -397,7 +397,7 @@ 
         $conn->execute($sql);
         $rowcount = count($conn->getArrayResult());
 
-        $this->assertTrue(($rowcount === 4));    # the row is available
+        $this->assertTrue(($rowcount === 4)); # the row is available
     }
 
     /**
@@ -429,12 +429,12 @@ 
         $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());
 
@@ -443,7 +443,7 @@ 
         $conn->execute($sql);
         $rowcount = count($conn->getArrayResult());
 
-        $this->assertNotTrue(($rowcount === 4));    # the row is available
+        $this->assertNotTrue(($rowcount === 4)); # the row is available
     }
 
     /**
@@ -474,12 +474,12 @@ 
         $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();
@@ -489,7 +489,7 @@ 
         $conn->execute($sql);
         $rowcount = count($conn->getArrayResult());
 
-        $this->assertTrue(($rowcount === 2));    # the row is available
+        $this->assertTrue(($rowcount === 2)); # the row is available
     }
 
     /**
@@ -533,7 +533,7 @@ 
         $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
 
         # remove all work
         $conn->execute("DROP TABLE MYTABLE");

src/Network/Http.php

Braces +3 added lines, -2 removed lines

@@ -127,8 +127,9 @@
     {
         $codes = $this->httpStatusCodes;
 
-        if (!in_array($code, array_keys($codes)))
-            throw new \RuntimeException("Status code not supported");
+        if (!in_array($code, array_keys($codes))) {
+                    throw new \RuntimeException("Status code not supported");
+        }
 
         return $this->httpStatusCodes[$code];
     }

test/Network/HttpTest.php

Braces +2 added lines, -4 removed lines

@@ -56,13 +56,11 @@
         try
         {
             $text = $http->getStatusText(65431);
-        }
-        catch (\Exception $e)
+        } catch (\Exception $e)
         {
             $errorObject = ($e instanceof \RuntimeException);
             $message = $e->getMessage();
-        }
-        finally
+        } finally
         {
             $this->assertTrue($errorObject, $message);
         }