Pleets / dronephp

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

Spacing +6 added lines, -6 removed lines

@@ -162,8 +162,8 @@ 
                  *  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");
             }
@@ -179,17 +179,17 @@ 
      */
     public function run()
     {
-        $module     = isset($_GET["module"])     ? $_GET["module"] : null;
+        $module     = isset($_GET["module"]) ? $_GET["module"] : null;
         $controller = isset($_GET["controller"]) ? $_GET["controller"] : null;
-        $view       = isset($_GET["view"])       ? $_GET["view"] : null;
+        $view       = isset($_GET["view"]) ? $_GET["view"] : null;
 
         $request = new  \Zend\Http\Request();
 
         # build URI
         $uri = '';
-        $uri .= !empty($module)     ? '/' . $module : "";
+        $uri .= !empty($module) ? '/' . $module : "";
         $uri .= !empty($controller) ? '/' . $controller : "";
-        $uri .= !empty($view)       ? '/' . $view : "";
+        $uri .= !empty($view) ? '/' . $view : "";
 
         if (empty($uri))
             $uri = "/";

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