Pleets / dronephp

src/Db/Driver/Oracle.php

Braces +25 added lines, -19 removed lines

@@ -33,15 +33,17 @@ 
     {
         $this->driverName = 'Oci8';
 
-        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();
+        }
     }
 
     /**
@@ -54,8 +56,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
@@ -108,14 +111,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
@@ -155,8 +159,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;
 
@@ -205,10 +210,10 @@ 
             {
                 $data[] = $row;
             }
-        }
-        else
-            # This error is thrown because of 'execute' method has not been executed.
+        } else {
+                    # This error is thrown because of 'execute' method has not been executed.
             throw new \LogicException('There are not data in the buffer!');
+        }
 
         $this->arrayResult = $data;
 
@@ -222,7 +227,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/MySQL.php

Braces +48 added lines, -38 removed lines

@@ -33,15 +33,17 @@ 
     {
         $this->driverName = 'Mysqli';
 
-        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();
+        }
     }
 
     /**
@@ -54,13 +56,15 @@ 
      */
     public function connect()
     {
-        if (!extension_loaded('mysqli'))
-            throw new \RuntimeException("The Mysqli extension is not loaded");
+        if (!extension_loaded('mysqli')) {
+                    throw new \RuntimeException("The Mysqli extension is not loaded");
+        }
 
-        if (!is_null($this->dbport) && !empty($this->dbport))
-            $conn = @new \mysqli($this->dbhost, $this->dbuser, $this->dbpass, $this->dbname, $this->dbport);
-        else
-            $conn = @new \mysqli($this->dbhost, $this->dbuser, $this->dbpass, $this->dbname);
+        if (!is_null($this->dbport) && !empty($this->dbport)) {
+                    $conn = @new \mysqli($this->dbhost, $this->dbuser, $this->dbpass, $this->dbname, $this->dbport);
+        } else {
+                    $conn = @new \mysqli($this->dbhost, $this->dbuser, $this->dbpass, $this->dbname);
+        }
 
         if ($conn->connect_errno)
         {
@@ -70,8 +74,7 @@ 
              * the warning message "Property access is not allowed yet".
              */
             throw new Exception\ConnectionException(mysqli_connect_error(), mysqli_connect_errno());
-        }
-        else
+        } else
         {
             $this->dbconn = $conn;
             $this->dbconn->set_charset($this->dbchar);
@@ -118,13 +121,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,8 +138,7 @@ 
             eval('$stmt->bind_param(\'' . $bind_types . '\', ' . $values . ');');
 
             $r = $stmt->execute();
-        }
-        else
+        } else
         {
             $prev_error_handler = set_error_handler(['\Drone\Error\ErrorHandler', 'errorControlOperator'], E_ALL);
 
@@ -163,28 +167,33 @@ 
              * 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;
+            }
         }
 
         # identify SELECT, SHOW, DESCRIBE or EXPLAIN queries
-        if (is_object($this->result) && property_exists($this->result, 'num_rows'))
-            $this->numRows = $this->result->num_rows;
-        else
+        if (is_object($this->result) && property_exists($this->result, 'num_rows')) {
+                    $this->numRows = $this->result->num_rows;
+        } else
         {
-            if (property_exists($this->dbconn, 'affected_rows') && !$is_stmt_result)
-                $this->rowsAffected = $this->dbconn->affected_rows;
+            if (property_exists($this->dbconn, 'affected_rows') && !$is_stmt_result) {
+                            $this->rowsAffected = $this->dbconn->affected_rows;
+            }
         }
 
         # affected_rows return the same of num_rows on select statements!
-        if ($this->numRows > 0)
-            $this->rowsAffected = 0;
+        if ($this->numRows > 0) {
+                    $this->rowsAffected = 0;
+        }
 
-        if (property_exists($this->dbconn, 'field_count'))
-            $this->numFields = $this->dbconn->field_count;
+        if (property_exists($this->dbconn, 'field_count')) {
+                    $this->numFields = $this->dbconn->field_count;
+        }
 
