Pleets / dronephp

src/Db/Entity.php

Braces +5 added lines, -4 removed lines

@@ -109,11 +109,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 '$class'");
             }
-            else
-                throw new \LogicException("The property '$prop' does not exists in the class '$class'");
         }
     }
 

src/Db/Driver/AbstractDriver.php

Spacing +2 added lines, -2 removed lines

@@ -298,8 +298,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);
         }
     }
 

Braces +29 added lines, -20 removed lines

@@ -209,8 +209,9 @@ 
      */
     public function getArrayResult()
     {
-        if (count($this->arrayResult))
-            return $this->arrayResult;
+        if (count($this->arrayResult)) {
+                    return $this->arrayResult;
+        }
 
         return $this->toArray();
     }
@@ -298,8 +299,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);
+            }
         }
     }
 
@@ -343,8 +345,9 @@ 
      */
     public function reconnect()
     {
-        if (!$this->isConnected())
-            throw new \LogicException("Connection was not established");
+        if (!$this->isConnected()) {
+                    throw new \LogicException("Connection was not established");
+        }
 
         $this->disconnect();
         return $this->connect();
@@ -373,8 +376,9 @@ 
      */
     public function disconnect()
     {
-        if (!$this->isConnected())
-            throw new \LogicException("Connection was not established");
+        if (!$this->isConnected()) {
+                    throw new \LogicException("Connection was not established");
+        }
     }
 
     /**
@@ -386,11 +390,13 @@ 
      */
     public function beginTransaction()
     {
-        if (!$this->isConnected())
-            $this->connect();
+        if (!$this->isConnected()) {
+                    $this->connect();
+        }
 
-        if ($this->transac_mode)
-            throw new \LogicException($this->standardErrors[Errno::DB_TRANSACTION_STARTED]);
+        if ($this->transac_mode) {
+                    throw new \LogicException($this->standardErrors[Errno::DB_TRANSACTION_STARTED]);
+        }
 
         $this->transac_mode = true;
     }
@@ -404,16 +410,19 @@ 
      */
     public function endTransaction()
     {
-        if (!$this->transac_mode)
-            throw new \LogicException($this->standardErrors[Errno::DB_TRANSACTION_NOT_STARTED]);
+        if (!$this->transac_mode) {
+                    throw new \LogicException($this->standardErrors[Errno::DB_TRANSACTION_NOT_STARTED]);
+        }
 
-        if (is_null($this->transac_result))
-            throw new \LogicException($this->standardErrors[Errno::DB_TRANSACTION_EMPTY]);
+        if (is_null($this->transac_result)) {
+                    throw new \LogicException($this->standardErrors[Errno::DB_TRANSACTION_EMPTY]);
+        }
 
-        if ($this->transac_result)
-            $this->commit();
-        else
-            $this->rollback();
+        if ($this->transac_result) {
+                    $this->commit();
+        } else {
+                    $this->rollback();
+        }
 
         $this->result = $this->transac_result;
 

src/Db/Driver/MySQL.php

Spacing +2 added lines, -2 removed lines

@@ -108,7 +108,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
@@ -164,7 +164,7 @@ 
             $this->rowsAffected = $this->result->affected_rows;
 
         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 +46 added lines, -35 removed lines

@@ -24,15 +24,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();
+        }
     }
 
     /**
@@ -45,13 +47,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))
-            $this->dbconn = @new \mysqli($this->dbhost, $this->dbuser, $this->dbpass, $this->dbname, $this->dbport);
-        else
-            $this->dbconn = @new \mysqli($this->dbhost, $this->dbuser, $this->dbpass, $this->dbname);
+        if (!is_null($this->dbport) && !empty($this->dbport)) {
+                    $this->dbconn = @new \mysqli($this->dbhost, $this->dbuser, $this->dbpass, $this->dbname, $this->dbport);
+        } else {
+                    $this->dbconn = @new \mysqli($this->dbhost, $this->dbuser, $this->dbpass, $this->dbname);
+        }
 
         if ($this->dbconn->connect_errno)
         {
@@ -61,9 +65,9 @@ 
              * the warning message "Property access is not allowed yet".
              */
             throw new Exception\ConnectionException(mysqli_connect_error(), mysqli_connect_errno());
+        } else {
+                    $this->dbconn->set_charset($this->dbchar);
         }
-        else
-            $this->dbconn->set_charset($this->dbchar);
 
         return $this->dbconn;
     }
@@ -106,13 +110,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 . ']';
             }
@@ -133,12 +139,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);
 
@@ -154,17 +160,21 @@ 
             throw new Exception\InvalidQueryException($this->dbconn->error, $this->dbconn->errno);
         }
 
-        if (is_object($this->result) && property_exists($this->result, 'num_rows'))
-            $this->numRows = $this->result->num_rows;
+        if (is_object($this->result) && property_exists($this->result, 'num_rows')) {
+                    $this->numRows = $this->result->num_rows;
+        }
 
