comodojo / dispatcher.framework

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;

Spacing +9 added lines, -9 removed lines

@@ -160,10 +160,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)
             ));
 
         }
@@ -192,7 +192,7 @@ 
 
             $methods = $service->getImplementedMethods();
 
-            if ( in_array($method, $methods) ) {
+            if (in_array($method, $methods)) {
 
                 $callable = $service->getMethod($method);
 
@@ -232,9 +232,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']);
 
@@ -253,7 +253,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
@@ -270,7 +270,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;
 
@@ -284,7 +284,7 @@ 
 
     private function evalUri($parameters, $bits) {
 
-        $count  = 0;
+        $count = 0;
 
         // Because of the nature of the global regular expression, all the bits of the matched route are associated with a parameter key
         foreach ($parameters as $key => $value) {
@@ -293,7 +293,7 @@ 
                 /* 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'] . '$/', $bits[$key], $matches)) {
+                if (preg_match('/^'.$value['regex'].'$/', $bits[$key], $matches)) {
                     
                     if (count($matches) == 1) $matches = $matches[0]; // This is the case where no backreferences are present or available.
                     

Braces +9 added lines, -3 removed lines

@@ -113,8 +113,9 @@ 
                 $this->extra
             );
 
+        } else {
+            return null;
         }
-        else return null;
 
     }
 
@@ -250,7 +251,9 @@ 
         
         $routes = $this->cache->get("dispatcher_routes");
         
-        if (is_null($routes)) return null;
+        if (is_null($routes)) {
+            return null;
+        }
         
         $this->table->routes($routes);
         
@@ -317,7 +320,10 @@ 
                  */
                 if (preg_match('/^' . $value['regex'] . '$/', $bits[$key], $matches)) {
                     
-                    if (count($matches) == 1) $matches = $matches[0]; // This is the case where no backreferences are present or available.
+                    if (count($matches) == 1) {
+                        $matches = $matches[0];
+                    }
+                    // This is the case where no backreferences are present or available.
                     
                     // The extracted value (with any backreference available) is added to the query parameters.
                     $this->request->query()->set($key, $matches);

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

src/Comodojo/Dispatcher/Service/AbstractService.php

Spacing +5 added lines, -5 removed lines

@@ -94,7 +94,7 @@ 
 
         $supported_methods = $this->configuration()->get('dispatcher-supported-methods');
 
-        if ( method_exists($this, 'any') ) {
+        if (method_exists($this, 'any')) {
 
             return $supported_methods;
 
@@ -102,9 +102,9 @@ 
 
         $implemented_methods = array();
 
-        foreach ( $supported_methods as $method ) {
+        foreach ($supported_methods as $method) {
 
-            if ( method_exists($this, strtolower($method)) ) array_push($implemented_methods,$method);
+            if (method_exists($this, strtolower($method))) array_push($implemented_methods, $method);
 
         }
 
@@ -118,11 +118,11 @@ 
      */
     final public function getMethod($method) {
 
-        if ( method_exists($this, strtolower($method)) ) {
+        if (method_exists($this, strtolower($method))) {
 
             return strtolower($method);
 
-        } else if ( method_exists($this, strtolower('any')) ) {
+        } else if (method_exists($this, strtolower('any'))) {
 
             return 'any';
 

Braces +3 added lines, -1 removed lines

@@ -104,7 +104,9 @@
 
         foreach ( $supported_methods as $method ) {
 
-            if ( method_exists($this, strtolower($method)) ) array_push($implemented_methods,$method);
+            if ( method_exists($this, strtolower($method)) ) {
+                array_push($implemented_methods,$method);
+            }
 
         }
 

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