Pleets / dronephp

src/Mvc/View.php

Spacing +3 added lines, -3 removed lines

@@ -85,7 +85,7 @@ 
      */
     public function __construct($name, Array $parameters = [])
     {
-        $this->name  = $name;
+        $this->name = $name;
         $this->setParams($parameters);
     }
 
@@ -101,12 +101,12 @@ 
         $_view = $this->path . DIRECTORY_SEPARATOR . $this->name . '.phtml';
 
         if (!file_exists($_view))
-            throw new Exception\ViewNotFoundException("The view '" .$this->name. "' does not exists");
+            throw new Exception\ViewNotFoundException("The view '" . $this->name . "' does not exists");
 
         $contents = file_get_contents($_view);
 
         if ($contents === false)
-            throw new Exception\ViewGetContentsErrorException("The view '" .$this->name. "' does not exists");
+            throw new Exception\ViewGetContentsErrorException("The view '" . $this->name . "' does not exists");
 
         return $contents;
     }

Braces +9 added lines, -6 removed lines

@@ -100,13 +100,15 @@ 
     {
         $_view = $this->path . DIRECTORY_SEPARATOR . $this->name . '.phtml';
 
-        if (!file_exists($_view))
-            throw new Exception\ViewNotFoundException("The view '" .$this->name. "' does not exists");
+        if (!file_exists($_view)) {
+                    throw new Exception\ViewNotFoundException("The view '" .$this->name. "' does not exists");
+        }
 
         $contents = file_get_contents($_view);
 
-        if ($contents === false)
-            throw new Exception\ViewGetContentsErrorException("The view '" .$this->name. "' does not exists");
+        if ($contents === false) {
+                    throw new Exception\ViewGetContentsErrorException("The view '" .$this->name. "' does not exists");
+        }
 
         return $contents;
     }
@@ -118,8 +120,9 @@ 
      */
     public function render()
     {
-        if (count($this->getParams()))
-            extract($this->getParams(), EXTR_SKIP);
+        if (count($this->getParams())) {
+                    extract($this->getParams(), EXTR_SKIP);
+        }
 
         include $this->getContents();
     }

src/Mvc/Router.php

Spacing +5 added lines, -7 removed lines

