comodojo / dispatcher.framework

src/Comodojo/Dispatcher/Router/Route.php

Indentation +2 added lines, -2 removed lines

@@ -80,8 +80,8 @@
     protected $error_message;
 
     /**
-    * @var array
-    */
+     * @var array
+     */
     protected $parameters = [];
 
     /**

Spacing +4 added lines, -4 removed lines

@@ -357,13 +357,13 @@ 
     public function path($path) {
 
         // Because of the nature of the global regular expression, all the bits of the matched route are associated with a parameter key
-        foreach ($this->query as $key => $value) {
+        foreach ( $this->query as $key => $value ) {
 
             if ( isset($path[$key]) ) {
                 /* if it's available a bit associated with the parameter name, it is compared against
                  * it's regular expression in order to extrect backreferences
                  */
-                if ( preg_match('/^' . $value['regex'] . '$/', $path[$key], $matches) ) {
+                if ( preg_match('/^'.$value['regex'].'$/', $path[$key], $matches) ) {
 
                     if ( count($matches) == 1 ) $matches = $matches[0]; // This is the case where no backreferences are present or available.
 
@@ -372,7 +372,7 @@ 
 
                 }
 
-            } elseif ($value['required']) {
+            } elseif ( $value['required'] ) {
 
                 throw new DispatcherException(sprintf("Required parameter '%s' not specified.", $key), 1, null, 500);
 
@@ -391,7 +391,7 @@ 
      */
     public function serialize() {
 
-        return serialize( (object) [
+        return serialize((object)[
             'classname' => $this->classname,
             'type' => $this->type,
             'service' => $this->service,

src/Comodojo/Dispatcher/Traits/HeadersTrait.php

Spacing +8 added lines, -8 removed lines

@@ -28,9 +28,9 @@ 
 
     public function get($header = null) {
 
-        if (is_null($header)) return $this->headers;
+        if ( is_null($header) ) return $this->headers;
 
-        else if (array_key_exists($header, $this->headers)) return $this->headers[$header];
+        else if ( array_key_exists($header, $this->headers) ) return $this->headers[$header];
 
         else return null;
 
@@ -38,14 +38,14 @@ 
 
     public function getAsString($header = null) {
 
-        if (is_null($header)) {
+        if ( is_null($header) ) {
 
             return array_map([$this, 'headerToString'],
                 array_keys($this->headers),
                 array_values($this->headers)
             );
 
-        } else if (array_key_exists($header, $this->headers)) {
+        } else if ( array_key_exists($header, $this->headers) ) {
 
             return self::headerToString($header, $this->headers[$header]);
 
@@ -57,7 +57,7 @@ 
 
     public function set($header, $value = null) {
 
-        if (is_null($value)) {
+        if ( is_null($value) ) {
 
             $header = explode(":", $header, 2);
 
@@ -75,13 +75,13 @@ 
 
     public function delete($header = null) {
 
-        if (is_null($header)) {
+        if ( is_null($header) ) {
 
             $this->headers = array();
 
             return true;
 
-        } else if (array_key_exists($header, $this->headers)) {
+        } else if ( array_key_exists($header, $this->headers) ) {
 
             unset($this->headers[$header]);
 
@@ -97,7 +97,7 @@ 
 
     public function merge($headers) {
 
-        foreach ($headers as $key => $value) {
+        foreach ( $headers as $key => $value ) {
             $this->set($key, $value);
         }
 

src/Comodojo/Dispatcher/Router/Model.php

Spacing +12 added lines, -12 removed lines

@@ -107,11 +107,11 @@ 
 
     public function route(Request $request) {
 
-        $method = (string) $request->getMethod();
+        $method = (string)$request->getMethod();
 
         $methods = $this->configuration->get('allowed-http-methods');
 
-        if (!empty($methods) && in_array($method, $methods) === false) {
+        if ( !empty($methods) && in_array($method, $methods) === false ) {
 
             throw new DispatcherException("Method not allowed", 0, null, 405, array(
                 "Allow" => implode(",", $methods)
@@ -121,9 +121,9 @@ 
 
         $this->setRequest($request);
 
-        if ($this->bypass_routing === false) {
+        if ( $this->bypass_routing === false ) {
 
-            if (!$this->parse()) throw new DispatcherException("Unable to find a valid route for the specified uri", 0, null, 404);
+            if ( !$this->parse() ) throw new DispatcherException("Unable to find a valid route for the specified uri", 0, null, 404);
 
         }
 
@@ -135,10 +135,10 @@ 
 
         $class = $this->route->getClassName();
 
-        if (class_exists($class)) {
+        if ( class_exists($class) ) {
 
             // All the route parameters are also added to the query parameters
-            foreach ($this->route->getRequestParameters() as $parameter => $value) {
+            foreach ( $this->route->getRequestParameters() as $parameter => $value ) {
                 $this->getRequest()->getQuery()->set($parameter, $value);
             }
 
@@ -163,13 +163,13 @@ 
 
         $this->setResponse($response);
 
-        if (is_null($this->route)) {
+        if ( is_null($this->route) ) {
 
             throw new DispatcherException("Route has not been loaded!");
 
         }
 
-        if ($this->bypass_service) {
+        if ( $this->bypass_service ) {
 
             return;
 
@@ -177,7 +177,7 @@ 
 
         $service = $this->getServiceInstance();
 
-        if (!is_null($service)) {
+        if ( !is_null($service) ) {
 
             $result = "";
 
@@ -185,7 +185,7 @@ 
 
             $methods = $service->getImplementedMethods();
 
-            if (in_array($method, $methods)) {
+            if ( in_array($method, $methods) ) {
 
                 $callable = $service->getMethod($method);
 
@@ -225,10 +225,10 @@ 
 
         $path = urldecode($this->getRequest()->route());
 
-        foreach ($this->table->getRoutes() as $regex => $value) {
+        foreach ( $this->table->getRoutes() as $regex => $value ) {
 
             // The current uri is checked against all the global regular expressions associated with the routes
-            if (preg_match("/".$regex."/", $path, $matches)) {
+            if ( preg_match("/".$regex."/", $path, $matches) ) {
 
                 /* If a route is matched, all the bits of the route string are evalued in order to create
                  * new query parameters which will be available for the service class

src/Comodojo/Dispatcher/Router/Table.php

Spacing +9 added lines, -9 removed lines

@@ -41,7 +41,7 @@ 
      * Types of route that this table will accept
      * @var array
      */
-    const ALLOWED_ROUTES = [ "ROUTE", "REDIRECT", "ERROR" ];
+    const ALLOWED_ROUTES = ["ROUTE", "REDIRECT", "ERROR"];
 
     /**
      * Current repository of routes
@@ -141,7 +141,7 @@ 
 
         $regex = $this->regex($route);
 
-        if (isset($this->routes[$regex])) {
+        if ( isset($this->routes[$regex]) ) {
             return $this->routes[$regex];
         }
 
@@ -163,7 +163,7 @@ 
 
         $routes = $this->routes;
 
-        if (isset($routes[$regex])) {
+        if ( isset($routes[$regex]) ) {
 
             unset($routes[$regex]);
 
@@ -185,9 +185,9 @@ 
 
     public function load(array $routes) {
 
-        if (!empty($routes)) {
+        if ( !empty($routes) ) {
 
-            foreach ($routes as $name => $route) {
+            foreach ( $routes as $name => $route ) {
 
                 $this->add(
                     $route['route'],
@@ -249,11 +249,11 @@ 
 
     private function readCache() {
 
-        if ($this->configuration->get('routing-table-cache') !== true) return;
+        if ( $this->configuration->get('routing-table-cache') !== true ) return;
 
         $data = $this->cache->read();
 
-        if (is_null($data)) {
+        if ( is_null($data) ) {
 
             $this->routes = [];
 
@@ -269,11 +269,11 @@ 
 
     private function dumpCache() {
 
-        if ($this->configuration->get('routing-table-cache') !== true) return;
+        if ( $this->configuration->get('routing-table-cache') !== true ) return;
 
         $ttl = $this->configuration->get('routing-table-ttl');
 
-        if ($this->cache->dump($this->routes, $ttl)) {
+        if ( $this->cache->dump($this->routes, $ttl) ) {
             $this->logger->debug("Routing table saved to cache");
         } else {
             $this->logger->warning("Cannot save routing table to cache");

src/Comodojo/Dispatcher/Router/Parser.php

Spacing +7 added lines, -7 removed lines

@@ -41,14 +41,14 @@ 
     // the global regular expression against which all the request URI will be compared
     public function read($folders = array(), Route $value = null, $regex = '') {
 
-        if (is_null($value)) {
+        if ( is_null($value) ) {
 
             $value = new Route();
 
         }
 
         // if the first 'folder' is empty is removed
-        while (!empty($folders) && empty($folders[0])) {
+        while ( !empty($folders) && empty($folders[0]) ) {
 
             array_shift($folders);
 
@@ -56,7 +56,7 @@ 
 
         // if the 'folder' array is empty, the route has been fully analyzed
         // this is the exit condition from the recursive loop.
-        if (empty($folders)) {
+        if ( empty($folders) ) {
 
             return '^'.$regex.'[\/]?$';
 
@@ -68,7 +68,7 @@ 
             // All the parameters of the route must be json strings
             $decoded = json_decode($folder, true);
 
-            if (!is_null($decoded) && is_array($decoded)) {
+            if ( !is_null($decoded) && is_array($decoded) ) {
 
                 $param_regex = '';
 
@@ -84,7 +84,7 @@ 
                  *
                  * This is the reason of the following 'foreach'
                  */
-                foreach ($decoded as $key => $string) {
+                foreach ( $decoded as $key => $string ) {
 
                     $this->logger->debug("Route parser - parameter key: $key");
 
@@ -96,7 +96,7 @@ 
                      */
                     $param_regex .= $this->param($key, $string, $value);
 
-                    if ($value->isQueryRequired($key)) {
+                    if ( $value->isQueryRequired($key) ) {
                         $param_required = true;
                     }
 
@@ -132,7 +132,7 @@ 
         $field_required = false;
 
         // If the field name ends with a '*', the parameter is considered as required
-        if (preg_match('/^(.+)\*$/', $key, $bits)) {
+        if ( preg_match('/^(.+)\*$/', $key, $bits) ) {
 
             $key = $bits[1];
             $field_required = true;

src/Comodojo/Dispatcher/Response/Content.php

Spacing +1 added lines, -1 removed lines

@@ -43,7 +43,7 @@
 
     public function set($content = null) {
 
-        if (!is_scalar($content) && $content != null) {
+        if ( !is_scalar($content) && $content != null ) {
 
             throw new Exception("Invalid HTTP content");
 

src/Comodojo/Dispatcher/Response/Status.php

Spacing +2 added lines, -2 removed lines

@@ -48,7 +48,7 @@ 
 
     public function set($code) {
 
-        if (!$this->codes->exists($code)) {
+        if ( !$this->codes->exists($code) ) {
 
             throw new Exception("Invalid HTTP Status Code $code");
 
@@ -60,7 +60,7 @@ 
 
     }
 
-    public function description($code=null) {
+    public function description($code = null) {
 
         if ( is_null($code) ) return $this->codes->getMessage($this->status_code);
 

src/Comodojo/Dispatcher/Response/Model.php

Spacing +14 added lines, -14 removed lines

@@ -161,14 +161,14 @@ 
 
     public function import($data) {
 
-        if (isset($data->headers)) $this->setHeaders($data->headers);
-        if (isset($data->status)) $this->setStatus($data->status);
-        if (isset($data->content)) $this->setContent($data->content);
-        if (isset($data->location)) $this->setLocation($data->location);
+        if ( isset($data->headers) ) $this->setHeaders($data->headers);
+        if ( isset($data->status) ) $this->setStatus($data->status);
+        if ( isset($data->content) ) $this->setContent($data->content);
+        if ( isset($data->location) ) $this->setLocation($data->location);
 
-        if (isset($data->cookies) && is_array($data->cookies)) {
+        if ( isset($data->cookies) && is_array($data->cookies) ) {
             $cookies = $this->getCookies();
-            foreach ($data->cookies as $name => $cookie) $cookies->add($cookie);
+            foreach ( $data->cookies as $name => $cookie ) $cookies->add($cookie);
         }
 
     }
@@ -180,7 +180,7 @@ 
         $output_class_name = "\\Comodojo\\Dispatcher\\Response\\Preprocessor\\Status".$status;
 
         // @TODO: this condition will be removed when all preprocessors ready
-        if (class_exists($output_class_name)) {
+        if ( class_exists($output_class_name) ) {
             $output = new $output_class_name($this);
         } else {
             $output = new \Comodojo\Dispatcher\Response\Preprocessor\Status200($this);
@@ -188,7 +188,7 @@ 
 
         $output->consolidate();
 
-        if ($route != null) {
+        if ( $route != null ) {
             $this->setClientCache($request, $route);
         }
 
@@ -196,19 +196,19 @@ 
         $content = $this->getContent();
         $headers = $this->getHeaders();
 
-        if ((string)$request->getMethod() == 'HEAD' && !in_array($status, self::$no_content_statuses)) {
+        if ( (string)$request->getMethod() == 'HEAD' && !in_array($status, self::$no_content_statuses) ) {
             $length = $content->length();
             $content->set(null);
-            if ($length) {
+            if ( $length ) {
                 $headers->set('Content-Length', $length);
             }
         }
 
-        if ($headers->get('Transfer-Encoding') != null) {
+        if ( $headers->get('Transfer-Encoding') != null ) {
             $headers->delete('Content-Length');
         }
 
-        if ((string)$request->getVersion() == '1.0' && false !== strpos($headers->get('Cache-Control'), 'no-cache')) {
+        if ( (string)$request->getVersion() == '1.0' && false !== strpos($headers->get('Cache-Control'), 'no-cache') ) {
             $headers->set('pragma', 'no-cache');
             $headers->set('expires', -1);
         }
@@ -229,9 +229,9 @@ 
         ) {
 
             $headers = $this->getHeaders();
-            $timestamp = (int) $this->getTime()->format('U')+$ttl;
+            $timestamp = (int)$this->getTime()->format('U')+$ttl;
 
-            if ($ttl > 0) {
+            if ( $ttl > 0 ) {
 
                 $headers->set("Cache-Control", "max-age=".$ttl.", must-revalidate");
                 $headers->set("Expires", gmdate("D, d M Y H:i:s", $timestamp)." GMT");

src/Comodojo/Dispatcher/Response/Preprocessor/Status301.php

Spacing +2 added lines, -2 removed lines

@@ -32,13 +32,13 @@
 
         $location = $this->response->getLocation()->get();
 
-        if (empty($location)) throw new Exception("Invalid location, cannot redirect");
+        if ( empty($location) ) throw new Exception("Invalid location, cannot redirect");
 
         $this->response->getHeaders()->set("Location", $location);
 
         $content = $this->response->getContent();
 
-        if (empty($content->get())) {
+        if ( empty($content->get()) ) {
 
             $content->set(sprintf('<!DOCTYPE html>
 <html>