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 +17 added lines, -17 removed lines

@@ -75,7 +75,7 @@ 
 
         $this->extra = new Extra($this->logger);
 
-        $this->configuration = new Configuration( DefaultConfiguration::get() );
+        $this->configuration = new Configuration(DefaultConfiguration::get());
 
         $this->configuration->merge($configuration);
 
@@ -137,9 +137,9 @@ 
 
     public function dispatch() {
 
-        $this->events->emit( new DispatcherEvent($this) );
+        $this->events->emit(new DispatcherEvent($this));
 
-        if ( $this->configuration()->get('enabled') === false ) {
+        if ($this->configuration()->get('enabled') === false) {
 
             $status = $this->configuration()->get('disabled-status');
 
@@ -153,11 +153,11 @@ 
 
         }
 
-        $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.#'));
 
         try {
 
@@ -165,21 +165,21 @@ 
 
         } catch (DispatcherException $de) {
 
-            $this->response()->status()->set( $de->getStatus() );
+            $this->response()->status()->set($de->getStatus());
 
-            $this->response()->content()->set( $de->getMessage() );
+            $this->response()->content()->set($de->getMessage());
 
             return $this->shutdown();
 
         }
 
-        $this->events->emit( $this->emitServiceSpecializedEvents('dispatcher.route') );
+        $this->events->emit($this->emitServiceSpecializedEvents('dispatcher.route'));
 
-        $this->events->emit( $this->emitServiceSpecializedEvents('dispatcher.route.'.$this->router->getType()) );
+        $this->events->emit($this->emitServiceSpecializedEvents('dispatcher.route.'.$this->router->getType()));
 
-        $this->events->emit( $this->emitServiceSpecializedEvents('dispatcher.route.'.$this->router->getService()) );
+        $this->events->emit($this->emitServiceSpecializedEvents('dispatcher.route.'.$this->router->getService()));
 
-        $this->events->emit( $this->emitServiceSpecializedEvents('dispatcher.route.#') );
+        $this->events->emit($this->emitServiceSpecializedEvents('dispatcher.route.#'));
 
         // translate route to service
 
@@ -189,9 +189,9 @@ 
 
         } catch (DispatcherException $de) {
 
-            $this->response()->status()->set( $de->getStatus() );
+            $this->response()->status()->set($de->getStatus());
 
-            $this->response()->content()->set( $de->getMessage() );
+            $this->response()->content()->set($de->getMessage());
 
         }
 
@@ -214,11 +214,11 @@ 
 
     private function shutdown() {
 
-        $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.#'));
 
         $return = Processor::parse($this->configuration, $this->logger, $this->response);
 

src/Comodojo/Dispatcher/Router/Collector.php

Doc Comments +3 added lines

@@ -209,6 +209,9 @@
 
     }
 
+    /**
+     * @param string[] $bits
+     */
     private function evalUri($parameters, $bits) {
 
         $count  = 0;

Braces +5 added lines, -2 removed lines

@@ -96,8 +96,9 @@ 
                 $this->response
             );
             
+        } else {
+            return null;
         }
-        else return null;
         
     }
 
