Pleets / dronephp

src/Mvc/AbstractModule.php

Spacing +2 added lines, -2 removed lines

@@ -168,7 +168,7 @@ 
      */
     public function getConfig()
     {
-        return include($this->modulePath .'/' . $this->getModuleName() . '/config/module.config.php');
+        return include($this->modulePath . '/' . $this->getModuleName() . '/config/module.config.php');
     }
 
     /**
@@ -183,7 +183,7 @@ 
         $nm = explode('\\', $name);
         $module = array_shift($nm);
 
-        $class = $this->modulePath ."/". $module . "/source/" . implode("/", $nm) . ".php";
+        $class = $this->modulePath . "/" . $module . "/source/" . implode("/", $nm) . ".php";
 
         if (file_exists($class))
             include $class;

Braces +3 added lines, -2 removed lines

@@ -185,7 +185,8 @@
 
         $class = $this->modulePath ."/". $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/Layout.php

Spacing +5 added lines, -5 removed lines

@@ -193,8 +193,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);
         }
     }
 
@@ -218,11 +218,11 @@ 
             $view = "";
 
             if (!is_null($controller->getModule()))
-                $view .= $controller->getModule()->getModulePath() .'/'. $controller->getModule()->getModuleName();
+                $view .= $controller->getModule()->getModulePath() . '/' . $controller->getModule()->getModuleName();
 
             $view .=
-                    '/'. $controller->getModule()->getModulePath() . '/'. basename(str_replace('\\','/',get_class($controller))) .
-                    '/'. $controller->getMethod() . '.phtml';
+                    '/' . $controller->getModule()->getModulePath() . '/' . basename(str_replace('\\', '/', get_class($controller))) .
+                    '/' . $controller->getMethod() . '.phtml';
 
             $this->view = $view;
         }

Braces +25 added lines, -18 removed lines

@@ -162,8 +162,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];
     }
@@ -193,8 +194,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);
+            }
         }
     }
 
@@ -217,8 +219,9 @@ 
         {
             $view = "";
 
-            if (!is_null($controller->getModule()))
-                $view .= $controller->getModule()->getModulePath() .'/'. $controller->getModule()->getModuleName();
+            if (!is_null($controller->getModule())) {
+                            $view .= $controller->getModule()->getModulePath() .'/'. $controller->getModule()->getModuleName();
+            }
 
             $view .=
                     '/'. $controller->getModule()->getModulePath() . '/'. basename(str_replace('\\','/',get_class($controller))) .
@@ -229,25 +232,28 @@ 
 
         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();
 
             $layout = $controller->getLayout();
 
-            if (!array_key_exists($controller->getLayout(), $config["view_manager"]["template_map"]))
-                throw new Exception\PageNotFoundException("The 'template' " . $layout . " was not defined in module.config.php");
+            if (!array_key_exists($controller->getLayout(), $config["view_manager"]["template_map"])) {
+                            throw new Exception\PageNotFoundException("The 'template' " . $layout . " 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;
         }
@@ -276,8 +282,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;
     }

src/Mvc/Router.php

Braces +22 added lines, -18 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();
     }
@@ -176,8 +177,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"];
@@ -191,8 +193,7 @@ 
         {
             try {
                 $this->controller = new $fqn_controller($view, $this->basePath);
-            }
-            catch (Exception\MethodNotFoundException $e)
+            } catch (Exception\MethodNotFoundException $e)
             {
                 # change context, in terms of Router MethodNotFoundException is a PageNotfoundException
                 throw new Exception\PageNotFoundException($e->getMessage(), $e->getCode(), $e);
@@ -207,9 +208,9 @@ 
             $this->controller->getModule()->setViewPath('source/view');
 
             $this->controller->execute();
+        } else {
+                    throw new Exception\ControllerNotFoundException("The control class '$fqn_controller' does not exists!");
         }
-        else
-            throw new Exception\ControllerNotFoundException("The control class '$fqn_controller' does not exists!");
     }
 
     /**
@@ -226,8 +227,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);
     }
@@ -268,10 +270,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++;
         }
 
@@ -281,10 +284,11 @@ 
 
         for ($i = 0; $i < $vars_count; $i++)
         {
-            if (array_key_exists($i, $values))
-                $result[$vars[$i]] = $values[$i];
-            else
-                $result[$vars[$i]] = '';
+            if (array_key_exists($i, $values)) {
+                            $result[$vars[$i]] = $values[$i];
+            } else {
+                            $result[$vars[$i]] = '';
+            }
         }
 
         return $result;

src/Mvc/AbstractController.php

Spacing +1 added lines, -1 removed lines

@@ -313,7 +313,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 = [];

Braces +25 added lines, -18 removed lines

@@ -213,8 +213,9 @@ 
 
             $fqn_module = "\\" . $module . "\\Module";
 
-            if (!class_exists($fqn_module))
-                throw new Exception\ModuleNotFoundException("The module class '$fqn_module' does not exists!");
+            if (!class_exists($fqn_module)) {
+                            throw new Exception\ModuleNotFoundException("The module class '$fqn_module' does not exists!");
+            }
 
             $this->module = new $fqn_module($module, $this);
         }
@@ -229,9 +230,10 @@ 
     {
         $method = $this->method;
 
-        if (is_null($method))
-            # This error is thrown because of 'setMethod' method has not been executed
+        if (is_null($method)) {
+                    # This error is thrown because of 'setMethod' method has not been executed
             throw new \LogicException("No method has been setted to execute!");
+        }
 
         if ($this->initExecution)
         {
@@ -241,8 +243,9 @@ 
 
                 $reflection = new \ReflectionMethod($this, $method);
 
-                if (!$reflection->isPublic())
-                    throw new Exception\MethodNotFoundException("The method '$method' is not public in the control class '$class'");
+                if (!$reflection->isPublic()) {
+                                    throw new Exception\MethodNotFoundException("The method '$method' is not public in the control class '$class'");
+                }
 
                 # Get the returned value of the method to send to the view
                 $this->params = $this->$method();
@@ -257,8 +260,7 @@ 
                     $layoutManager = new Layout($layout_params);
                     $layoutManager->fromController($this);
                 }
-            }
-            else
+            } else
             {
                 $class = __CLASS__;
                 throw new Exception\MethodNotFoundException("The method '$method' doesn't exists in the control class '$class'");
@@ -295,8 +297,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;
     }
@@ -310,8 +313,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);
@@ -335,8 +339,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;
     }
 
@@ -347,8 +352,9 @@ 
      */
     public function isPost()
     {
-        if ($_SERVER["REQUEST_METHOD"] == "POST")
-            return true;
+        if ($_SERVER["REQUEST_METHOD"] == "POST") {
+                    return true;
+        }
         return false;
     }
 
