Pleets / dronephp

test/Mvc/RouterTest.php

Braces +2 added lines, -4 removed lines

@@ -111,12 +111,10 @@
 
         try {
             $router->run();
-        }
-        catch (\Exception $e)
+        } catch (\Exception $e)
         {
             $errorObject = ($e instanceof MethodExecutionNotAllowedException);
-        }
-        finally
+        } finally
         {
             $this->assertTrue($errorObject, $e->getMessage());
         }

src/Mvc/ModuleFactory.php

Braces +21 added lines, -14 removed lines

@@ -29,11 +29,13 @@ 
      */
     public static function create($module, Array $module_settings = [])
     {
-        if (empty($module))
-            throw new \RuntimeException("The module name must be specified");
+        if (empty($module)) {
+                    throw new \RuntimeException("The module name must be specified");
+        }
 
-        if (!is_string($module))
-            throw new \InvalidArgumentException("Invalid type given. string expected");
+        if (!is_string($module)) {
+                    throw new \InvalidArgumentException("Invalid type given. string expected");
+        }
 
         /*
          * Module class instantiation
@@ -44,22 +46,27 @@ 
          */
         $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!");
+        }
 
         $module = new $fqn_module($module);
 
-        if (array_key_exists('path', $module_settings))
-            $module->setModulePath($module_settings["path"]);
+        if (array_key_exists('path', $module_settings)) {
+                    $module->setModulePath($module_settings["path"]);
+        }
 
-        if (array_key_exists('classes', $module_settings))
-            $module->setClassPath($module_settings["classes"]);
+        if (array_key_exists('classes', $module_settings)) {
+                    $module->setClassPath($module_settings["classes"]);
+        }
 
-        if (array_key_exists('views', $module_settings))
-            $module->setViewPath($module_settings["views"]);
+        if (array_key_exists('views', $module_settings)) {
+                    $module->setViewPath($module_settings["views"]);
+        }
 
-        if (array_key_exists('config', $module_settings) && !is_null($module_settings["config"]))
-            $module->setConfigFile($module_settings["config"]);
+        if (array_key_exists('config', $module_settings) && !is_null($module_settings["config"])) {
+                    $module->setConfigFile($module_settings["config"]);
+        }
 
         return $module;
     }

src/Mvc/AbstractModule.php

Spacing +6 added lines, -6 removed lines

@@ -204,13 +204,13 @@ 
      */
     public function setConfigFile($configFile)
     {
-        $_file = $this->basePath .'/'. $this->modulePath .'/'. $this->moduleName .'/'. $configFile;
+        $_file = $this->basePath . '/' . $this->modulePath . '/' . $this->moduleName . '/' . $configFile;
 
         if (!file_exists($_file))
             throw new \RuntimeException("The file '$_file' does not exists");
 
         $this->configFile =
-            $this->basePath .'/'. $this->modulePath .'/'. $this->moduleName .'/'. $configFile;
+            $this->basePath . '/' . $this->modulePath . '/' . $this->moduleName . '/' . $configFile;
     }
 
     /**
@@ -286,15 +286,15 @@ 
         $class = "";
 
         if (!empty($this->basePath))
-            $class .= $this->basePath .'/';
+            $class .= $this->basePath . '/';
 
         if (!empty($this->modulePath))
-            $class .= $this->modulePath .'/';
+            $class .= $this->modulePath . '/';
 
-        $class .= $module ."/";
+        $class .= $module . "/";
 
         if (!empty($this->classPath))
-            $class .= $this->classPath .'/';
+            $class .= $this->classPath . '/';
 
         $class .= implode("/", $nm) . ".php";
 

Braces +15 added lines, -10 removed lines

@@ -206,8 +206,9 @@ 
     {
         $_file = $this->basePath .'/'. $this->modulePath .'/'. $this->moduleName .'/'. $configFile;
 
-        if (!file_exists($_file))
-            throw new \RuntimeException("The file '$_file' does not exists");
+        if (!file_exists($_file)) {
+                    throw new \RuntimeException("The file '$_file' does not exists");
+        }
 
         $this->configFile =
             $this->basePath .'/'. $this->modulePath .'/'. $this->moduleName .'/'. $configFile;
@@ -285,20 +286,24 @@ 
 
         $class = "";
 
-        if (!empty($this->basePath))
-            $class .= $this->basePath .'/';
+        if (!empty($this->basePath)) {
+                    $class .= $this->basePath .'/';
+        }
 
-        if (!empty($this->modulePath))
-            $class .= $this->modulePath .'/';
+        if (!empty($this->modulePath)) {
+                    $class .= $this->modulePath .'/';
+        }
 
         $class .= $module ."/";
 
-        if (!empty($this->classPath))
-            $class .= $this->classPath .'/';
+        if (!empty($this->classPath)) {
+                    $class .= $this->classPath .'/';
+        }
 
         $class .= 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 +3 added lines, -3 removed lines

@@ -93,9 +93,9 @@
 
         if ($controller->getShowView())
             $this->view =
-                $controller->getModule()->getModulePath() .'/'. $controller->getModule()->getModuleName() .'/'.
-                $controller->getModule()->getViewPath()                .'/'.
-                basename(str_replace('\\','/',get_class($controller))) .'/'.
+                $controller->getModule()->getModulePath() . '/' . $controller->getModule()->getModuleName() . '/' .
+                $controller->getModule()->getViewPath() . '/' .
+                basename(str_replace('\\', '/', get_class($controller))) . '/' .
                 $controller->getMethod() . '.phtml';
 
         if ($controller->getTerminal())

Braces +25 added lines, -18 removed lines

@@ -68,8 +68,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];
     }
@@ -88,36 +89,41 @@ 
         $this->setParams($controller->getParams());
         $this->controller = $controller;
 
-        if (is_null($controller->getModule()))
-            throw new \RuntimeException("No module instance found in controller '" . get_class($controller) . "'");
+        if (is_null($controller->getModule())) {
+                    throw new \RuntimeException("No module instance found in controller '" . get_class($controller) . "'");
+        }
 
-        if ($controller->getShowView())
-            $this->view =
+        if ($controller->getShowView()) {
+                    $this->view =
                 $controller->getModule()->getModulePath() .'/'. $controller->getModule()->getModuleName() .'/'.
                 $controller->getModule()->getViewPath()                .'/'.
                 basename(str_replace('\\','/',get_class($controller))) .'/'.
                 $controller->getMethod() . '.phtml';
+        }
 
         if ($controller->getTerminal())
         {
-            if (file_exists($this->view))
-                include $this->view;
-        }
-        else
+            if (file_exists($this->view)) {
+                            include $this->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;
         }
@@ -146,8 +152,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 +25 added lines, -20 removed lines

@@ -83,8 +83,9 @@ 
      */
     public function getController()
     {
-        if (is_null($this->controller))
-            throw new \RuntimeException("No controller matched, try to match first.");
+        if (is_null($this->controller)) {
+                    throw new \RuntimeException("No controller matched, try to match first.");
+        }
 
         return $this->controller;
     }