-        if ($this->transac_mode)
-            $this->transac_result = is_null($this->transac_result) ? $this->result: $this->transac_result && $this->result;
+        if ($this->transac_mode) {
+                    $this->transac_result = is_null($this->transac_result) ? $this->result: $this->transac_result && $this->result;
+        }
         /*
          * Because mysqli_query() returns FALSE on failure, a mysqli_result object for SELECT, SHOW, DESCRIBE or EXPLAIN queries,
          * and TRUE for other successful queries, it should be handled to return only objects or resources.
@@ -252,10 +261,10 @@ 
             {
                 $data[] = $row;
             }
-        }
-        else
-            # This error is thrown because of 'execute' method has not been executed.
+        } else {
+                    # This error is thrown because of 'execute' method has not been executed.
             throw new \LogicException('There are not data in the buffer!');
+        }
 
         $this->arrayResult = $data;
 
@@ -270,7 +279,8 @@ 
     public function __destruct()
     {
         # prevent "Property access is not allowed yet" with @ on failure connections
-        if ($this->dbconn !== false && !is_null($this->dbconn))
-            @$this->dbconn->close();
+        if ($this->dbconn !== false && !is_null($this->dbconn)) {
+                    @$this->dbconn->close();
+        }
     }
 }
\ No newline at end of file

src/Validator/FormValidator.php

Braces +37 added lines, -28 removed lines

@@ -69,9 +69,10 @@ 
      */
     public function isValid()
     {
-        if (is_null($this->valid))
-            # This error is thrown because of 'setValid' method has not been executed.
+        if (is_null($this->valid)) {
+                    # This error is thrown because of 'setValid' method has not been executed.
             throw new \LogicException('No validation has been executed!');
+        }
 
         return $this->valid;
     }
@@ -98,8 +99,9 @@ 
     {
         $this->form = $form;
 
-        if (is_null($locale))
-            $locale = 'en';
+        if (is_null($locale)) {
+                    $locale = 'en';
+        }
 
         $i18nTranslator = \Zend\I18n\Translator\Translator::factory(
             [
@@ -133,8 +135,9 @@ 
 
         foreach ($elements as $label => $element)
         {
-            if (!$element->isFormControl())
-                continue;
+            if (!$element->isFormControl()) {
+                            continue;
+            }
 
             $attribs = $element->getAttributes();
 
@@ -203,19 +206,21 @@ 
 
                     case 'min':
 
-                        if (array_key_exists('type', $all_attribs) && in_array($all_attribs['type'], ['number', 'range']))
-                            $validator = new GreaterThan(['min' => $value, 'inclusive' => true]);
-                        else
-                            throw new \LogicException("The input type must be 'range' or 'number'");
+                        if (array_key_exists('type', $all_attribs) && in_array($all_attribs['type'], ['number', 'range'])) {
+                                                    $validator = new GreaterThan(['min' => $value, 'inclusive' => true]);
+                        } else {
+                                                    throw new \LogicException("The input type must be 'range' or 'number'");
+                        }
 
                         break;
 
                     case 'max':
 
-                        if (array_key_exists('type', $all_attribs) && in_array($all_attribs['type'], ['number', 'range']))
-                            $validator = new LessThan(['max' => $value, 'inclusive' => true]);
-                        else
-                            throw new \LogicException("The input type must be 'range' or 'number'");
+                        if (array_key_exists('type', $all_attribs) && in_array($all_attribs['type'], ['number', 'range'])) {
+                                                    $validator = new LessThan(['max' => $value, 'inclusive' => true]);
+                        } else {
+                                                    throw new \LogicException("The input type must be 'range' or 'number'");
+                        }
 
                         break;
 
@@ -223,17 +228,19 @@ 
 
                         $baseValue = (array_key_exists('min', $all_attribs)) ? $all_attribs['min'] : 0;
 
-                        if (array_key_exists('type', $all_attribs) && in_array($all_attribs['type'], ['range']))
-                            $validator = new Step(['baseValue' => $baseValue, 'step' => $value]);
-                        else
-                            throw new \LogicException("The input type must be 'range'");
+                        if (array_key_exists('type', $all_attribs) && in_array($all_attribs['type'], ['range'])) {
+                                                    $validator = new Step(['baseValue' => $baseValue, 'step' => $value]);
+                        } else {
+                                                    throw new \LogicException("The input type must be 'range'");
+                        }
 
                         break;
 
                     case 'data-validators':
 
-                        if (!is_array($value))
-                            throw new \InvalidArgumentException("Invalid type given. Array expected in 'data-validators' attribute.");
+                        if (!is_array($value)) {
+                                                    throw new \InvalidArgumentException("Invalid type given. Array expected in 'data-validators' attribute.");
+                        }
 
                         foreach ($value as $class => $params)
                         {
@@ -243,8 +250,9 @@ 
                             {
                                 $className = "\Zend\I18n\Validator\\" . $class;
 
-                                if (!class_exists($className))
-                                    throw new \RuntimeException("The class '$userInputClass' or '$className' does not exists");
+                                if (!class_exists($className)) {
+                                                                    throw new \RuntimeException("The class '$userInputClass' or '$className' does not exists");
+                                }
                             }
 
                             $validator = new $className($params);
@@ -291,8 +299,9 @@ 
             $v->setTranslator($this->translator);
             $notEmpty = $v->isValid($val);
 
-            if (!$required && !$notEmpty)
-                return null;
+            if (!$required && !$notEmpty) {
+                            return null;
+            }
 
             $valid = $validator->isValid($val);
             $this->setValid($valid);
@@ -304,8 +313,7 @@ 
                     $this->error($label ."-~-". (count($this->getErrors()) + 1), $message);
                 }
             }
-        }
-        else
+        } else
         {
             foreach ($form_value as $val)
             {
@@ -330,8 +338,9 @@ 
                 $errorLbl = explode("-~-", $key);
                 $label = array_shift($errorLbl);
 
-                if (!array_key_exists($label, $errors))
-                    $errors[$label] = [];
+                if (!array_key_exists($label, $errors)) {
+                                    $errors[$label] = [];
+                }
 
                 $errors[$label][] = $value;
             }

src/Util/ArrayDimension.php

Braces +15 added lines, -12 removed lines

@@ -39,9 +39,9 @@ 
                     $again = true;
                     $new_config[$param . $glue . $key] = $value;
                 }
+            } else {
+                            $new_config[$param] = $configure;
             }
