Pleets / dronephp

src/Pear/Mail.php

Braces +12 added lines, -8 removed lines

@@ -74,18 +74,21 @@ 
     {
         @include_once 'System.php';
 
-        if (!class_exists('System', false))
-            throw new \RuntimeException("PEAR is not installed in your system!");
+        if (!class_exists('System', false)) {
+                    throw new \RuntimeException("PEAR is not installed in your system!");
+        }
 
         include_once 'Net/SMTP.php';
 
-        if (!class_exists('\Net_SMTP', false))
-            throw new \RuntimeException("PEAR::Net_SMTP is not installed!");
+        if (!class_exists('\Net_SMTP', false)) {
+                    throw new \RuntimeException("PEAR::Net_SMTP is not installed!");
+        }
 
         @include_once 'Mail.php';
 
-        if (!class_exists('\Mail', false))
-            throw new \RuntimeException("PEAR::Mail is not installed!");
+        if (!class_exists('\Mail', false)) {
+                    throw new \RuntimeException("PEAR::Mail is not installed!");
+        }
     }
 
     /**
@@ -98,8 +101,9 @@ 
      */
     protected function error($code, $message = null)
     {
-        if (!array_key_exists($code, $this->errors))
-            $this->errors[$message] = (is_null($message) && array_key_exists($code, $this->errors)) ? $this->errors[$code] : $message;
+        if (!array_key_exists($code, $this->errors)) {
+                    $this->errors[$message] = (is_null($message) && array_key_exists($code, $this->errors)) ? $this->errors[$code] : $message;
+        }
     }
 
     /**

src/Network/Socket/AbstractSocket.php

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

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

Braces +29 added lines, -20 removed lines

@@ -209,8 +209,9 @@ 
      */
     public function getArrayResult()
     {
-        if (!empty($this->arrayResult))
-            return $this->arrayResult;
+        if (!empty($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/SQLServer.php

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

src/Mvc/Application.php

Braces +19 added lines, -16 removed lines

@@ -58,8 +58,9 @@ 
     public function prepare()
     {
         # start sessions
-        if (!isset($_SESSION))
-            session_start();
+        if (!isset($_SESSION)) {
+                    session_start();
+        }
     }
 
     /**
@@ -91,8 +92,7 @@ 
 
             // Best way to view all possible errors
             error_reporting(-1);
-        }
-        else {
+        } else {
             ini_set('display_errors', 0);
             error_reporting(-1);
         }
@@ -109,10 +109,11 @@ 
 
             foreach ($app_config_file["router"]["routes"] as $name => $route)
             {
-                if ($route instanceof \Zend\Router\Http\RouteInterface)
-                    $this->getRouter()->addZendRoute($name, $route);
-                else
-                    $this->getRouter()->addRoute($route);
+                if ($route instanceof \Zend\Router\Http\RouteInterface) {
+                                    $this->getRouter()->addZendRoute($name, $route);
+                } else {
+                                    $this->getRouter()->addRoute($route);
+                }
             }
         }
 
@@ -146,14 +147,15 @@ 
                  *  This instruction include each module declared in application.config.php
                  *  Each module has an autoloader to load its classes (controllers and models)
                  */
-                if (file_exists("module/".$module."/Module.php"))
-                    include("module/".$module."/Module.php");
+                if (file_exists("module/".$module."/Module.php")) {
+                                    include("module/".$module."/Module.php");
+                }
 
                 spl_autoload_register($module . "\Module::loader");
             }
+        } else {
+                    throw new \RuntimeException("The application must have at least one module");
         }
-        else
-            throw new \RuntimeException("The application must have at least one module");
     }
 
     /**
@@ -175,8 +177,9 @@ 
         $uri .= !empty($controller) ? '/' . $controller : "";
         $uri .= !empty($view) ? '/' . $view : "";
 
-        if (empty($uri))
-            $uri = "/";
+        if (empty($uri)) {
+                    $uri = "/";
+        }
 
         $request->setUri($uri);
 
@@ -191,9 +194,9 @@ 
             $view = $params["action"];
 
             $this->router->setIdentifiers($module, $controller, $view);
+        } else {
+                    $this->router->setIdentifiers($module, $controller, $view);
         }
-        else
-            $this->router->setIdentifiers($module, $controller, $view);
 
         $this->router->run();
     }

test/Db/Driver/MySQLTest.php

Braces +6 added lines, -12 removed lines

@@ -93,12 +93,10 @@ 
 
         try {
             $conn->disconnect();
-        }
-        catch (\Exception $e)
+        } catch (\Exception $e)
         {
             $errorObject = ($e instanceof \LogicException);
-        }
-        finally
+        } finally
         {
             $this->assertNotTrue($conn->isConnected());
             $this->assertTrue($errorObject, $e->getMessage());
@@ -134,12 +132,10 @@ 
 
         try {
             $conn->reconnect();
-        }
-        catch (\Exception $e)
+        } catch (\Exception $e)
         {
             $errorObject = ($e instanceof \LogicException);
-        }
-        finally
+        } finally
         {
             $this->assertTrue($errorObject, $e->getMessage());
             $this->assertNotTrue($conn->isConnected());
@@ -161,12 +157,10 @@ 
 
         try {
             $mysqliObject = $conn->connect();
-        }
-        catch (\Exception $e)
+        } catch (\Exception $e)
         {
             $errorObject = ($e instanceof ConnectionException);
-        }
-        finally
+        } finally
         {
             $this->assertTrue($errorObject, $e->getMessage());
             $this->assertNotTrue($conn->isConnected());