Pleets / dronephp

src/Network/Socket/AbstractSocket.php

Spacing +2 added lines, -2 removed lines

@@ -108,8 +108,8 @@
     {
         foreach ($options as $option => $value)
         {
-            if (property_exists(__CLASS__, strtolower($option)) && method_exists($this, 'set'.$option))
-            $this->{'set'.$option}($value);
+            if (property_exists(__CLASS__, strtolower($option)) && method_exists($this, 'set' . $option))
+            $this->{'set' . $option}($value);
         }
 
         if (!($socket = @socket_create(AF_INET, SOCK_STREAM, SOL_TCP)))

Braces +3 added lines, -2 removed lines

@@ -108,8 +108,9 @@
     {
         foreach ($options as $option => $value)
         {
-            if (property_exists(__CLASS__, strtolower($option)) && method_exists($this, 'set'.$option))
-            $this->{'set'.$option}($value);
+            if (property_exists(__CLASS__, strtolower($option)) && method_exists($this, 'set'.$option)) {
+                        $this->{'set'.$option}($value);
+            }
         }
 
         if (!($socket = @socket_create(AF_INET, SOCK_STREAM, SOL_TCP)))

src/Db/Entity.php

Braces +5 added lines, -4 removed lines

@@ -107,11 +107,12 @@
             {
                 $this->$prop = $value;
 
-                if (!in_array($prop, $this->changedFields))
-                    $this->changedFields[] = $prop;
+                if (!in_array($prop, $this->changedFields)) {
+                                    $this->changedFields[] = $prop;
+                }
+            } else {
+                            throw new \LogicException("The property '$prop' does not exists in the class ' " . get_class($this) . " '");
             }
-            else
-                throw new \LogicException("The property '$prop' does not exists in the class ' " . get_class($this) . " '");
         }
     }
 

src/Db/Driver/Oracle.php

Spacing +6 added lines, -6 removed lines

@@ -59,10 +59,10 @@ 
             ? $this->dbname
             :
                 (!is_null($this->dbport) && !empty($this->dbport))
-                    ? $this->dbhost .":". $this->dbport ."/". $this->dbname
-                    : $this->dbhost ."/". $this->dbname;
+                    ? $this->dbhost . ":" . $this->dbport . "/" . $this->dbname
+                    : $this->dbhost . "/" . $this->dbname;
 
-        $conn = @oci_connect($this->dbuser,  $this->dbpass, $connection_string, $this->dbchar);
+        $conn = @oci_connect($this->dbuser, $this->dbpass, $connection_string, $this->dbchar);
 
         if ($conn === false)
         {
@@ -131,7 +131,7 @@ 
         $prev_error_handler = set_error_handler(['\Drone\Error\ErrorHandler', 'errorControlOperator'], E_ALL);
 
         // may be throw a Fatal error (Ex: Maximum execution time)
-        $r = ($this->transac_mode) ? oci_execute($stid, OCI_NO_AUTO_COMMIT) : oci_execute($stid,  OCI_COMMIT_ON_SUCCESS);
+        $r = ($this->transac_mode) ? oci_execute($stid, OCI_NO_AUTO_COMMIT) : oci_execute($stid, OCI_COMMIT_ON_SUCCESS);
 
         set_error_handler($prev_error_handler);
 
@@ -152,7 +152,7 @@ 
         $this->numFields = oci_num_fields($stid);
 
         if ($this->transac_mode)
-            $this->transac_result = is_null($this->transac_result) ? $stid: $this->transac_result && $stid;
+            $this->transac_result = is_null($this->transac_result) ? $stid : $this->transac_result && $stid;
 
         $this->result = $stid;
 
@@ -197,7 +197,7 @@ 
 
         if ($this->result)
         {
-            while ( ($row = @oci_fetch_array($this->result, OCI_BOTH + OCI_RETURN_NULLS)) !== false )
+            while (($row = @oci_fetch_array($this->result, OCI_BOTH + OCI_RETURN_NULLS)) !== false)
             {
                 $data[] = $row;
             }

Braces +25 added lines, -19 removed lines

@@ -31,15 +31,17 @@ 
      */
     public function __construct($options)
     {
-        if (!array_key_exists("dbchar", $options))
-            $options["dbchar"] = "AL32UTF8";
+        if (!array_key_exists("dbchar", $options)) {
+                    $options["dbchar"] = "AL32UTF8";
+        }
 
         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,8 +54,9 @@ 
      */
     public function connect()
     {
-        if (!extension_loaded('oci8'))
-            throw new \RuntimeException("The Oci8 extension is not loaded");
+        if (!extension_loaded('oci8')) {
+                    throw new \RuntimeException("The Oci8 extension is not loaded");
+        }
 
         $connection_string = (is_null($this->dbhost) || empty($this->dbhost))
             ? $this->dbname
@@ -106,14 +109,15 @@ 
                 ];
 
                 $this->error($error["message"]);
+            } else {
+                            $this->error($error["code"], $error["message"]);
             }
-            else
-                $this->error($error["code"], $error["message"]);
 
-            if (array_key_exists("code", $error))
-                throw new Exception\InvalidQueryException($error["message"], $error["code"]);
-            else
-                throw new Exception\InvalidQueryException($error["message"]);
+            if (array_key_exists("code", $error)) {
+                            throw new Exception\InvalidQueryException($error["message"], $error["code"]);
+            } else {
+                            throw new Exception\InvalidQueryException($error["message"]);
+            }
         }
 
         # Bound variables
@@ -151,8 +155,9 @@ 
         $this->numRows = count($rows);
         $this->numFields = oci_num_fields($stid);
 
-        if ($this->transac_mode)
-            $this->transac_result = is_null($this->transac_result) ? $stid: $this->transac_result && $stid;
+        if ($this->transac_mode) {
+                    $this->transac_result = is_null($this->transac_result) ? $stid: $this->transac_result && $stid;
+        }
 
         $this->result = $stid;
 
@@ -201,9 +206,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().
@@ -211,6 +215,7 @@ 
              * Ref: http://php.net/manual/en/class.logicexception.php
              */
             throw new \LogicException('There are not data in the buffer!');
+        }
 
         $this->arrayResult = $data;
 
