Pleets / dronephp

src/Error/ErrorTrait.php

Braces +3 added lines, -2 removed lines

@@ -67,12 +67,13 @@
      */
     protected function error($code, $message = null)
     {
-        if (!array_key_exists($code, $this->errors))
-            $this->errors[$code] = (array_key_exists($code, $this->standardErrors))
+        if (!array_key_exists($code, $this->errors)) {
+                    $this->errors[$code] = (array_key_exists($code, $this->standardErrors))
                 ?
                     is_null($message)
                         ? $this->standardErrors[$code]
                         : preg_replace('/%[a-zA-Z]*%/', $message, $this->standardErrors[$code])
                 : $message;
+        }
     }
 }
\ No newline at end of file

src/Util/ParamTrait.php

Braces +3 added lines, -2 removed lines

@@ -70,8 +70,9 @@
     {
         $parameters = $this->getParams();
 
-        if (array_key_exists($param, $parameters))
-            return true;
+        if (array_key_exists($param, $parameters)) {
+                    return true;
+        }
 
         return false;
     }

src/Util/ArrayDimension.php

Braces +2 added lines, -2 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);

src/Exception/Storage.php

Spacing +1 added lines, -1 removed lines

@@ -60,7 +60,7 @@
 
             if (!empty($string))
             {
-                $data   = json_decode($string, true);
+                $data = json_decode($string, true);
 
                 # json_encode can return TRUE, FALSE or NULL (http://php.net/manual/en/function.json-decode.php)
                 if (is_null($data) || $data === false)

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

Spacing +2 added lines, -2 removed lines

@@ -132,8 +132,8 @@
                  *  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");
             }

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();
     }

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/Mvc/AbstractionController.php

Spacing +1 added lines, -1 removed lines

@@ -168,7 +168,7 @@
         if ($_SERVER['REQUEST_METHOD'] != 'JSON')
             throw new \LogicException("Request method is not JSON");
 
-        $input =  file_get_contents('php://input');
+        $input = file_get_contents('php://input');
         $array = explode("&", $input);
 
         $result = array();

Braces +32 added lines, -24 removed lines

@@ -150,8 +150,9 @@ 
      */
     public function getPost()
     {
-        if ($_SERVER['REQUEST_METHOD'] == 'POST' && empty($_POST))
-            $_POST = json_decode(file_get_contents('php://input'), true);
+        if ($_SERVER['REQUEST_METHOD'] == 'POST' && empty($_POST)) {
+                    $_POST = json_decode(file_get_contents('php://input'), true);
+        }
 
         return (array) $_POST;
     }
@@ -165,8 +166,9 @@ 
      */
     public function getJson()
     {
-        if ($_SERVER['REQUEST_METHOD'] != 'JSON')
-            throw new \LogicException("Request method is not JSON");
+        if ($_SERVER['REQUEST_METHOD'] != 'JSON') {
+                    throw new \LogicException("Request method is not JSON");
+        }
 
         $input =  file_get_contents('php://input');
         $array = explode("&", $input);
@@ -254,8 +256,9 @@ 
         $this->module = new $fqn($module, $this);
 
         # detects method change inside Module.php
-        if (!is_null($this->getMethod()))
-            $method = $this->getMethod();
+        if (!is_null($this->getMethod())) {
+                    $method = $this->getMethod();
+        }
 
         if (!is_null($method) && $this->initExecution)
         {
@@ -265,8 +268,9 @@ 
 
                 $reflection = new \ReflectionMethod($this, $method);
 
-                if (!$reflection->isPublic())
-                    throw new Exception\PageNotFoundException("The method '$method' is not public in the control class '$class'");
+                if (!$reflection->isPublic()) {
+                                    throw new Exception\PageNotFoundException("The method '$method' is not public in the control class '$class'");
+                }
 
                 $this->method = $method;
 
@@ -282,8 +286,7 @@ 
                     $layoutManager = new Layout($layout_params);
                     $layoutManager->fromController($this);
                 }
-            }
-            else {
+            } else {
                 $class = __CLASS__;
                 throw new Exception\PageNotFoundException("The method '$method' doesn't exists in the control class '$class'");
             }
@@ -308,8 +311,9 @@ 
     public function isXmlHttpRequest()
     {
         # non standard (HTTP_X_REQUESTED_WITH is not a part of PHP)
-        if (isset($_SERVER['HTTP_X_REQUESTED_WITH']))
-            return true;
+        if (isset($_SERVER['HTTP_X_REQUESTED_WITH'])) {
+                    return true;
+        }
         return false;
     }
 
@@ -320,8 +324,9 @@ 
      */
     public function isPost()
     {
-        if ($_SERVER["REQUEST_METHOD"] == "POST")
-            return true;
+        if ($_SERVER["REQUEST_METHOD"] == "POST") {
+                    return true;
+        }
         return false;
     }
 
@@ -332,8 +337,9 @@ 
      */
     public function isGet()
     {
-        if ($_SERVER["REQUEST_METHOD"] == "GET")
-            return true;
+        if ($_SERVER["REQUEST_METHOD"] == "GET") {
+                    return true;
+        }
         return false;
     }
 