@@ -172,8 +173,9 @@ 
      */
     public function match()
     {
-        if (!is_callable($this->classNameBuilder))
-            throw \LogicException("No class name builder found");
+        if (!is_callable($this->classNameBuilder)) {
+                    throw \LogicException("No class name builder found");
+        }
 
         /*
          *  Key value pairs builder:
@@ -195,8 +197,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"];
@@ -216,17 +219,16 @@ 
             catch (Exception\MethodNotFoundException $e)
             {
                 throw new Exception\PageNotFoundException($e->getMessage(), $e->getCode(), $e);
-            }
-            catch (Exception\PrivateMethodExecutionException $e)
+            } catch (Exception\PrivateMethodExecutionException $e)
             {
                 throw new Exception\PageNotFoundException($e->getMessage(), $e->getCode(), $e);
             }
 
             # in controller terms, a view is a method
             $this->controller->setMethod($view);
+        } 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!");
     }
 
     /**
@@ -253,8 +255,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);
     }
@@ -295,10 +298,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++;
         }
 
@@ -308,10 +312,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

Braces +25 added lines, -19 removed lines

@@ -175,13 +175,14 @@ 
     {
         $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 (!is_null($this->module) && !$this->module->executionIsAllowed())
-            throw new Exception\MethodExecutionNotAllowedException("Method execution is not allowed");
-        else
+        if (!is_null($this->module) && !$this->module->executionIsAllowed()) {
+                    throw new Exception\MethodExecutionNotAllowedException("Method execution is not allowed");
+        } else
         {
             if (method_exists($this, $method))
             {
@@ -189,8 +190,9 @@ 
 
                 $reflection = new \ReflectionMethod($this, $method);
 
-                if (!$reflection->isPublic())
-                    throw new Exception\PrivateMethodExecutionException("The method '$method' is not public in the control class '$class'");
+                if (!$reflection->isPublic()) {
+                                    throw new Exception\PrivateMethodExecutionException("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();
@@ -206,8 +208,7 @@ 
                     $layout->setParams($layout_params);
                     $layout->fromController($this);
                 }
-            }
-            else
+            } else
             {
                 $class = __CLASS__;
                 throw new Exception\MethodNotFoundException("The method '$method' doesn't exists in the control class '$class'");
@@ -232,8 +233,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;
     }
@@ -247,8 +249,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);
@@ -272,8 +275,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;
     }
 
@@ -284,8 +288,9 @@ 
      */
     public function isPost()
     {
-        if ($_SERVER["REQUEST_METHOD"] == "POST")
-            return true;
+        if ($_SERVER["REQUEST_METHOD"] == "POST") {
+                    return true;
+        }
         return false;
     }
 
@@ -296,8 +301,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 +46 added lines, -34 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->match();
 
@@ -249,7 +260,8 @@ 
             "config"  => 'config/module.config.php'
         ]));
 
-        if ($this->getController()->getModule()->executionIsAllowed())
-            $this->router->run();
+        if ($this->getController()->getModule()->executionIsAllowed()) {
+                    $this->router->run();
+        }
     }
 }
\ No newline at end of file