@@ -224,7 +229,8 @@ 
      */
     public function __destruct()
     {
-        if ($this->dbconn)
-            oci_close($this->dbconn);
+        if ($this->dbconn) {
+                    oci_close($this->dbconn);
+        }
     }
 }
\ No newline at end of file

src/Db/TableGateway/TableGateway.php

Braces +50 added lines, -49 removed lines

@@ -73,11 +73,11 @@ 
             {
                 $k++;
 
-                if (is_null($value))
-                    $parsed_where[] = "$key IS NULL";
-                elseif ($value instanceof SQLFunction)
-                    $parsed_where[] = "$key = " . $value->getStatement();
-                elseif (is_array($value))
+                if (is_null($value)) {
+                                    $parsed_where[] = "$key IS NULL";
+                } elseif ($value instanceof SQLFunction) {
+                                    $parsed_where[] = "$key = " . $value->getStatement();
+                } elseif (is_array($value))
                 {
                     $parsed_in = [];
 
@@ -100,8 +100,7 @@ 
                     }
 
                     $parsed_where[] = "$key IN (" . implode(", ", $parsed_in) . ")";
-                }
-                else
+                } else
                 {
                     switch ($driver)
                     {
@@ -119,18 +118,19 @@ 
             }
 
             $where = "WHERE \r\n\t" . implode(" AND\r\n\t", $parsed_where);
+        } else {
+                    $where = "";
         }
-        else
-            $where = "";
 
         $table = $this->entity->getTableName();
 
         $sql = "SELECT * \r\nFROM {$table}\r\n$where";
 
-        if (count($bind_values))
-            $this->getDriver()->getDb()->execute($sql, $bind_values);
-        else
-            $this->getDriver()->getDb()->execute($sql);
+        if (count($bind_values)) {
+                    $this->getDriver()->getDb()->execute($sql, $bind_values);
+        } else {
+                    $this->getDriver()->getDb()->execute($sql);
+        }
 
         return $this->getDriver()->getDb()->getArrayResult();
     }
@@ -147,8 +147,9 @@ 
      */
     public function insert(Array $data)
     {
-        if (!count($data))
-            throw new \LogicException("Missing values for INSERT statement!");
+        if (!count($data)) {
+                    throw new \LogicException("Missing values for INSERT statement!");
+        }
 
         $bind_values = [];
 
@@ -171,11 +172,11 @@ 
                 continue;
             }
 