@@ -357,10 +363,11 @@ 
             $i = 1;
             foreach ($params as $item)
             {
-                if ($i % 2 != 0)
-                    $vars[] = $item;
-                else
-                    $values[] = $item;
+                if ($i % 2 != 0) {
+                                    $vars[] = $item;
+                } else {
+                                    $values[] = $item;
+                }
                 $i++;
             }
 
@@ -368,10 +375,11 @@ 
 
             for ($i = 0; $i < $vars_count; $i++)
             {
-                if (array_key_exists($i, $values))
-                    $_GET[$vars[$i]] = $values[$i];
-                else
-                    $_GET[$vars[$i]] = '';
+                if (array_key_exists($i, $values)) {
+                                    $_GET[$vars[$i]] = $values[$i];
+                } else {
+                                    $_GET[$vars[$i]] = '';
+                }
             }
 
             unset($_GET["params"]);

src/Mvc/Layout.php

Spacing +5 added lines, -5 removed lines

@@ -164,8 +164,8 @@ 
     {
         foreach ($params as $param => $value)
         {
-            if (property_exists(__CLASS__, strtolower($param)) && method_exists($this, 'set'.$param))
-                $this->{'set'.$param}($value);
+            if (property_exists(__CLASS__, strtolower($param)) && method_exists($this, 'set' . $param))
+                $this->{'set' . $param}($value);
         }
     }
 
@@ -185,9 +185,9 @@ 
 
         if ($controller->getShowView())
         {
-            $view = 'module/'      . $controller->getModule()->getModuleName() .
-                    '/source/view/'. basename(str_replace('\\','/',get_class($controller))) .
-                    '/'            . $controller->getMethod() . '.phtml';
+            $view = 'module/' . $controller->getModule()->getModuleName() .
+                    '/source/view/' . basename(str_replace('\\', '/', get_class($controller))) .
+                    '/' . $controller->getMethod() . '.phtml';
 
             $this->view = $view;
         }

Braces +22 added lines, -16 removed lines

@@ -133,8 +133,9 @@ 
     {
         $config = $module->getConfig();
 
-        if (!array_key_exists($view, $config["view_manager"]["view_map"]) || !file_exists($config["view_manager"]["view_map"][$view]))
-            throw new Exception\ViewNotFoundException("The 'view' template " . $view . " does not exists");
+        if (!array_key_exists($view, $config["view_manager"]["view_map"]) || !file_exists($config["view_manager"]["view_map"][$view])) {
+                    throw new Exception\ViewNotFoundException("The 'view' template " . $view . " does not exists");
+        }
 
         $this->view = $config["view_manager"]["view_map"][$view];
     }
@@ -164,8 +165,9 @@ 
     {
         foreach ($params as $param => $value)
         {
-            if (property_exists(__CLASS__, strtolower($param)) && method_exists($this, 'set'.$param))
-                $this->{'set'.$param}($value);
+            if (property_exists(__CLASS__, strtolower($param)) && method_exists($this, 'set'.$param)) {
+                            $this->{'set'.$param}($value);
+            }
         }
     }
 
@@ -194,23 +196,26 @@ 
 
         if ($controller->getTerminal())
         {
-            if (file_exists($view))
-                include $view;
-        }
-        else
+            if (file_exists($view)) {
+                            include $view;
+            }
+        } else
         {
-            if (!is_null($this->view) && !file_exists($this->view))
-                throw new Exception\ViewNotFoundException("The 'view' template " . $this->view . " does not exists");
+            if (!is_null($this->view) && !file_exists($this->view)) {
+                            throw new Exception\ViewNotFoundException("The 'view' template " . $this->view . " does not exists");
+            }
 
             $config = $controller->getModule()->getConfig();
 
-            if (!array_key_exists($controller->getLayout(), $config["view_manager"]["template_map"]))
-                throw new Exception\PageNotFoundException("The 'template' " . $template . " was not defined in module.config.php");
+            if (!array_key_exists($controller->getLayout(), $config["view_manager"]["template_map"])) {
+                            throw new Exception\PageNotFoundException("The 'template' " . $template . " was not defined in module.config.php");
+            }
 
             $template = $config["view_manager"]["template_map"][$controller->getLayout()];
 
-            if (!file_exists($template))
-                throw new Exception\PageNotFoundException("The 'template' " . $template . " does not exists");
+            if (!file_exists($template)) {
+                            throw new Exception\PageNotFoundException("The 'template' " . $template . " does not exists");
+            }
 
             include $template;
         }
@@ -237,8 +242,9 @@ 
      */
     public function content()
     {
-        if (!file_exists($this->view))
-            throw new Exception\ViewNotFoundException("The 'view' template " . $this->view . " does not exists");
+        if (!file_exists($this->view)) {
+                    throw new Exception\ViewNotFoundException("The 'view' template " . $this->view . " does not exists");
+        }
 
         include $this->view;
     }