@@ -359,8 +365,9 @@ 
      */
     public function isGet()
     {
-        if ($_SERVER["REQUEST_METHOD"] == "GET")
-            return true;
+        if ($_SERVER["REQUEST_METHOD"] == "GET") {
+                    return true;
+        }
         return false;
     }
 }
\ No newline at end of file

src/Mvc/Application.php

Braces +43 added lines, -32 removed lines

@@ -92,19 +92,23 @@ 
     public function __construct(Array $config)
     {
         # start sessions
-        if (!isset($_SESSION))
-            session_start();
+        if (!isset($_SESSION)) {
+                    session_start();
+        }
 
-        if (!array_key_exists('environment', $config))
-            throw new \InvalidArgumentException("The 'environment' key was not defined");
+        if (!array_key_exists('environment', $config)) {
+                    throw new \InvalidArgumentException("The 'environment' key was not defined");
+        }
 
-        if (!array_key_exists('dev_mode', $config['environment']))
-            throw new \InvalidArgumentException("The 'dev_mode' key was not defined");
+        if (!array_key_exists('dev_mode', $config['environment'])) {
+                    throw new \InvalidArgumentException("The 'dev_mode' key was not defined");
+        }
 
         $this->devMode = $config["environment"]["dev_mode"];
 
-        if (!array_key_exists('modules', $config))
-            throw new \InvalidArgumentException("The 'modules' key was not defined");
+        if (!array_key_exists('modules', $config)) {
+                    throw new \InvalidArgumentException("The 'modules' key was not defined");
+        }
 
         $this->modules = $config["modules"];
 
@@ -118,8 +122,7 @@ 
         {
             ini_set('display_errors', 1);
             error_reporting(-1);
-        }
-        else
+        } else
         {
             ini_set('display_errors', 0);
             error_reporting(0);
@@ -128,26 +131,30 @@ 
         # register autoloading functions for each module
         $this->autoload($this->modules);
 
-        if (!array_key_exists('router', $config))
-            throw new \InvalidArgumentException("The 'router' key was not defined");
+        if (!array_key_exists('router', $config)) {
+                    throw new \InvalidArgumentException("The 'router' key was not defined");
+        }
 
-        if (!array_key_exists('routes', $config["router"]))
-            throw new \InvalidArgumentException("The 'routes' key was not defined");
+        if (!array_key_exists('routes', $config["router"])) {
+                    throw new \InvalidArgumentException("The 'routes' key was not defined");
+        }
 
         $this->router = new Router($config["router"]["routes"]);
 
-        if (!array_key_exists('base_path', $config['environment']))
-            throw new \InvalidArgumentException("The 'base_path' key was not defined");
+        if (!array_key_exists('base_path', $config['environment'])) {
+                    throw new \InvalidArgumentException("The 'base_path' key was not defined");
+        }
 
         $this->router->setBasePath($config["environment"]["base_path"]);
 
         # load routes from config
         foreach ($config["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
@@ -157,11 +164,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"]);
             }
@@ -190,14 +199,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");
     }
 
     /**
@@ -219,8 +229,9 @@ 
         $uri .= !empty($controller) ? '/' . $controller : "";
         $uri .= !empty($view)       ? '/' . $view : "";
 
-        if (empty($uri))
-            $uri = "/";
+        if (empty($uri)) {
+                    $uri = "/";
+        }
 
         $request->setUri($uri);
 
@@ -236,9 +247,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();
     }