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(

Braces +3 added lines, -1 removed lines

@@ -192,7 +192,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);
+            }
         }
 
     }

Spacing +17 added lines, -17 removed lines

@@ -74,7 +74,7 @@ 
 
         // init core components
         // create new configuration object and merge configuration
-        $configuration_object = new Configuration( DefaultConfiguration::get() );
+        $configuration_object = new Configuration(DefaultConfiguration::get());
         $configuration_object->merge($configuration);
         $logger = is_null($logger) ? LogManager::createFromConfiguration($configuration_object)->getLogger() : $logger;
 
@@ -95,7 +95,7 @@ 
             $this->setRaw('response', new Response($this->configuration, $this->logger));
 
         } catch (Exception $e) {
-            $this->logger->critical($e->getMessage(),$e->getTrace());
+            $this->logger->critical($e->getMessage(), $e->getTrace());
             throw $e;
         }
 
@@ -110,9 +110,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.");
 
@@ -130,13 +130,13 @@ 
 
         $cache = new ServerCache($this->cache);
 
-        $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 ( $cache->read($this->request, $this->response) ) {
+        if ($cache->read($this->request, $this->response)) {
 
             return $this->shutdown();
 
@@ -164,13 +164,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
 
@@ -200,9 +200,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);
         }
 
     }
@@ -242,11 +242,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");
 

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/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);
 

src/Comodojo/Dispatcher/Router/Model.php

Spacing +5 added lines, -5 removed lines

@@ -108,10 +108,10 @@ 
 
         $methods = $this->configuration->get('allowed-http-methods');
 
-        if ( ( $methods != null || !empty($methods) ) && in_array($method, $methods) === false ) {
+        if (($methods != null || !empty($methods)) && in_array($method, $methods) === false) {
 
             throw new DispatcherException("Method not allowed", 0, null, 405, array(
-                "Allow" => implode(",",$methods)
+                "Allow" => implode(",", $methods)
             ));
 
         }
@@ -138,7 +138,7 @@ 
             
         }
         
-        if ( $this->bypass_service ) {
+        if ($this->bypass_service) {
             
             return;
             
@@ -158,7 +158,7 @@ 
 
             $methods = $service->getImplementedMethods();
 
-            if ( in_array($method, $methods) ) {
+            if (in_array($method, $methods)) {
 
                 $callable = $service->getMethod($method);
 
@@ -201,7 +201,7 @@ 
         foreach ($this->table->routes() 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

Braces +5 added lines, -2 removed lines

@@ -105,7 +105,9 @@ 
 
         if (!$this->bypass_routing) {
 
-            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);
+            }
 
         }
 
@@ -133,8 +135,9 @@ 
                 $this->extra
             );
 
+        } else {
+            return null;
         }
-        else return null;
         
     }
 

src/Comodojo/Dispatcher/Components/DefaultConfiguration.php

Spacing +2 added lines, -2 removed lines

@@ -48,11 +48,11 @@
 
     private static function urlGetAbsolute() {
 
-        $http = 'http' . ((isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') ? 's' : '') . '://';
+        $http = 'http'.((isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') ? 's' : '').'://';
 
         $uri = self::uriGetAbsolute();
 
-        return ( $http . (isset($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : 'localhost') . $uri . "/" );
+        return ($http.(isset($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : 'localhost').$uri."/");
 
     }
 

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

Braces +3 added lines, -1 removed lines

@@ -32,7 +32,9 @@
 
         $location = $this->response()->location()->get();
 
-        if ( empty($location) ) throw new Exception("Invalid location, cannot redirect");
+        if ( empty($location) ) {
+            throw new Exception("Invalid location, cannot redirect");
+        }
 
         $this->response()->headers()->set("Location: ".$location);
 

Spacing +2 added lines, -2 removed lines

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

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

Spacing +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
         // An Allow Header should be provided from DispatcherException
         $allow = $this->response()->headers()->get('Allow');
 
-        if ( is_null($allow) ) throw new Exception("Missing Allow header");
+        if (is_null($allow)) throw new Exception("Missing Allow header");
 
         parent::consolidate();
 

Braces +3 added lines, -1 removed lines

@@ -33,7 +33,9 @@
         // An Allow Header should be provided from DispatcherException
         $allow = $this->response()->headers()->get('Allow');
 
-        if ( is_null($allow) ) throw new Exception("Missing Allow header");
+        if ( is_null($allow) ) {
+            throw new Exception("Missing Allow header");
+        }
 
         parent::consolidate();