comodojo / dispatcher.framework

src/Comodojo/Dispatcher/Dispatcher.php

Doc Comments +3 added lines

@@ -167,6 +167,9 @@
 
     }
 
+    /**
+     * @param string $name
+     */
     private function emitServiceSpecializedEvents($name) {
 
         return new ServiceEvent(

Spacing +22 added lines, -22 removed lines

@@ -60,7 +60,7 @@ 
         $this->setTimestamp();
 
         // parsing configuration
-        $this->configuration = new Configuration( DefaultConfiguration::get() );
+        $this->configuration = new Configuration(DefaultConfiguration::get());
 
         $this->configuration->merge($configuration);
 
@@ -91,9 +91,9 @@ 
 
         $this->logger->debug("Emitting global dispatcher event.");
 
-        $this->events->emit( new DispatcherEvent($this) );
+        $this->events->emit(new DispatcherEvent($this));
 
-        if ( $this->configuration->get('enabled') === false ) {
+        if ($this->configuration->get('enabled') === false) {
 
             $this->logger->debug("Dispatcher disabled, shutting down gracefully.");
 
@@ -109,13 +109,13 @@ 
 
         }
 
-        $this->events->emit( $this->emitServiceSpecializedEvents('dispatcher.request') );
+        $this->events->emit($this->emitServiceSpecializedEvents('dispatcher.request'));
 
-        $this->events->emit( $this->emitServiceSpecializedEvents('dispatcher.request.'.$this->request->method->get()) );
+        $this->events->emit($this->emitServiceSpecializedEvents('dispatcher.request.'.$this->request->method->get()));
 
-        $this->events->emit( $this->emitServiceSpecializedEvents('dispatcher.request.#') );
+        $this->events->emit($this->emitServiceSpecializedEvents('dispatcher.request.#'));
 
-        if ( $this->readCache() ) {
+        if ($this->readCache()) {
 
             return $this->shutdown();
 
@@ -145,13 +145,13 @@ 
 
         $this->logger->debug("Route acquired, type $route_type directed to $route_service.");
 
-        $this->events->emit( $this->emitServiceSpecializedEvents('dispatcher.route') );
+        $this->events->emit($this->emitServiceSpecializedEvents('dispatcher.route'));
 
-        $this->events->emit( $this->emitServiceSpecializedEvents('dispatcher.route.'.$route_type) );
+        $this->events->emit($this->emitServiceSpecializedEvents('dispatcher.route.'.$route_type));
 
-        $this->events->emit( $this->emitServiceSpecializedEvents('dispatcher.route.'.$route_service) );
+        $this->events->emit($this->emitServiceSpecializedEvents('dispatcher.route.'.$route_service));
 
-        $this->events->emit( $this->emitServiceSpecializedEvents('dispatcher.route.#') );
+        $this->events->emit($this->emitServiceSpecializedEvents('dispatcher.route.#'));
 
         // translate route to service
 
@@ -179,11 +179,11 @@ 
 
     private function readCache() {
 
-        $name = (string) $this->request->uri;
+        $name = (string)$this->request->uri;
 
         $cache = $this->cache->setNamespace('dispatcherservice')->get($name);
 
-        if ( is_null($cache) ) return false;
+        if (is_null($cache)) return false;
 
         $this->response->import($cache);
 
@@ -195,7 +195,7 @@ 
 
         $cache = strtoupper($route->getParameter('cache'));
         $ttl = $route->getParameter('ttl');
-        $name = (string) $this->request->uri;
+        $name = (string)$this->request->uri;
         $method = $this->request->method->get();
         $status = $this->response->status->get();
 
@@ -203,10 +203,10 @@ 
         //        because of dispatcher internal structure: if post request is cached
         //        subsequent requests will never reach the service.
         if (
-            ( $cache == 'SERVER' || $cache == 'BOTH' ) &&
+            ($cache == 'SERVER' || $cache == 'BOTH') &&
             in_array($request->method->get(), array('GET', 'HEAD')) &&
             in_array($this->status->get(), array(200, 203, 300, 301, 302, 404, 410))
-        ){
+        ) {
 
             $this->cache->setNamespace('dispatcherservice')->set($name, $this->response->export(), $ttl);
 
@@ -218,9 +218,9 @@ 
 
         $params = $route->getParameter('headers');
 
-        if ( !empty($params) && is_array($params) ) {
+        if (!empty($params) && is_array($params)) {
 
-            foreach($params as $name=>$value) $this->response->headers->set($name, $value);
+            foreach ($params as $name=>$value) $this->response->headers->set($name, $value);
         }
 
     }
@@ -260,11 +260,11 @@ 
 
         $this->response->consolidate($this->request, $this->route);
 
-        $this->events->emit( $this->emitServiceSpecializedEvents('dispatcher.response') );
+        $this->events->emit($this->emitServiceSpecializedEvents('dispatcher.response'));
 
-        $this->events->emit( $this->emitServiceSpecializedEvents('dispatcher.response.'.$this->response->status->get()) );
+        $this->events->emit($this->emitServiceSpecializedEvents('dispatcher.response.'.$this->response->status->get()));
 
-        $this->events->emit( $this->emitServiceSpecializedEvents('dispatcher.response.#') );
+        $this->events->emit($this->emitServiceSpecializedEvents('dispatcher.response.#'));
 
         $this->logger->debug("Composing return value.");
 
@@ -272,7 +272,7 @@ 
 
         $this->logger->debug("Dispatcher run-cycle ends.");
 
-        if ( function_exists('fastcgi_finish_request') ) fastcgi_finish_request();
+        if (function_exists('fastcgi_finish_request')) fastcgi_finish_request();
         else ob_end_clean();
 
         return $return;

Braces +11 added lines, -4 removed lines

@@ -183,7 +183,9 @@ 
 
         $cache = $this->cache->setNamespace('dispatcherservice')->get($name);
 
-        if ( is_null($cache) ) return false;
+        if ( is_null($cache) ) {
+            return false;
+        }
 
         $this->response->import($cache);
 
@@ -220,7 +222,9 @@ 
 
         if ( !empty($params) && is_array($params) ) {
 
-            foreach($params as $name=>$value) $this->response->headers->set($name, $value);
+            foreach($params as $name=>$value) {
+                $this->response->headers->set($name, $value);
+            }
         }
 
     }
@@ -272,8 +276,11 @@ 
 
         $this->logger->debug("Dispatcher run-cycle ends.");
 
-        if ( function_exists('fastcgi_finish_request') ) fastcgi_finish_request();
-        else ob_end_clean();
+        if ( function_exists('fastcgi_finish_request') ) {
+            fastcgi_finish_request();
+        } else {
+            ob_end_clean();
+        }
 
         return $return;
 

src/Comodojo/Dispatcher/Components/Parameters.php

Braces +5 added lines, -5 removed lines

@@ -28,16 +28,16 @@
 
     final public function get($parameter=null) {
 
-        if ( is_null($parameter) ) return $this->parameters;
-
-        else if ( array_key_exists($parameter, $this->parameters) ) {
+        if ( is_null($parameter) ) {
+            return $this->parameters;
+        } else if ( array_key_exists($parameter, $this->parameters) ) {
 
             return $this->parameters[$parameter];
 
+        } else {
+            return null;
         }
 
-        else return null;
-
     }
 
     final public function set($parameter, $value) {

Spacing +5 added lines, -5 removed lines

@@ -27,11 +27,11 @@ 
 
     protected $parameters = array();
 
-    final public function get($parameter=null, $index=null) {
+    final public function get($parameter = null, $index = null) {
 
-        if ( is_null($parameter) ) return $this->parameters;
+        if (is_null($parameter)) return $this->parameters;
 
-        else if ( array_key_exists($parameter, $this->parameters) ) {
+        else if (array_key_exists($parameter, $this->parameters)) {
             
             $value = $this->parameters[$parameter];
             
@@ -69,13 +69,13 @@ 
 
     final public function delete($parameter = null) {
 
-        if ( is_null($parameter) ) {
+        if (is_null($parameter)) {
 
             $this->parameters = array();
 
             return true;
 
-        } else if ( array_key_exists($parameter, $this->parameters) ) {
+        } else if (array_key_exists($parameter, $this->parameters)) {
 
             unset($this->parameters[$parameter]);
 

src/Comodojo/Dispatcher/Request/Headers.php

Spacing +3 added lines, -3 removed lines

@@ -41,13 +41,13 @@
      */
     private static function getHeaders() {
 
-        if ( function_exists('getallheaders') ) return getallheaders();
+        if (function_exists('getallheaders')) return getallheaders();
 
         $headers = array();
 
-        foreach ( $_SERVER as $name => $value ) {
+        foreach ($_SERVER as $name => $value) {
 
-            if ( substr($name, 0, 5) == 'HTTP_' ) {
+            if (substr($name, 0, 5) == 'HTTP_') {
 
                 $headers[str_replace(' ', '-', ucwords(strtolower(str_replace('_', ' ', substr($name, 5)))))] = $value;
 

Braces +3 added lines, -1 removed lines

@@ -41,7 +41,9 @@
      */
     private static function getHeaders() {
 
-        if ( function_exists('getallheaders') ) return getallheaders();
+        if ( function_exists('getallheaders') ) {
+            return getallheaders();
+        }
 
         $headers = array();
 

src/Comodojo/Dispatcher/Request/Post.php

Spacing +1 added lines, -1 removed lines

@@ -46,7 +46,7 @@
 
     private static function getParameters() {
 
-        switch( $_SERVER['REQUEST_METHOD'] ) {
+        switch ($_SERVER['REQUEST_METHOD']) {
 
             case 'POST':
 

src/Comodojo/Dispatcher/Request/Query.php

Spacing +1 added lines, -1 removed lines

@@ -46,7 +46,7 @@
 
     private static function getParameters() {
 
-        switch( $_SERVER['REQUEST_METHOD'] ) {
+        switch ($_SERVER['REQUEST_METHOD']) {
 
             case 'POST':
 

src/Comodojo/Dispatcher/Components/Configuration.php

Spacing +4 added lines, -4 removed lines

@@ -27,7 +27,7 @@ 
 
     protected $attributes = array();
 
-    public function __construct( $configuration = array() ) {
+    public function __construct($configuration = array()) {
 
         $this->attributes = array_merge($this->attributes, $configuration);
 
@@ -35,7 +35,7 @@ 
 
     final public function get($property = null) {
 
-        if ( is_null($property) ) {
+        if (is_null($property)) {
 
             return $this->attributes;
 
@@ -91,13 +91,13 @@ 
 
     final public function delete($property = null) {
 
-        if ( is_null($property) ) {
+        if (is_null($property)) {
 
             $this->attributes = array();
 
             return true;
 
-        } else if ( $this->isDefined($property) ) {
+        } else if ($this->isDefined($property)) {
 
             unset($this->attributes[$property]);
 

src/Comodojo/Dispatcher/Components/Headers.php

Spacing +9 added lines, -9 removed lines

@@ -29,9 +29,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;
 
@@ -39,14 +39,14 @@ 
 
     public function getAsString($header = null) {
 
-        if ( is_null($header) ) {
+        if (is_null($header)) {
 
-            return array_map( function($header, $value) {
+            return array_map(function($header, $value) {
                 return (string)($header.':'.$value);
             },
             $this->headers);
 
-        } else if ( array_key_exists($header, $this->headers) ) {
+        } else if (array_key_exists($header, $this->headers)) {
 
             return (string)($header.':'.$this->headers[$header]);
 
@@ -54,9 +54,9 @@ 
 
     }
 
-    public function set($header, $value=null) {
+    public function set($header, $value = null) {
 
-        if ( is_null($value) ) {
+        if (is_null($value)) {
 
             $header = explode(":", $header);
 
@@ -74,13 +74,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]);
 

Braces +10 added lines, -6 removed lines

@@ -29,11 +29,13 @@ 
 
     public function get($header = null) {
 
-        if ( is_null($header) ) return $this->headers;
-
-        else if ( array_key_exists($header, $this->headers) ) return $this->headers[$header];
-
-        else return null;
+        if ( is_null($header) ) {
+            return $this->headers;
+        } else if ( array_key_exists($header, $this->headers) ) {
+            return $this->headers[$header];
+        } else {
+            return null;
+        }
 
     }
 
@@ -50,7 +52,9 @@ 
 
             return (string)($header.':'.$this->headers[$header]);
 
-        } else return null;
+        } else {
+            return null;
+        }
 
     }
 

src/Comodojo/Dispatcher/Components/Timestamp.php

Spacing +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
 
     final public function setTimestamp($time = null) {
 
-        if ( is_float($time) ) $this->timestamp = $time;
+        if (is_float($time)) $this->timestamp = $time;
 
         else $this->timestamp = microtime(true);
 

Braces +5 added lines, -3 removed lines

@@ -35,9 +35,11 @@
 
     final public function setTimestamp($time = null) {
 
-        if ( is_float($time) ) $this->timestamp = $time;
-
-        else $this->timestamp = microtime(true);
+        if ( is_float($time) ) {
+            $this->timestamp = $time;
+        } else {
+            $this->timestamp = microtime(true);
+        }
 
         return $this;
 

src/Comodojo/Dispatcher/Router/Parser.php

Spacing +5 added lines, -5 removed lines

@@ -73,9 +73,9 @@ 
                  */
                 foreach ($decoded as $key => $string) {
 
-                    $this->logger->debug("PARAMETER KEY: " . $key);
+                    $this->logger->debug("PARAMETER KEY: ".$key);
 
-                    $this->logger->debug("PARAMETER STRING: " . $string);
+                    $this->logger->debug("PARAMETER STRING: ".$string);
                     
                     /* The key and the regex of every paramater is passed to the 'param'
                      * method which will build an appropriate regular expression and will understand 
@@ -83,14 +83,14 @@ 
                      */
                     $param_regex .= $this->param($key, $string, $param_required, $value);
 
-                    $this->logger->debug("PARAMETER REGEX: " . $param_regex);
+                    $this->logger->debug("PARAMETER REGEX: ".$param_regex);
 
                 }
                 // Once the parameter is analyzed, the result is passed to the next iteration
                 return $this->read(
                     $folders,
                     $value,
-                    $regex.'(?:\/'.$param_regex.')'. (($param_required)?'{1}':'?')
+                    $regex.'(?:\/'.$param_regex.')'.(($param_required) ? '{1}' : '?')
                 );
 
             } else {
@@ -155,7 +155,7 @@ 
          * If the field is required, the regular expression is completed with a '{1}' (which make it compulsory),
          * otherwise a '?' is added.
          */
-        return '(?P<' . $key . '>' . $string . ')' . (($field_required)?'{1}':'?');
+        return '(?P<'.$key.'>'.$string.')'.(($field_required) ? '{1}' : '?');
 
     }
 

Braces +3 added lines, -1 removed lines

@@ -103,7 +103,9 @@
                      */
                     $param_regex .= $this->param($key, $string, $value);
                     
-                    if ($value->isQueryRequired($key)) $param_required = true;
+                    if ($value->isQueryRequired($key)) {
+                        $param_required = true;
+                    }
 
                     $this->logger->debug("PARAMETER REGEX: " . $param_regex);