Pleets / dronephp

src/Network/Rest/Basic.php

Spacing +3 added lines, -3 removed lines

@@ -29,8 +29,8 @@ 
             $ht = $this->http;
 
             $this->http->writeStatus($ht::HTTP_UNAUTHORIZED);
-            header('WWW-Authenticate: Basic realm="'.$this->realm.'"');
-            die('Error ' . $ht::HTTP_UNAUTHORIZED .' (' . $this->http->getStatusText($ht::HTTP_UNAUTHORIZED) . ')!!');
+            header('WWW-Authenticate: Basic realm="' . $this->realm . '"');
+            die('Error ' . $ht::HTTP_UNAUTHORIZED . ' (' . $this->http->getStatusText($ht::HTTP_UNAUTHORIZED) . ')!!');
         }
     }
 
@@ -76,7 +76,7 @@ 
     public function response()
     {
         $status = http_response_code();
-        $this->response = 'Error ' . $status .' (' . $this->http->getStatusText($status) . ')!!';
+        $this->response = 'Error ' . $status . ' (' . $this->http->getStatusText($status) . ')!!';
         echo $this->response;
     }
 }
\ No newline at end of file

src/Network/Rest/Digest.php

Spacing +5 added lines, -5 removed lines

@@ -29,8 +29,8 @@ 
             $ht = $this->http;
 
             $this->http->writeStatus($ht::HTTP_UNAUTHORIZED);
-            header('WWW-Authenticate: Digest realm="'.$this->realm.'",qop="auth",nonce="'.uniqid().'",opaque="'.md5($this->realm).'"');
-            die('Error ' . $ht::HTTP_UNAUTHORIZED .' (' . $this->http->getStatusText($ht::HTTP_UNAUTHORIZED) . ')!!');
+            header('WWW-Authenticate: Digest realm="' . $this->realm . '",qop="auth",nonce="' . uniqid() . '",opaque="' . md5($this->realm) . '"');
+            die('Error ' . $ht::HTTP_UNAUTHORIZED . ' (' . $this->http->getStatusText($ht::HTTP_UNAUTHORIZED) . ')!!');
         }
     }
 
@@ -50,8 +50,8 @@ 
         }
 
         $A1 = md5($data['username'] . ':' . $this->realm . ':' . $this->whiteList[$data['username']]);
-        $A2 = md5($_SERVER['REQUEST_METHOD'].':'.$data['uri']);
-        $valid_response = md5($A1.':'.$data['nonce'].':'.$data['nc'].':'.$data['cnonce'].':'.$data['qop'].':'.$A2);
+        $A2 = md5($_SERVER['REQUEST_METHOD'] . ':' . $data['uri']);
+        $valid_response = md5($A1 . ':' . $data['nonce'] . ':' . $data['nc'] . ':' . $data['cnonce'] . ':' . $data['qop'] . ':' . $A2);
 
         if ($data['response'] != $valid_response)
         {
@@ -97,7 +97,7 @@ 
     public function response()
     {
         $status = http_response_code();
-        $this->response = 'Error ' . $status .' (' . $this->http->getStatusText($status) . ')!!';
+        $this->response = 'Error ' . $status . ' (' . $this->http->getStatusText($status) . ')!!';
         echo $this->response;
     }
 }
\ No newline at end of file

src/Network/Rest/AbstractRest.php

Spacing +2 added lines, -2 removed lines

@@ -156,8 +156,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);
         }
 
         # HTTP instance

Braces +6 added lines, -4 removed lines

@@ -127,8 +127,9 @@ 
      */
     public function setWhiteList(array $whiteList)
     {
-        if (empty($whiteList))
-            throw new \RuntimeException("Empty whitelist!");
+        if (empty($whiteList)) {
+                    throw new \RuntimeException("Empty whitelist!");
+        }
 
         $this->whiteList = $whiteList;
     }
@@ -156,8 +157,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);
+            }
         }
 
         # HTTP instance

src/Network/Server.php

Braces +6 added lines, -4 removed lines

@@ -64,11 +64,13 @@
      */
     public static function getClientIP()
     {
-        if (!empty($_SERVER['HTTP_CLIENT_IP']))
-            return $_SERVER['HTTP_CLIENT_IP'];
+        if (!empty($_SERVER['HTTP_CLIENT_IP'])) {
+                    return $_SERVER['HTTP_CLIENT_IP'];
+        }
 
-        if (!empty($_SERVER['HTTP_X_FORWARDED_FOR']))
-            return $_SERVER['HTTP_X_FORWARDED_FOR'];
+        if (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) {
+                    return $_SERVER['HTTP_X_FORWARDED_FOR'];
+        }
 
         return $_SERVER['REMOTE_ADDR'];
     }