@@ -263,11 +263,10 @@ 
         {
             foreach ($this->routes as $key => $route)
             {
-                if
-                (
-                    $route["module"]     == $this->identifiers["module"]     &&
+                if (
+                    $route["module"] == $this->identifiers["module"] &&
                     $route["controller"] == $this->identifiers["controller"] &&
-                    $route["view"]       == $this->identifiers["view"]
+                    $route["view"] == $this->identifiers["view"]
                 )
                 {
                     $module     = $route["module"];
@@ -282,9 +281,8 @@ 
 
         if (count($this->defaults) && !$match)
         {
-            if
-            (
-                !empty($this->defaults["module"])     &&
+            if (
+                !empty($this->defaults["module"]) &&
                 !empty($this->defaults["controller"]) &&
                 !empty($this->defaults["view"])
             )

Braces +40 added lines, -30 removed lines

@@ -100,8 +100,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;
     }
@@ -141,8 +142,9 @@ 
 
         foreach ($identifiers as $key => $identifier)
         {
-            if (!is_string($identifier))
-                throw new \InvalidArgumentException("Invalid type given for '$key'. String expected.");
+            if (!is_string($identifier)) {
+                            throw new \InvalidArgumentException("Invalid type given for '$key'. String expected.");
+            }
         }
 
         $this->identifiers = [
@@ -167,8 +169,9 @@ 
 
         foreach ($identifiers as $key => $identifier)
         {
-            if (!is_string($identifier))
-                throw new \InvalidArgumentException("Invalid type given for '$key'. String expected.");
+            if (!is_string($identifier)) {
+                            throw new \InvalidArgumentException("Invalid type given for '$key'. String expected.");
+            }
         }
 
         $this->defaults = [
@@ -237,8 +240,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:
@@ -297,8 +301,9 @@ 
             }
         }
 
-        if (!$match)
-            throw new Exception\RouteNotFoundException("The route has not been matched");
+        if (!$match) {
+                    throw new Exception\RouteNotFoundException("The route has not been matched");
+        }
 
         $fqn_controller = call_user_func($this->classNameBuilder, $module, $controller);
 
@@ -312,17 +317,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!");
     }
 
     /**
@@ -348,8 +352,9 @@ 
     {
         $key = array_keys($route);
 
-        if (count($key) > 1)
-            throw new \InvalidArgumentException("So many keys in a simple route");
+        if (count($key) > 1) {
+                    throw new \InvalidArgumentException("So many keys in a simple route");
+        }
 
         $key = array_shift($key);
 
@@ -357,15 +362,18 @@ 
 
         foreach ($identifiers as $identifier)
         {
-            if (!array_key_exists($identifier, $route[$key]))
-                throw new \InvalidArgumentException("The identifier '$identifier' does not exists in the route");
+            if (!array_key_exists($identifier, $route[$key])) {
+                            throw new \InvalidArgumentException("The identifier '$identifier' does not exists in the route");
+            }
 
-            if (!is_string($route[$key][$identifier]))
-                throw new \InvalidArgumentException("Invalid type given for '$identifier'. String expected.");
+            if (!is_string($route[$key][$identifier])) {
+                            throw new \InvalidArgumentException("Invalid type given for '$identifier'. String expected.");
+            }
         }
 
-        if (array_key_exists($key, $this->routes))
-            throw new \LogicException("The key '$key' was already defined as a route");
+        if (array_key_exists($key, $this->routes)) {
+                    throw new \LogicException("The key '$key' was already defined as a route");
+        }
 
         $this->routes = array_merge($this->routes, $route);
     }
@@ -406,10 +414,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++;
         }
 
@@ -419,10 +428,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/Application.php

Spacing +4 added lines, -4 removed lines

@@ -190,17 +190,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 +41 added lines, -30 removed lines

@@ -99,19 +99,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"];
 
@@ -125,33 +129,36 @@ 
         {
             ini_set('display_errors', 1);
             error_reporting(-1);
-        }
-        else
+        } else
         {
             ini_set('display_errors', 0);
             error_reporting(0);
         }
 
-        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->basePath = $config["environment"]["base_path"];
 
         # load routes from config
         foreach ($config["router"]["routes"] as $name => $route)
         {
-            if ($route instanceof \Zend\Router\Http\RouteInterface)
-                $this->router->addZendRoute($name, $route);
-            else
-                $this->router->addRoute($route);
+            if ($route instanceof \Zend\Router\Http\RouteInterface) {
+                            $this->router->addZendRoute($name, $route);
+            } else {
+                            $this->router->addRoute($route);
+            }
         }
 
         # register autoloading functions for each module
@@ -172,11 +179,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"]);
             }
@@ -202,8 +211,9 @@ 
         $uri .= !empty($controller) ? '/' . $controller : "";
         $uri .= !empty($view)       ? '/' . $view : "";
 
-        if (empty($uri))
-            $uri = "/";
+        if (empty($uri)) {
+                    $uri = "/";
+        }
 
         $request->setUri($uri);
 
@@ -219,9 +229,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();
 
@@ -240,8 +250,9 @@ 
             {
                 $result->setPath($this->basePath . DIRECTORY_SEPARATOR . $this->modulePath . DIRECTORY_SEPARATOR . 'source/view');
 
-                if (is_null($result->getName()))
-                    $result->setView($router->getController()->getMethod());
+                if (is_null($result->getName())) {
+                                    $result->setView($router->getController()->getMethod());
+                }
 
                 $result->render();
             }

src/Mvc/AbstractModule.php

Braces +3 added lines, -2 removed lines

@@ -141,8 +141,9 @@
     {
         $_file = $this->configFile;
 
-        if (!file_exists($_file))
-            throw new \RuntimeException("The config file '$_file' does not exists");
+        if (!file_exists($_file)) {
+                    throw new \RuntimeException("The config file '$_file' does not exists");
+        }
 
         return (array) include $this->configFile;
     }

src/Loader/ClassMap.php

Braces +3 added lines, -2 removed lines

@@ -41,7 +41,8 @@
 
         $class = $path . implode(DIRECTORY_SEPARATOR, $nm) . ".php";
 
-        if (file_exists($class))
-            include $class;
+        if (file_exists($class)) {
+                    include $class;
+        }
     }
 }
\ No newline at end of file

test/Mvc/RouterTest.php

Braces +4 added lines, -8 removed lines

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

test/Db/Driver/MySQLTest.php

Spacing +19 added lines, -19 removed lines

@@ -132,7 +132,7 @@ 
     public function testCannotEstablishConnection()
     {
         $options = $this->options;
-        $options["dbhost"] = 'myserver';   // this server does not exists
+        $options["dbhost"] = 'myserver'; // this server does not exists
 
         $conn = new MySQL($options);
 
@@ -259,7 +259,7 @@ 
         $this->assertEquals(2, $conn->getNumFields());
         $this->assertEquals(0, $conn->getRowsAffected());
 
-        $rowset = $conn->getArrayResult();    # array with results
+        $rowset = $conn->getArrayResult(); # array with results
         $row = array_shift($rowset);
 
         $this->assertArrayHasKey("ID", $row);
@@ -286,12 +286,12 @@ 
         $conn->execute($sql);
         $rowcount = count($conn->getArrayResult());
 
-        $this->assertTrue(($rowcount === 1));    # the row is available for now
+        $this->assertTrue(($rowcount === 1)); # the row is available for now
 
         # properties modified by execute() method
         $this->assertEquals(1, $conn->getNumRows());
         $this->assertEquals(2, $conn->getNumFields());
-        $this->assertEquals(0, $conn->getRowsAffected());    # nothing affected (autocommit = false)
+        $this->assertEquals(0, $conn->getRowsAffected()); # nothing affected (autocommit = false)
 
         $this->assertTrue($conn->commit());
 
@@ -300,7 +300,7 @@ 
         $conn->execute($sql);
         $rowcount = count($conn->getArrayResult());
 
-        $this->assertTrue(($rowcount === 1));    # the row is available
+        $this->assertTrue(($rowcount === 1)); # the row is available
     }
 
     /**
@@ -323,12 +323,12 @@ 
         $conn->execute($sql);
         $rowcount = count($conn->getArrayResult());
 
-        $this->assertTrue(($rowcount === 1));    # the row is available for now
+        $this->assertTrue(($rowcount === 1)); # the row is available for now
 
         # properties modified by execute() method
         $this->assertEquals(1, $conn->getNumRows());
         $this->assertEquals(2, $conn->getNumFields());
-        $this->assertEquals(0, $conn->getRowsAffected());    # nothing affected (autocommit = false)
+        $this->assertEquals(0, $conn->getRowsAffected()); # nothing affected (autocommit = false)
 
         $this->assertTrue($conn->rollback());
 
@@ -337,7 +337,7 @@ 
         $conn->execute($sql);
         $rowcount = count($conn->getArrayResult());
 
-        $this->assertNotTrue(($rowcount === 1));    # the row is not available
+        $this->assertNotTrue(($rowcount === 1)); # the row is not available
     }
 
     /**
@@ -369,12 +369,12 @@ 
         $conn->execute($sql);
         $rowcount = count($conn->getArrayResult());
 
-        $this->assertTrue(($rowcount === 4));    # the rows are available for now
+        $this->assertTrue(($rowcount === 4)); # the rows are available for now
 
         # properties modified by execute() method
         $this->assertEquals(4, $conn->getNumRows());
         $this->assertEquals(2, $conn->getNumFields());
-        $this->assertEquals(0, $conn->getRowsAffected());    # nothing affected (autocommit = false)
+        $this->assertEquals(0, $conn->getRowsAffected()); # nothing affected (autocommit = false)
 
         $this->assertTrue($conn->commit());
 
@@ -383,7 +383,7 @@ 
         $conn->execute($sql);
         $rowcount = count($conn->getArrayResult());
 
-        $this->assertTrue(($rowcount === 4));    # the rows are available
+        $this->assertTrue(($rowcount === 4)); # the rows are available
     }
 
     /**
@@ -415,12 +415,12 @@ 
         $conn->execute($sql);
         $rowcount = count($conn->getArrayResult());
 
-        $this->assertTrue(($rowcount === 4));    # the rows are available for now
+        $this->assertTrue(($rowcount === 4)); # the rows are available for now
 
         # properties modified by execute() method
         $this->assertEquals(4, $conn->getNumRows());
         $this->assertEquals(2, $conn->getNumFields());
-        $this->assertEquals(0, $conn->getRowsAffected());    # nothing affected (autocommit = false)
+        $this->assertEquals(0, $conn->getRowsAffected()); # nothing affected (autocommit = false)
 
         $this->assertTrue($conn->rollback());
 
@@ -429,7 +429,7 @@ 
         $conn->execute($sql);
         $rowcount = count($conn->getArrayResult());
 
-        $this->assertNotTrue(($rowcount === 4));    # the rows are not available
+        $this->assertNotTrue(($rowcount === 4)); # the rows are not available
         $this->assertTrue(($rowcount === 0));
     }
 
@@ -461,12 +461,12 @@ 
         $conn->execute($sql);
         $rowcount = count($conn->getArrayResult());
 
-        $this->assertTrue(($rowcount === 2));    # the rows are available for now
+        $this->assertTrue(($rowcount === 2)); # the rows are available for now
 
         # properties modified by execute() method
         $this->assertEquals(2, $conn->getNumRows());
         $this->assertEquals(2, $conn->getNumFields());
-        $this->assertEquals(0, $conn->getRowsAffected());    # nothing affected (autocommit = false)
+        $this->assertEquals(0, $conn->getRowsAffected()); # nothing affected (autocommit = false)
 
         # ends the transaction
         $conn->endTransaction();
@@ -476,7 +476,7 @@ 
         $conn->execute($sql);
         $rowcount = count($conn->getArrayResult());
 
-        $this->assertTrue(($rowcount === 2));    # the row is available
+        $this->assertTrue(($rowcount === 2)); # the row is available
     }
 
     /**
@@ -503,7 +503,7 @@ 
             $conn->execute($sql);
 
             $sql = "INSERT INTO MYTABLE (DESCRIPTION, WRONG) VALUES ('TRANS_SHORTCUT_2')";
-            $conn->execute($sql);    # this throws the exception
+            $conn->execute($sql); # this throws the exception
         }
         catch (InvalidQueryException $e)
         {
@@ -519,7 +519,7 @@ 
         $conn->execute($sql);
         $rowcount = count($conn->getArrayResult());
 
-        $this->assertNotTrue(($rowcount === 0));    # the rows are not available
+        $this->assertNotTrue(($rowcount === 0)); # the rows are not available
 
         # remove all work
         $conn->execute("DROP TABLE MYTABLE");

Braces +4 added lines, -8 removed lines

@@ -81,8 +81,7 @@ 
 
         try {
             $conn->disconnect();
-        }
-        catch (\Exception $e)
+        } catch (\Exception $e)
         {
             $this->assertNotTrue($conn->isConnected());
             throw $e;
@@ -116,8 +115,7 @@ 
 
         try {
             $conn->reconnect();
-        }
-        catch (\Exception $e)
+        } catch (\Exception $e)
         {
             $this->assertNotTrue($conn->isConnected());
             throw $e;
@@ -139,8 +137,7 @@ 
         try
         {
             $conn->connect();
-        }
-        catch (\Exception $e)
+        } catch (\Exception $e)
         {
             $this->assertNotTrue($conn->isConnected());
             throw $e;
@@ -504,8 +501,7 @@ 
 
             $sql = "INSERT INTO MYTABLE (DESCRIPTION, WRONG) VALUES ('TRANS_SHORTCUT_2')";
             $conn->execute($sql);    # this throws the exception
-        }
-        catch (InvalidQueryException $e)
+        } catch (InvalidQueryException $e)
         {
             #·not necessary!
             # $this->assertTrue($conn->rollback());