@@ -183,7 +184,9 @@ 
                 
                 if (preg_match('/' . $value['regex'] . '/', $bits[$key], $matches)) {
                     
-                    if (count($matches) == 1) $matches = $matches[0];
+                    if (count($matches) == 1) {
+                        $matches = $matches[0];
+                    }
                     
                     $this->request->query()->set($key, $matches);
                     

Spacing +6 added lines, -6 removed lines

@@ -218,9 +218,9 @@ 
 
         $routes = Yaml::parse($yaml);
 
-        if ( !empty($routes) ) {
+        if (!empty($routes)) {
 
-            foreach( $routes as $name => $route ) {
+            foreach ($routes as $name => $route) {
 
                 $this->add($route['route'], $route['type'], $route['class'], $route['parameters']);
 
@@ -238,7 +238,7 @@ 
 
         foreach ($this->table->routes() as $regex => $value) {
 
-            if (preg_match("/" . $regex . "/", $path, $matches)) {
+            if (preg_match("/".$regex."/", $path, $matches)) {
 
                 $this->evalUri($value['query'], $matches);
 
@@ -251,7 +251,7 @@ 
                 $this->classname  = $value['class'];
                 $this->type       = $value['type'];
                 $this->service    = implode('.', $value['service']);
-                $this->service    = empty($this->service)?"default":$this->service;
+                $this->service    = empty($this->service) ? "default" : $this->service;
 
                 return true;
 
@@ -265,13 +265,13 @@ 
 
     private function evalUri($parameters, $bits) {
 
-        $count  = 0;
+        $count = 0;
 
         foreach ($parameters as $key => $value) {
 
             if (isset($bits[$key])) {
 
-                if (preg_match('/^' . $value['regex'] . '$/', $bits[$key], $matches)) {
+                if (preg_match('/^'.$value['regex'].'$/', $bits[$key], $matches)) {
 
                     if (count($matches) == 1) $matches = $matches[0];
 

src/Comodojo/Dispatcher/Components/Parameters.php

Spacing +5 added lines, -5 removed lines

@@ -26,11 +26,11 @@ 
 
     protected $parameters = array();
 
-    final public function get($parameter=null) {
+    final public function get($parameter = 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)) {
 
             return $this->parameters[$parameter];
 
@@ -50,13 +50,13 @@ 
 
     final public function unset($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]);
 

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) {

src/Comodojo/Dispatcher/Output/Processor.php

Indentation +4 added lines, -4 removed lines

@@ -176,8 +176,8 @@ 
                 break;
 
             /**
-            * @todo: how to get reverse allowed methods reference?
-            */
+             * @todo: how to get reverse allowed methods reference?
+             */
             // case 405: //Not allowed
             //
             // header('Allow: ' . $value, true, 405);
@@ -192,8 +192,8 @@ 
                 break;
 
             /**
-            * @todo: how to get reverse allowed methods reference?
-            */
+             * @todo: how to get reverse allowed methods reference?
+             */
             // case 501: //Not implemented
             //
             // header('Allow: ' . $value, true, 501);

Spacing +4 added lines, -4 removed lines

@@ -115,7 +115,7 @@ 
 
                 header($_SERVER["SERVER_PROTOCOL"].' 204 No Content');
                 header('Status: 204 No Content');
-                header('Content-Length: 0',true);
+                header('Content-Length: 0', true);
 
                 $return = null;
 
@@ -127,7 +127,7 @@ 
             case 303: //See Other
             case 307: //Temporary Redirect
 
-                header("Location: ".$location->get(),true,$status);
+                header("Location: ".$location->get(), true, $status);
 
                 break;
 
@@ -135,11 +135,11 @@ 
 
                 $last_modified = $headers->get('Last-Modified');
 
-                if ( is_null($last_modified) ) {
+                if (is_null($last_modified)) {
 
                     header($_SERVER["SERVER_PROTOCOL"].' 304 Not Modified');
 
-                } else if ( is_int($last_modified) ) {
+                } else if (is_int($last_modified)) {
 
                     header('Last-Modified: '.gmdate('D, d M Y H:i:s', $last_modified).' GMT', true, 304);
 

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/Response/Content.php

Spacing +3 added lines, -3 removed lines

@@ -40,7 +40,7 @@ 
 
     public function set($content) {
 
-        if ( !is_scalar($content) ) {
+        if (!is_scalar($content)) {
 
             throw new Exception("Invalid HTTP content");
 
@@ -54,7 +54,7 @@ 
 
     public function type($type = null) {
 
-        if ( is_null($type) ) {
+        if (is_null($type)) {
 
             return $this->type;
 
@@ -68,7 +68,7 @@ 
 
     public function charset($charset = null) {
 
-        if ( is_null($charset) ) {
+        if (is_null($charset)) {
 
             return $this->charset;
 

src/Comodojo/Dispatcher/Response/Status.php

Spacing +3 added lines, -3 removed lines

@@ -85,7 +85,7 @@ 
 
     public function set($code) {
 
-        if ( !array_key_exists($code, $this->http_status_codes) ) {
+        if (!array_key_exists($code, $this->http_status_codes)) {
 
             throw new Exception("Invalid HTTP Status Code");
 
@@ -97,9 +97,9 @@ 
 
     }
 
-    public function description($code=null) {
+    public function description($code = null) {
 
-        if ( is_null($code) || !array_key_exists($code, $this->http_status_codes) ) {
+        if (is_null($code) || !array_key_exists($code, $this->http_status_codes)) {
 
             $message = $this->http_status_codes[$this->status_code];