Pleets / dronephp

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

@@ -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);
+            }
         }
     }
 
@@ -223,25 +225,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;
         }
@@ -268,8 +273,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/Db/Driver/AbstractDriver.php

Spacing +2 added lines, -2 removed lines

@@ -298,8 +298,8 @@
     {
         foreach ($options as $option => $value)
         {
-            if (property_exists(__CLASS__, strtolower($option)) && method_exists($this, 'set'.$option))
-                $this->{'set'.$option}($value);
+            if (property_exists(__CLASS__, strtolower($option)) && method_exists($this, 'set' . $option))
+                $this->{'set' . $option}($value);
         }
     }
 

Braces +32 added lines, -22 removed lines

@@ -216,8 +216,9 @@ 
      */
     public function getArrayResult()
     {
-        if (!empty($this->arrayResult))
-            return $this->arrayResult;
+        if (!empty($this->arrayResult)) {
+                    return $this->arrayResult;
+        }
 
         return $this->toArray();
     }
@@ -313,8 +314,9 @@ 
      */
     public function autocommit($value)
     {
-        if ($this->transac_mode)
-            throw new \LogicException("You cannot change autocommit behavior during a transaction");
+        if ($this->transac_mode) {
+                    throw new \LogicException("You cannot change autocommit behavior during a transaction");
+        }
 
         $this->autocommit = $value;
     }
@@ -330,8 +332,9 @@ 
     {
         foreach ($options as $option => $value)
         {
-            if (property_exists(__CLASS__, strtolower($option)) && method_exists($this, 'set'.$option))
-                $this->{'set'.$option}($value);
+            if (property_exists(__CLASS__, strtolower($option)) && method_exists($this, 'set'.$option)) {
+                            $this->{'set'.$option}($value);
+            }
         }
     }
 
@@ -375,8 +378,9 @@ 
      */
     public function reconnect()
     {
-        if (!$this->isConnected())
-            throw new \LogicException("Connection was not established");
+        if (!$this->isConnected()) {
+                    throw new \LogicException("Connection was not established");
+        }
 
         $this->disconnect();
         return $this->connect();
@@ -405,8 +409,9 @@ 
      */
     public function disconnect()
     {
-        if (!$this->isConnected())
-            throw new \LogicException("Connection was not established");
+        if (!$this->isConnected()) {
+                    throw new \LogicException("Connection was not established");
+        }
     }
 
     /**
@@ -418,11 +423,13 @@ 
      */
     public function beginTransaction()
     {
-        if (!$this->isConnected())
-            $this->connect();
+        if (!$this->isConnected()) {
+                    $this->connect();
+        }
 
-        if ($this->transac_mode)
-            throw new \LogicException($this->standardErrors[Errno::DB_TRANSACTION_STARTED]);
+        if ($this->transac_mode) {
+                    throw new \LogicException($this->standardErrors[Errno::DB_TRANSACTION_STARTED]);
+        }
 
         $this->transac_mode = true;
     }
@@ -436,16 +443,19 @@ 
      */
     public function endTransaction()
     {
-        if (!$this->transac_mode)
-            throw new \LogicException($this->standardErrors[Errno::DB_TRANSACTION_NOT_STARTED]);
+        if (!$this->transac_mode) {
+                    throw new \LogicException($this->standardErrors[Errno::DB_TRANSACTION_NOT_STARTED]);
+        }
 
-        if (is_null($this->transac_result))
-            throw new \LogicException($this->standardErrors[Errno::DB_TRANSACTION_EMPTY]);
+        if (is_null($this->transac_result)) {
+                    throw new \LogicException($this->standardErrors[Errno::DB_TRANSACTION_EMPTY]);
+        }
 
-        if ($this->transac_result)
-            $this->commit();
-        else
-            $this->rollback();
+        if ($this->transac_result) {
+                    $this->commit();
+        } else {
+                    $this->rollback();
+        }
 
         $this->result = $this->transac_result;
 

src/Db/Driver/DriverAdapter.php

Braces +8 added lines, -7 removed lines

@@ -85,13 +85,14 @@ 
             "Sqlsrv" => "Drone\Db\Driver\SQLServer",
         ];
 
-        if (gettype($connection_identifier) == 'array')
-            $connection_array = $connection_identifier;
-        else
+        if (gettype($connection_identifier) == 'array') {
+                    $connection_array = $connection_identifier;
+        } else
         {
             # Take connection parameters from configuration file
-            if (!file_exists("config/database.config.php"))
-                throw new \RuntimeException("config/data.base.config.php is missing!");
+            if (!file_exists("config/database.config.php")) {
+                            throw new \RuntimeException("config/data.base.config.php is missing!");
+            }
 
             $dbsettings = include("config/database.config.php");
             $connection_array = $dbsettings[$connection_identifier];
@@ -106,8 +107,8 @@ 
 
             $this->driverName = $drv;
             $this->db = new $driver[$drv]($connection_array);
+        } else {
+                    throw new \RuntimeException("The Database driver does not exists");
         }
-        else
-            throw new \RuntimeException("The Database driver does not exists");
     }
 }
\ No newline at end of file

src/Db/SQLFunction.php

Braces +3 added lines, -2 removed lines

@@ -77,8 +77,9 @@
 
         foreach ($arguments as $key => $arg)
         {
-            if (is_string($arg))
-                $arguments[$key] = "'$arg'";
+            if (is_string($arg)) {
+                            $arguments[$key] = "'$arg'";
+            }
         }
 
         $arguments = implode(", ", array_values($arguments));

src/Db/TableGateway/TableGatewayInterface.php

Indentation +4 added lines, -4 removed lines

@@ -22,14 +22,14 @@ 
      *
      * @param array $where
      */
-	public function select(Array $where);
+    public function select(Array $where);
 
     /**
      * Insert statement
      *
      * @param array $data
      */
-	public function insert(Array $data);
+    public function insert(Array $data);
 
     /**
      * Update statement
@@ -37,12 +37,12 @@ 
      * @param array $set
      * @param array $where
      */
-	public function update(Array $set, Array $where);
+    public function update(Array $set, Array $where);
 
     /**
      * Delete statement
      *
      * @param array $where
      */
-	public function delete(Array $where);
+    public function delete(Array $where);
 }
\ No newline at end of file

src/Db/TableGateway/AbstractTableGateway.php

Braces +3 added lines, -2 removed lines

@@ -73,7 +73,8 @@
     {
         $this->currentDriverIdentifier = $connection_identifier;
 
-        if (!isset(self::$drivers[$connection_identifier]))
-            self::$drivers[$connection_identifier] = new DriverAdapter($connection_identifier, $auto_connect);
+        if (!isset(self::$drivers[$connection_identifier])) {
+                    self::$drivers[$connection_identifier] = new DriverAdapter($connection_identifier, $auto_connect);
+        }
     }
 }
\ No newline at end of file