-            else
-                $new_config[$param] = $configure;
         }
 
         return (!$again) ? $new_config : self::toUnidimensional($new_config, $glue);
@@ -64,15 +64,17 @@ 
 
         do
         {
-            if (array_key_exists($key, $haystack))
-                $haystack = $haystack[$key];
-            else
-                return $value;
+            if (array_key_exists($key, $haystack)) {
+                            $haystack = $haystack[$key];
+            } else {
+                            return $value;
+            }
 
             $key = count($needle) ? array_shift($needle) : NULL;
 
-            if (is_null($key))
-                return $haystack;
+            if (is_null($key)) {
+                            return $haystack;
+            }
 
         } while (!is_null($key));
     }
@@ -86,8 +88,9 @@ 
      */
     public static function objectToArray($obj)
     {
-        if (is_object($obj))
-            $obj = (array) $obj;
+        if (is_object($obj)) {
+                    $obj = (array) $obj;
+        }
 
         if (is_array($obj))
         {
@@ -97,9 +100,9 @@ 
             {
                 $new[$key] = self::objectToArray($val);
             }
+        } else {
+                    $new = $obj;
         }
-        else
-            $new = $obj;
 
         return $new;
     }

test/Exception/ExceptionTest.php

Braces +4 added lines, -8 removed lines

@@ -25,8 +25,7 @@ 
         try
         {
             throw new ExceptionException("This is an storable exception");
-        }
-        catch (ExceptionException $e)
+        } catch (ExceptionException $e)
         {
             mkdir('exceptions');
 
@@ -64,8 +63,7 @@ 
         try
         {
             throw new ExceptionException("This is an storable exception too");
-        }
-        catch (ExceptionException $e)
+        } catch (ExceptionException $e)
         {
             $date = date('dmY');
             $file = 'nofolder/exception-' . $date . '.json';
@@ -95,8 +93,7 @@ 
         try
         {
             throw new ExceptionException("This is an storable exception");
-        }
-        catch (ExceptionException $e)
+        } catch (ExceptionException $e)
         {
             $file = 'exceptions/exception-' . $date . '.json';
             $storage = new \Drone\Exception\Storage($file);
@@ -106,8 +103,7 @@ 
         try
         {
             throw new ExceptionException("This is an storable exception too");
-        }
-        catch (ExceptionException $e)
+        } catch (ExceptionException $e)
         {
             $file = 'exceptions/exception-' . $date . '.json';
             $storage = new \Drone\Exception\Storage($file);

src/Exception/Storage.php

Braces +10 added lines, -8 removed lines

@@ -69,8 +69,7 @@ 
                     return false;
                 }
             }
