Pleets / dronephp

src/Exception/Storage.php

Braces +9 added lines, -6 removed lines

@@ -76,17 +76,20 @@
             "object"  => serialize($exception)
         ];
 
-        if (!function_exists('mb_detect_encoding'))
-            throw new \RuntimeException("mbstring library is not installed!");
+        if (!function_exists('mb_detect_encoding')) {
+                    throw new \RuntimeException("mbstring library is not installed!");
+        }
 
         /*
          * Encodes to UTF8 all messages. It ensures JSON encoding.
          */
-        if (!mb_detect_encoding($data[$id]["message"], 'UTF-8', true))
-            $data[$id]["message"] = utf8_encode($data[$id]["message"]);
+        if (!mb_detect_encoding($data[$id]["message"], 'UTF-8', true)) {
+                    $data[$id]["message"] = utf8_encode($data[$id]["message"]);
+        }
 
-        if (!mb_detect_encoding($data[$id]["object"], 'UTF-8', true))
-            $data[$id]["object"] = utf8_decode($data[$id]["object"]);
+        if (!mb_detect_encoding($data[$id]["object"], 'UTF-8', true)) {
+                    $data[$id]["object"] = utf8_decode($data[$id]["object"]);
+        }
 
         if (($encoded_data = json_encode($data)) === false)
         {

src/Mvc/Router.php

Braces +11 added lines, -8 removed lines

@@ -145,8 +145,9 @@ 
         $module = (is_null($this->identifiers["module"]) || empty($this->identifiers["module"]))
                     ? $this->routes["defaults"]["module"] : $this->identifiers["module"];
 
-        if (!array_key_exists($module, $this->routes))
-            throw new Exception\ModuleNotFoundException("The key '$module' does not exists in routes!");
+        if (!array_key_exists($module, $this->routes)) {
+                    throw new Exception\ModuleNotFoundException("The key '$module' does not exists in routes!");
+        }
 
         $controller = (is_null($this->identifiers["controller"]) || empty($this->identifiers["controller"]))
                     ? $this->routes[$module]["controller"] : $this->identifiers["controller"];
@@ -156,10 +157,11 @@ 
 
         $fqn_controller = '\\' . $module . "\Controller\\" . $controller;
 
-        if (class_exists($fqn_controller))
-            $this->controller = new $fqn_controller($module, $view, $this->basePath);
-        else
-            throw new Exception\ControllerNotFoundException("The control class '$fqn_controller' does not exists!");
+        if (class_exists($fqn_controller)) {
+                    $this->controller = new $fqn_controller($module, $view, $this->basePath);
+        } else {
+                    throw new Exception\ControllerNotFoundException("The control class '$fqn_controller' does not exists!");
+        }
     }
 
     /**
@@ -176,8 +178,9 @@ 
         $key = array_keys($route);
         $key = array_shift($key);
 
-        if (array_key_exists($key, $this->routes))
-            throw new \LogicException("The key '$key' was already defined as route");
+        if (array_key_exists($key, $this->routes)) {
+                    throw new \LogicException("The key '$key' was already defined as route");
+        }
 
         $this->routes = array_merge($this->routes, $route);
     }

src/Mvc/Application.php

Braces +9 added lines, -8 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);
         }
@@ -132,14 +132,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");
     }
 
     /**

src/Mvc/AbstractionModule.php

Braces +3 added lines, -2 removed lines

@@ -80,7 +80,8 @@
 
         $class = "module/" . $module . "/source/" . implode("/", $nm) . ".php";
 
-        if (file_exists($class))
-            include $class;
+        if (file_exists($class)) {
+                    include $class;
+        }
     }
 }
\ No newline at end of file

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

Braces +29 added lines, -20 removed lines

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

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

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