src/Pear/Mail.php

Indentation +1 added lines, -1 removed lines

@@ -131,7 +131,7 @@
         if (\PEAR::isError($mail))
         {
             $this->error(
-            	$mail->getCode(), $mail->getMessage()
+                $mail->getCode(), $mail->getMessage()
             );
 
             return false;

Spacing +2 added lines, -2 removed lines

@@ -114,7 +114,7 @@ 
      */
     public function send($from, $to, $subject, $body)
     {
-        $headers = array (
+        $headers = array(
             'From'         => $from,
             'To'           => $to,
             'Subject'      => $subject,
@@ -123,7 +123,7 @@ 
 
         $smtp = \Mail::factory(
             'smtp',
-            array ('host' => $this->host, 'auth' => false)
+            array('host' => $this->host, 'auth' => false)
         );
 
         $mail = $smtp->send($to, $headers, $body);

Braces +12 added lines, -8 removed lines

@@ -74,18 +74,21 @@ 
     {
         @include_once 'System.php';
 
-        if (!class_exists('System', false))
-            throw new \RuntimeException("PEAR is not installed in your system!");
+        if (!class_exists('System', false)) {
+                    throw new \RuntimeException("PEAR is not installed in your system!");
+        }
 
         include_once 'Net/SMTP.php';
 
-        if (!class_exists('\Net_SMTP', false))
-            throw new \RuntimeException("PEAR::Net_SMTP is not installed!");
+        if (!class_exists('\Net_SMTP', false)) {
+                    throw new \RuntimeException("PEAR::Net_SMTP is not installed!");
+        }
 
         @include_once 'Mail.php';
 
-        if (!class_exists('\Mail', false))
-            throw new \RuntimeException("PEAR::Mail is not installed!");
+        if (!class_exists('\Mail', false)) {
+                    throw new \RuntimeException("PEAR::Mail is not installed!");
+        }
     }
 
     /**
@@ -98,8 +101,9 @@ 
      */
     protected function error($code, $message = null)
     {
-        if (!array_key_exists($code, $this->errors))
-            $this->errors[$message] = (is_null($message) && array_key_exists($code, $this->errors)) ? $this->errors[$code] : $message;
+        if (!array_key_exists($code, $this->errors)) {
+                    $this->errors[$message] = (is_null($message) && array_key_exists($code, $this->errors)) ? $this->errors[$code] : $message;
+        }
     }
 
     /**

src/Util/ParamTrait.php

Braces +3 added lines, -2 removed lines

@@ -70,8 +70,9 @@
     {
         $parameters = $this->getParams();
 
-        if (array_key_exists($param, $parameters))
-            return true;
+        if (array_key_exists($param, $parameters)) {
+                    return true;
+        }
 
         return false;
     }

src/Exception/Storage.php

Spacing +1 added lines, -1 removed lines

@@ -60,7 +60,7 @@
 
             if (!empty($string))
             {
-                $data   = json_decode($string, true);
+                $data = json_decode($string, true);
 
                 # json_encode can return TRUE, FALSE or NULL (http://php.net/manual/en/function.json-decode.php)
                 if (is_null($data) || $data === false)

Braces +9 added lines, -6 removed lines

@@ -76,17 +76,20 @@
             "object"  => serialize($exception)
         ];
 
-        if (!function_exists('mb_detect_encoding'))
-            throw new \RuntimeException("mbstring library is not installed!");
+        if (!function_exists('mb_detect_encoding')) {
+                    throw new \RuntimeException("mbstring library is not installed!");
+        }
 
         /*
          * Encodes to UTF8 all messages. It ensures JSON encoding.
          */
-        if (!mb_detect_encoding($data[$id]["message"], 'UTF-8', true))
-            $data[$id]["message"] = utf8_encode($data[$id]["message"]);
+        if (!mb_detect_encoding($data[$id]["message"], 'UTF-8', true)) {
+                    $data[$id]["message"] = utf8_encode($data[$id]["message"]);
+        }
 
-        if (!mb_detect_encoding($data[$id]["object"], 'UTF-8', true))
-            $data[$id]["object"] = utf8_decode($data[$id]["object"]);
+        if (!mb_detect_encoding($data[$id]["object"], 'UTF-8', true)) {
+                    $data[$id]["object"] = utf8_decode($data[$id]["object"]);
+        }
 
         if (($encoded_data = json_encode($data)) === false)
         {

src/Mvc/Router.php

Braces +11 added lines, -8 removed lines

@@ -145,8 +145,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"];
@@ -156,10 +157,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!");
+        }
     }
 
     /**
@@ -176,8 +178,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 +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();
     }