Pleets / dronephp

src/Db/TableGateway/TableGatewayInterface.php

Indentation +4 added lines, -4 removed lines

@@ -22,14 +22,14 @@ 
      *
      * @param array $where
      */
-	public function select(Array $where);
+    public function select(Array $where);
 
     /**
      * Insert statement
      *
      * @param array $data
      */
-	public function insert(Array $data);
+    public function insert(Array $data);
 
     /**
      * Update statement
@@ -37,12 +37,12 @@ 
      * @param array $set
      * @param array $where
      */
-	public function update(Array $set, Array $where);
+    public function update(Array $set, Array $where);
 
     /**
      * Delete statement
      *
      * @param array $where
      */
-	public function delete(Array $where);
+    public function delete(Array $where);
 }
\ No newline at end of file

src/Db/TableGateway/AbstractTableGateway.php

Braces +3 added lines, -2 removed lines

@@ -73,7 +73,8 @@
     {
         $this->currentDriverIdentifier = $connection_identifier;
 
-        if (!isset(self::$drivers[$connection_identifier]))
-            self::$drivers[$connection_identifier] = new DriverAdapter($connection_identifier, $auto_connect);
+        if (!isset(self::$drivers[$connection_identifier])) {
+                    self::$drivers[$connection_identifier] = new DriverAdapter($connection_identifier, $auto_connect);
+        }
     }
 }
\ No newline at end of file

src/Db/TableGateway/EntityAdapter.php

Braces +21 added lines, -16 removed lines

@@ -58,8 +58,9 @@ 
     {
         $result = $this->tableGateway->select($where);
 
-        if (!count($result))
-            return $result;
+        if (!count($result)) {
+                    return $result;
+        }
 
         $array_result = [];
 
@@ -69,8 +70,9 @@ 
 
             foreach ($row as $key => $value)
             {
-                if (is_string($key))
-                    $filtered_array[$key] = $value;
+                if (is_string($key)) {
+                                    $filtered_array[$key] = $value;
+                }
             }
 
             $user_entity = get_class($this->tableGateway->getEntity());
@@ -94,10 +96,11 @@ 
      */
     public function insert($entity)
     {
-        if ($entity instanceof Entity)
-            $entity = get_object_vars($entity);
-        else if (!is_array($entity))
-            throw new \InvalidArgumentException("Invalid type given. Drone\Db\Entity or Array expected");
+        if ($entity instanceof Entity) {
+                    $entity = get_object_vars($entity);
+        } else if (!is_array($entity)) {
+                    throw new \InvalidArgumentException("Invalid type given. Drone\Db\Entity or Array expected");
+        }
 
         $this->parseEntity($entity);
 
@@ -126,14 +129,15 @@ 
 
             foreach ($entity as $key => $value)
             {
-                if (in_array($key, $changedFields))
-                    $fieldsToModify[$key] = $value;
+                if (in_array($key, $changedFields)) {
+                                    $fieldsToModify[$key] = $value;
+                }
             }
 
             $entity = $fieldsToModify;
+        } else if (!is_array($entity)) {
+                    throw new \InvalidArgumentException("Invalid type given. Drone\Db\Entity or Array expected");
         }
-        else if (!is_array($entity))
-            throw new \InvalidArgumentException("Invalid type given. Drone\Db\Entity or Array expected");
 
         $this->parseEntity($entity);
 
@@ -152,10 +156,11 @@ 
      */
     public function delete($entity)
     {
-        if ($entity instanceof Entity)
-            $entity = get_object_vars($entity);
-        else if (!is_array($entity))
-            throw new \InvalidArgumentException("Invalid type given. Drone\Db\Entity or Array expected");
+        if ($entity instanceof Entity) {
+                    $entity = get_object_vars($entity);
+        } else if (!is_array($entity)) {
+                    throw new \InvalidArgumentException("Invalid type given. Drone\Db\Entity or Array expected");
+        }
 
         return $this->tableGateway->delete($entity);
     }

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