-        }
-        else
+        } else
         {
             $directory = strstr($this->outputFile, basename($this->outputFile), true);
 
@@ -86,17 +85,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 +14 added lines, -10 removed lines

@@ -141,8 +141,9 @@ 
      */
     public function __construct(Array $routes = [])
     {
-        if (count($routes))
-            $this->routes = $routes;
+        if (count($routes)) {
+                    $this->routes = $routes;
+        }
 
         $this->zendRouter = new \Zend\Router\SimpleRouteStack();
     }
@@ -165,8 +166,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"];
@@ -176,10 +178,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!");
+        }
     }
 
     /**
@@ -196,8 +199,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 +43 added lines, -32 removed lines

@@ -68,19 +68,23 @@ 
     public function __construct(Array $init_parameters)
     {
         # start sessions
-        if (!isset($_SESSION))
-            session_start();
+        if (!isset($_SESSION)) {
+                    session_start();
+        }
 
-        if (!array_key_exists('environment', $init_parameters))
-            throw new \InvalidArgumentException("The 'environment' key was not defined");
+        if (!array_key_exists('environment', $init_parameters)) {
+                    throw new \InvalidArgumentException("The 'environment' key was not defined");
+        }
 
-        if (!array_key_exists('dev_mode', $init_parameters['environment']))
-            throw new \InvalidArgumentException("The 'dev_mode' key was not defined");
+        if (!array_key_exists('dev_mode', $init_parameters['environment'])) {
+                    throw new \InvalidArgumentException("The 'dev_mode' key was not defined");
+        }
 
         $this->devMode = $init_parameters["environment"]["dev_mode"];
 
-        if (!array_key_exists('modules', $init_parameters))
-            throw new \InvalidArgumentException("The 'modules' key was not defined");
+        if (!array_key_exists('modules', $init_parameters)) {
+                    throw new \InvalidArgumentException("The 'modules' key was not defined");
+        }
 
         $this->modules = $init_parameters["modules"];
 
@@ -94,8 +98,7 @@ 
         {
             ini_set('display_errors', 1);
             error_reporting(-1);
-        }
-        else
+        } else
         {
             ini_set('display_errors', 0);
             error_reporting(0);
@@ -103,26 +106,30 @@ 
 
         $this->loadModules($this->modules);
 
-        if (!array_key_exists('router', $init_parameters))
-            throw new \InvalidArgumentException("The 'router' key was not defined");
+        if (!array_key_exists('router', $init_parameters)) {
+                    throw new \InvalidArgumentException("The 'router' key was not defined");
+        }
 
-        if (!array_key_exists('routes', $init_parameters["router"]))
-            throw new \InvalidArgumentException("The 'routes' key was not defined");
+        if (!array_key_exists('routes', $init_parameters["router"])) {
+                    throw new \InvalidArgumentException("The 'routes' key was not defined");
+        }
 
         $this->router = new Router($init_parameters["router"]["routes"]);
 
-        if (!array_key_exists('base_path', $init_parameters['environment']))
-            throw new \InvalidArgumentException("The 'base_path' key was not defined");
+        if (!array_key_exists('base_path', $init_parameters['environment'])) {
+                    throw new \InvalidArgumentException("The 'base_path' key was not defined");
+        }
 
         $this->router->setBasePath($init_parameters["environment"]["base_path"]);
 
         # load routes from init_parameters
         foreach ($init_parameters["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);
+            }
         }
 
         # load routes from each module
@@ -132,11 +139,13 @@ 
             {
                 $module_config_file = require($this->modulePath . "/$module/config/module.config.php");
 
-                if (!array_key_exists('router', $module_config_file))
-                    throw new \RuntimeException("The 'router' key was not defined in the config file for module '$module'");
+                if (!array_key_exists('router', $module_config_file)) {
+                                    throw new \RuntimeException("The 'router' key was not defined in the config file for module '$module'");
+                }
 
-                if (!array_key_exists('routes', $module_config_file["router"]))
-                    throw new \RuntimeException("The 'routes' key was not defined in the config file for module '$module'");
+                if (!array_key_exists('routes', $module_config_file["router"])) {
+                                    throw new \RuntimeException("The 'routes' key was not defined in the config file for module '$module'");
+                }
 
                 $this->getRouter()->addRoute($module_config_file["router"]["routes"]);
             }
@@ -162,14 +171,15 @@ 
                  *  This instruction includes each module declared.
                  *  Each module has an autoloader to load its classes (controllers and models)
                  */
-                if (file_exists($this->modulePath ."/". $module."/Module.php"))
-                    include($this->modulePath ."/". $module."/Module.php");
+                if (file_exists($this->modulePath ."/". $module."/Module.php")) {
+                                    include($this->modulePath ."/". $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");
     }
 
     /**
@@ -191,8 +201,9 @@ 
         $uri .= !empty($controller) ? '/' . $controller : "";
         $uri .= !empty($view)       ? '/' . $view : "";
 
-        if (empty($uri))
-            $uri = "/";
+        if (empty($uri)) {
+                    $uri = "/";
+        }
 
         $request->setUri($uri);
 
@@ -208,9 +219,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();
     }