-            if (is_null($value))
-                $value = "NULL";
-            elseif ($value instanceof SQLFunction)
-                $value = $value->getStatement();
-            else {
+            if (is_null($value)) {
+                            $value = "NULL";
+            } elseif ($value instanceof SQLFunction) {
+                            $value = $value->getStatement();
+            } else {
 
                 switch ($driver)
                 {
@@ -225,11 +226,13 @@ 
     {
         $parsed_set = [];
 
-        if (!count($set))
-            throw new \LogicException("You cannot update rows without SET clause");
+        if (!count($set)) {
+                    throw new \LogicException("You cannot update rows without SET clause");
+        }
 
-        if (!count($where))
-            throw new SecurityException("You cannot update rows without WHERE clause!");
+        if (!count($where)) {
+                    throw new SecurityException("You cannot update rows without WHERE clause!");
+        }
 
         $bind_values = [];
 
@@ -241,11 +244,11 @@ 
         {
             $k++;
 
-            if (is_null($value))
-                $parsed_set[] = "$key = NULL";
-            elseif ($value instanceof SQLFunction)
-                $parsed_set[] = "$key = " . $value->getStatement();
-            elseif (is_array($value))
+            if (is_null($value)) {
+                            $parsed_set[] = "$key = NULL";
+            } elseif ($value instanceof SQLFunction) {
+                            $parsed_set[] = "$key = " . $value->getStatement();
+            } elseif (is_array($value))
             {
                 $parsed_in = [];
 
@@ -256,8 +259,9 @@ 
                         case 'Oci8':
 
                             # [POSSIBLE BUG] - To Future revision (What about non-string values ?)
-                            if (is_string($in_value))
-                                $parsed_in[] = ":$k";
+                            if (is_string($in_value)) {
+                                                            $parsed_in[] = ":$k";
+                            }
 
                             $bind_values[":$k"] = $in_value;
                             break;
@@ -272,8 +276,7 @@ 
                 }
 
                 $parsed_set[] = "$key IN (" . implode(", ", $parsed_in) . ")";
-            }
-            else
+            } else
             {
                 switch ($driver)
                 {
@@ -298,11 +301,11 @@ 
         {
             $k++;
 
-            if (is_null($value))
-                $parsed_where[] = "$key IS NULL";
-            elseif ($value instanceof SQLFunction)
-                $parsed_where[] = "$key = " . $value->getStatement();
-            elseif (is_array($value))
+            if (is_null($value)) {
+                            $parsed_where[] = "$key IS NULL";
+            } elseif ($value instanceof SQLFunction) {
+                            $parsed_where[] = "$key = " . $value->getStatement();
+            } elseif (is_array($value))
             {
                 $parsed_in = [];
 
@@ -325,8 +328,7 @@ 
                 }
 
                 $parsed_where[] = "$key IN (" . implode(", ", $parsed_in) . ")";
-            }
-            else
+            } else
             {
                 switch ($driver)
                 {
@@ -378,11 +380,11 @@ 
             {
                 $k++;
 
-                if (is_null($value))
-                    $parsed_where[] = "$key IS NULL";
-                elseif ($value instanceof SQLFunction)
-                    $parsed_where[] = "$key = " . $value->getStatement();
-                elseif (is_array($value))
+                if (is_null($value)) {
+                                    $parsed_where[] = "$key IS NULL";
+                } elseif ($value instanceof SQLFunction) {
+                                    $parsed_where[] = "$key = " . $value->getStatement();
+                } elseif (is_array($value))
                 {
                     $parsed_in = [];
 
@@ -405,8 +407,7 @@ 
                     }
 
                     $parsed_where[] = "$key IN (" . implode(", ", $parsed_in) . ")";
-                }
-                else
+                } else
                 {
                     switch ($driver)
                     {
@@ -424,9 +425,9 @@ 
             }
 
             $where = "\r\nWHERE \r\n\t" . implode(" AND\r\n\t", $parsed_where);
+        } else {
+                    throw new SecurityException("You cannot delete rows without WHERE clause!. Use TRUNCATE statement instead.");
         }
-        else
-            throw new SecurityException("You cannot delete rows without WHERE clause!. Use TRUNCATE statement instead.");
 
         $table = $this->entity->getTableName();
 

src/Db/Driver/SQLServer.php

Spacing +2 added lines, -2 removed lines

@@ -132,7 +132,7 @@ 
         else
         {
             if ($isSelectStm)
-                $exec = $this->result = sqlsrv_query($this->dbconn, $sql, $params, array( "Scrollable" => SQLSRV_CURSOR_KEYSET ));
+                $exec = $this->result = sqlsrv_query($this->dbconn, $sql, $params, array("Scrollable" => SQLSRV_CURSOR_KEYSET));
             else
                 $exec = $this->result = sqlsrv_query($this->dbconn, $sql, $params);
         }
@@ -158,7 +158,7 @@ 
             $this->rowsAffected = sqlsrv_rows_affected($this->result);
 
         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;
 
         return $this->result;
     }

Braces +30 added lines, -23 removed lines

@@ -31,15 +31,17 @@ 
      */
     public function __construct($options)
     {
-        if (!array_key_exists("dbchar", $options))
-            $options["dbchar"] = "UTF-8";
+        if (!array_key_exists("dbchar", $options)) {
+                    $options["dbchar"] = "UTF-8";
+        }
 
         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,11 +54,13 @@ 
      */
     public function connect()
     {
-        if (!extension_loaded('sqlsrv'))
-            throw new \RuntimeException("The Sqlsrv extension is not loaded");
+        if (!extension_loaded('sqlsrv')) {
+                    throw new \RuntimeException("The Sqlsrv extension is not loaded");
+        }
 
-        if (!is_null($this->dbport) && !empty($this->dbport))
-            $this->dbhost .= ', ' . $this->dbport;
+        if (!is_null($this->dbport) && !empty($this->dbport)) {
+                    $this->dbhost .= ', ' . $this->dbport;
+        }
 
         $db_info = array("Database" => $this->dbname, "UID" => $this->dbuser, "PWD" => $this->dbpass, "CharacterSet" => $this->dbchar);
         $conn = sqlsrv_connect($this->dbhost, $db_info);
@@ -137,13 +141,13 @@ 
             }
 
             $exec = sqlsrv_execute($stmt);
-        }
-        else
+        } else
         {
-            if ($isSelectStm)
-                $exec = $this->result = sqlsrv_query($this->dbconn, $sql, $params, array( "Scrollable" => SQLSRV_CURSOR_KEYSET ));
-            else
-                $exec = $this->result = sqlsrv_query($this->dbconn, $sql, $params);
+            if ($isSelectStm) {
+                            $exec = $this->result = sqlsrv_query($this->dbconn, $sql, $params, array( "Scrollable" => SQLSRV_CURSOR_KEYSET ));
+            } else {
+                            $exec = $this->result = sqlsrv_query($this->dbconn, $sql, $params);
+            }
         }
 
         if ($exec === false)
@@ -163,11 +167,13 @@ 
         $this->numRows = sqlsrv_has_rows($this->result) ? sqlsrv_num_rows($this->result) : $this->numRows;
         $this->numFields = sqlsrv_num_fields($this->result);
 
-        if ($isInsertStm || $isUpdateStm || $isDeleteStm)
-            $this->rowsAffected = sqlsrv_rows_affected($this->result);
+        if ($isInsertStm || $isUpdateStm || $isDeleteStm) {
+                    $this->rowsAffected = sqlsrv_rows_affected($this->result);
+        }
 
-        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;
+        }
 
         return $this->result;
     }
@@ -234,9 +240,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().
@@ -244,6 +249,7 @@ 
              * Ref: http://php.net/manual/en/class.logicexception.php
              */
             throw new \LogicException('There are not data in the buffer!');
+        }
 
         $this->arrayResult = $data;
 
@@ -257,7 +263,8 @@ 
      */
     public function __destruct()
     {
-        if ($this->dbconn)
-            sqlsrv_close($this->dbconn);
+        if ($this->dbconn) {
+                    sqlsrv_close($this->dbconn);
+        }
     }
 }
\ No newline at end of file

test/FileSystem/ShellTest.php

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

Indentation +1 added lines, -1 removed lines

@@ -194,7 +194,7 @@
         $this->assertTrue(is_dir('foo4/foo2'));
         $this->assertTrue(file_exists('foo4/foo2/new3.txt'));
         $this->assertTrue(file_exists('foo4/foo2/new4.txt'));
-   }
+    }
 
     /**
      * Tests removing files

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 +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;
     }