-        if (is_object($this->result) && property_exists($this->result, 'field_count'))
-            $this->numFields = $this->result->field_count;
+        if (is_object($this->result) && property_exists($this->result, 'field_count')) {
+                    $this->numFields = $this->result->field_count;
+        }
 
-        if (is_object($this->result) && property_exists($this->result, 'affected_rows'))
-            $this->rowsAffected = $this->result->affected_rows;
+        if (is_object($this->result) && property_exists($this->result, 'affected_rows')) {
+                    $this->rowsAffected = $this->result->affected_rows;
+        }
 
-        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;
     }
@@ -220,9 +230,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().
@@ -230,6 +239,7 @@ 
              * Ref: http://php.net/manual/en/class.logicexception.php
              */
             throw new \LogicException('There are not data in the buffer!');
+        }
 
         $this->arrayResult = $data;
 
@@ -244,7 +254,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/Db/Driver/Oracle.php

Spacing +6 added lines, -6 removed lines

@@ -52,10 +52,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;
 
-        $this->dbconn = @oci_connect($this->dbuser,  $this->dbpass, $connection_string, $this->dbchar);
+        $this->dbconn = @oci_connect($this->dbuser, $this->dbpass, $connection_string, $this->dbchar);
 
         if ($this->dbconn === false)
         {
@@ -122,7 +122,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);
 
@@ -143,7 +143,7 @@ 
         $this->numFields = oci_num_fields($stid);
 
         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;
     }
@@ -186,7 +186,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

@@ -24,15 +24,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();
+        }
     }
 
     /**
@@ -45,8 +47,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
@@ -97,14 +100,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
@@ -142,8 +146,9 @@ 
         $this->numRows = count($rows);
         $this->numFields = oci_num_fields($stid);
 
-        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;
     }
@@ -190,9 +195,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().
@@ -200,6 +204,7 @@ 
              * Ref: http://php.net/manual/en/class.logicexception.php
              */
             throw new \LogicException('There are not data in the buffer!');
+        }
 
         $this->arrayResult = $data;
 
@@ -213,7 +218,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/Driver/DriverAdapter.php

Braces +8 added lines, -7 removed lines

@@ -85,13 +85,14 @@ 
             "Sqlsrv" => "Drone\Db\Driver\SQLServer",
         ];
 
-        if (gettype($connection_identifier) == 'array')
-            $connection_array = $connection_identifier;
-        else
+        if (gettype($connection_identifier) == 'array') {
+                    $connection_array = $connection_identifier;
+        } else
         {
             # Take connection parameters from configuration file
-            if (!file_exists("config/database.config.php"))
-                throw new \RuntimeException("config/data.base.config.php is missing!");
+            if (!file_exists("config/database.config.php")) {
+                            throw new \RuntimeException("config/data.base.config.php is missing!");
+            }
 
             $dbsettings = include("config/database.config.php");
             $connection_array = $dbsettings[$connection_identifier];
@@ -106,8 +107,8 @@ 
 
             $this->driverName = $drv;
             $this->db = new $driver[$drv]($connection_array);
+        } else {
+                    throw new \RuntimeException("The Database driver does not exists");
         }
-        else
-            throw new \RuntimeException("The Database driver does not exists");
     }
 }
\ No newline at end of file

src/Db/SQLFunction.php

Braces +3 added lines, -2 removed lines

@@ -77,8 +77,9 @@
 
         foreach ($arguments as $key => $arg)
         {
-            if (is_string($arg))
-                $arguments[$key] = "'$arg'";
+            if (is_string($arg)) {
+                            $arguments[$key] = "'$arg'";
+            }
         }
 
         $arguments = implode(", ", array_values($arguments));

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/TableGateway.php

Braces +45 added lines, -45 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,9 +118,9 @@ 
             }
 
             $where = "WHERE \r\n\t" . implode(" AND\r\n\t", $parsed_where);
+        } else {
+                    $where = "";
         }
-        else
-            $where = "";
 
         $table = $this->entity->getTableName();
 
@@ -144,8 +143,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 = [];
 
@@ -168,11 +168,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)
                 {
@@ -222,11 +222,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 = [];
 
@@ -238,11 +240,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 = [];
 
@@ -253,8 +255,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;
@@ -269,8 +272,7 @@ 
                 }
 
                 $parsed_set[] = "$key IN (" . implode(", ", $parsed_in) . ")";
-            }
-            else
+            } else
             {
                 switch ($driver)
                 {
@@ -296,11 +298,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 = [];
 
@@ -323,8 +325,7 @@ 
                 }
 
                 $parsed_where[] = "$key IN (" . implode(", ", $parsed_in) . ")";
-            }
-            else
+            } else
             {
                 switch ($driver)
                 {
@@ -376,11 +377,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 = [];
 
@@ -403,8 +404,7 @@ 
                     }
 
                     $parsed_where[] = "$key IN (" . implode(", ", $parsed_in) . ")";
-                }
-                else
+                } else
                 {
                     switch ($driver)
                     {
@@ -422,9 +422,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();