comodojo / dispatcher.framework

src/Service/Service.php

Doc Comments +11 added lines, -11 removed lines

@@ -260,7 +260,7 @@ 
      * @param   array   $attributes array og attributes that service expects
      * @param   array   $parameters array of parameters that service expects
      *
-     * @return  Object  $this
+     * @return  Service  $this
      */
     final public function expects($method, $attributes, $parameters=array()) {
 
@@ -280,7 +280,7 @@ 
      * @param   array   $attributes array og attributes that service likes
      * @param   array   $parameters array of parameters that service likes
      *
-     * @return  Object  $this
+     * @return  Service  $this
      */
     final public function likes($method, $attributes, $parameters=array()) {
 
@@ -306,7 +306,7 @@ 
      *
      * @param   string  $methods     HTTP methods, comma separated
      *
-     * @return  Object  $this
+     * @return  Service  $this
      */
     final public function setSupportedMethods($methods) {
 
@@ -331,7 +331,7 @@ 
      * Set service content type
      *
      * @param   string  $type   Content Type
-     * @return  Object  $this
+     * @return  Service  $this
      */
     final public function setContentType($type) {
 
@@ -357,7 +357,7 @@ 
      *
      * @param   string  $charset   Charset
      *
-     * @return  Object  $this
+     * @return  Service  $this
      */
     final public function setCharset($charset) {
 
@@ -382,7 +382,7 @@ 
      * Set success status code
      *
      * @param   integer $code   HTTP status code (in case of success)
-     * @return  Object  $this
+     * @return  Service  $this
      */
     final public function setStatusCode($code) {
 
@@ -433,7 +433,7 @@ 
      * @param   string  $header     Header name
      * @param   string  $value      Header content (optional)
      *
-     * @return  Object  $this
+     * @return  Service  $this
      */
     final public function setHeader($header, $value=null) {
 
@@ -484,7 +484,7 @@ 
      *
      * @param   array   $headers    Headers array
      *
-     * @return  Object  $this
+     * @return  Service  $this
      */
     final public function setHeaders($headers) {
 
@@ -497,7 +497,7 @@ 
     /**
      * Unset headers
      *
-     * @return  Object  $this
+     * @return  Service  $this
      */
     final public function unsetHeaders() {
 
@@ -521,7 +521,7 @@ 
     /**
      * Get service-supported HTTP methods
      *
-     * @return  array   Headers array
+     * @return  string   Headers array
      */
     final public function getSupportedMethods() {
 
@@ -555,7 +555,7 @@ 
     /**
      * Return the callable class method that reflect the requested one
      *
-     * @return  array   Headers array
+     * @return  string   Headers array
      */
     final public function getCallableMethod($method) {
 

Spacing +20 added lines, -20 removed lines

@@ -153,7 +153,7 @@ 
      *
      * @var     array
      */
-    private $supported_success_codes = array(200,202,204);
+    private $supported_success_codes = array(200, 202, 204);
 
     /*************** HTTP METHODS IMPLEMENTATIONS **************/
 
@@ -248,7 +248,7 @@ 
      *
      * @return  Object  $this
      */
-    final public function expects($method, $attributes, $parameters=array()) {
+    final public function expects($method, $attributes, $parameters = array()) {
 
         $method = strtoupper($method);
 
@@ -268,7 +268,7 @@ 
      *
      * @return  Object  $this
      */
-    final public function likes($method, $attributes, $parameters=array()) {
+    final public function likes($method, $attributes, $parameters = array()) {
 
         $method = strtoupper($method);
 
@@ -421,7 +421,7 @@ 
      *
      * @return  Object  $this
      */
-    final public function setHeader($header, $value=null) {
+    final public function setHeader($header, $value = null) {
 
         $this->headers[$header] = $value;
 
@@ -438,7 +438,7 @@ 
      */
     final public function unsetHeader($header) {
 
-        if ( isset($this->headers[$header]) ) {
+        if (isset($this->headers[$header])) {
 
             unset($this->headers[$header]);
 
@@ -459,7 +459,7 @@ 
      */
     final public function getHeader($header) {
 
-        if ( isset($this->headers[$header]) ) return $this->headers[$header];
+        if (isset($this->headers[$header])) return $this->headers[$header];
 
         return null;
 
@@ -522,15 +522,15 @@ 
      */
     final public function getImplementedMethods() {
 
-        if ( method_exists($this, 'any') ) return explode(",",$this->supported_http_methods);
+        if (method_exists($this, 'any')) return explode(",", $this->supported_http_methods);
 
-        $supported_methods = explode(',',$this->supported_http_methods);
+        $supported_methods = explode(',', $this->supported_http_methods);
 
         $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);
 
         }
 
@@ -545,7 +545,7 @@ 
      */
     final public function getCallableMethod($method) {
 
-        if ( method_exists($this, strtolower($method)) ) return strtolower($method);
+        if (method_exists($this, strtolower($method))) return strtolower($method);
 
         else return "any";
 
@@ -562,9 +562,9 @@ 
 
         return array(
 
-            ( sizeof($this->expected_attributes[$method]) == 0 AND sizeof($this->expected_attributes["ANY"]) != 0 ) ? $this->expected_attributes["ANY"] : $this->expected_attributes[$method],
+            (sizeof($this->expected_attributes[$method]) == 0 AND sizeof($this->expected_attributes["ANY"]) != 0) ? $this->expected_attributes["ANY"] : $this->expected_attributes[$method],
 
-            ( sizeof($this->expected_parameters[$method]) == 0 AND sizeof($this->expected_parameters["ANY"]) != 0 ) ? $this->expected_parameters["ANY"] : $this->expected_parameters[$method]
+            (sizeof($this->expected_parameters[$method]) == 0 AND sizeof($this->expected_parameters["ANY"]) != 0) ? $this->expected_parameters["ANY"] : $this->expected_parameters[$method]
 
         );
 
@@ -581,9 +581,9 @@ 
 
         return array(
 
-            ( sizeof($this->liked_attributes[$method]) == 0 AND sizeof($this->liked_attributes["ANY"]) != 0 ) ? $this->liked_attributes["ANY"] : $this->liked_attributes[$method],
+            (sizeof($this->liked_attributes[$method]) == 0 AND sizeof($this->liked_attributes["ANY"]) != 0) ? $this->liked_attributes["ANY"] : $this->liked_attributes[$method],
 
-            ( sizeof($this->liked_parameters[$method]) == 0 AND sizeof($this->liked_parameters["ANY"]) != 0 ) ? $this->liked_parameters["ANY"] : $this->liked_parameters[$method]
+            (sizeof($this->liked_parameters[$method]) == 0 AND sizeof($this->liked_parameters["ANY"]) != 0) ? $this->liked_parameters["ANY"] : $this->liked_parameters[$method]
 
             );
 
@@ -619,7 +619,7 @@ 
      */
     final public function getAttribute($attribute) {
 
-        if ( isset($this->attributes[$attribute]) ) return $this->attributes[$attribute];
+        if (isset($this->attributes[$attribute])) return $this->attributes[$attribute];
 
         return null;
 
@@ -650,7 +650,7 @@ 
      *
      * @return  array
      */
-    final public function getParameters($raw=false) {
+    final public function getParameters($raw = false) {
 
         return $raw ? $this->raw_parameters : $this->parameters;
 
@@ -665,7 +665,7 @@ 
      */
     final public function getParameter($parameter) {
 
-        if ( isset($this->parameters[$parameter]) ) return $this->parameters[$parameter];
+        if (isset($this->parameters[$parameter])) return $this->parameters[$parameter];
 
         return null;
 
@@ -690,7 +690,7 @@ 
      */
     final public function getRequestHeader($header) {
 
-        if ( isset($this->request_headers[$header]) ) return $this->request_headers[$header];
+        if (isset($this->request_headers[$header])) return $this->request_headers[$header];
 
         return null;
 
@@ -708,7 +708,7 @@ 
 
     private function methodsToArray() {
 
-        $methods = explode(",",$this->supported_http_methods);
+        $methods = explode(",", $this->supported_http_methods);
 
         $methods_array = array();
 

Braces +26 added lines, -10 removed lines

@@ -459,7 +459,9 @@ 
      */
     final public function getHeader($header) {
 
-        if ( isset($this->headers[$header]) ) return $this->headers[$header];
+        if ( isset($this->headers[$header]) ) {
+            return $this->headers[$header];
+        }
 
         return null;
 
@@ -522,7 +524,9 @@ 
      */
     final public function getImplementedMethods() {
 
-        if ( method_exists($this, 'any') ) return explode(",",$this->supported_http_methods);
+        if ( method_exists($this, 'any') ) {
+            return explode(",",$this->supported_http_methods);
+        }
 
         $supported_methods = explode(',',$this->supported_http_methods);
 
@@ -530,7 +534,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);
+            }
 
         }
 
@@ -545,9 +551,11 @@ 
      */
     final public function getCallableMethod($method) {
 
-        if ( method_exists($this, strtolower($method)) ) return strtolower($method);
-
-        else return "any";
+        if ( method_exists($this, strtolower($method)) ) {
+            return strtolower($method);
+        } else {
+            return "any";
+        }
 
     }
 
@@ -619,7 +627,9 @@ 
      */
     final public function getAttribute($attribute) {
 
-        if ( isset($this->attributes[$attribute]) ) return $this->attributes[$attribute];
+        if ( isset($this->attributes[$attribute]) ) {
+            return $this->attributes[$attribute];
+        }
 
         return null;
 
@@ -665,7 +675,9 @@ 
      */
     final public function getParameter($parameter) {
 
-        if ( isset($this->parameters[$parameter]) ) return $this->parameters[$parameter];
+        if ( isset($this->parameters[$parameter]) ) {
+            return $this->parameters[$parameter];
+        }
 
         return null;
 
@@ -690,7 +702,9 @@ 
      */
     final public function getRequestHeader($header) {
 
-        if ( isset($this->request_headers[$header]) ) return $this->request_headers[$header];
+        if ( isset($this->request_headers[$header]) ) {
+            return $this->request_headers[$header];
+        }
 
         return null;
 
@@ -712,7 +726,9 @@ 
 
         $methods_array = array();
 
-        foreach ($methods as $method) $methods_array[$method] = array();
+        foreach ($methods as $method) {
+            $methods_array[$method] = array();
+        }
 
         $methods_array['ANY'] = array();
 

src/Components/Headers.php

Spacing +6 added lines, -6 removed lines

@@ -28,17 +28,17 @@ 
 
     final 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;
 
     }
 
-    final public function set($header, $value=null) {
+    final public function set($header, $value = null) {
 
-        if ( is_null($value) ) {
+        if (is_null($value)) {
 
             $header = explode(":", $header);
 
@@ -56,13 +56,13 @@ 
 
     final public function unset($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 +7 added lines, -5 removed lines

@@ -28,11 +28,13 @@
 
     final 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;
+        }
 
     }
 

src/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/Output/Processor.php

Spacing +6 added lines, -6 removed lines

@@ -108,7 +108,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;
 
@@ -120,7 +120,7 @@ 
             case 303: //See Other
             case 307: //Temporary Redirect
 
-                header("Location: ".$location->get(),true,$status);
+                header("Location: ".$location->get(), true, $status);
 
                 break;
 
@@ -128,11 +128,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);
 
@@ -170,7 +170,7 @@ 
 
             case 405: //Not allowed
 
-            header('Allow: ' . $value, true, 405);
+            header('Allow: '.$value, true, 405);
 
             break;
 
@@ -183,7 +183,7 @@ 
 
             case 501: //Not implemented
 
-            header('Allow: ' . $value, true, 501);
+            header('Allow: '.$value, true, 501);
 
             break;
 

src/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/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/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/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/Router/RoutingTable.php

Braces +6 added lines, -3 removed lines

@@ -46,8 +46,9 @@ 
             "query"      => array()
         );
         
-        if (count($folders) > 1 && empty($folders[0]))
-            array_shift($folders);
+        if (count($folders) > 1 && empty($folders[0])) {
+                    array_shift($folders);
+        }
         
         if (count($folders) == 1 && empty($folders[0])) {
             $this->def_route = $value;
@@ -67,7 +68,9 @@ 
         
         $regex = $this->readpath($folders);
         
-        if (isset($this->routes[$regex])) unset($this->routes[$regex]);
+        if (isset($this->routes[$regex])) {
+            unset($this->routes[$regex]);
+        }
         
     }
     

Spacing +2 added lines, -2 removed lines

@@ -124,14 +124,14 @@
                     $value = preg_replace('/(?<!\\)\((?!\?)/', '(?:', $value);
                     $value = preg_replace('/\.([\*\+])(?!\?)/', '.\${1}?', $value);
                     
-                    $param_regex .= '(?P<' . $key . '>' . $value . ')' . (($field_required)?'{1}':'?');
+                    $param_regex .= '(?P<'.$key.'>'.$value.')'.(($field_required) ? '{1}' : '?');
                     
                 }
                 
                 $this->readpath( 
                     $folders,
                     $value,
-                    $regex.'(?:\/'.$param_regex.')'. (($param_required)?'{1}':'?')
+                    $regex.'(?:\/'.$param_regex.')'.(($param_required) ? '{1}' : '?')
                 );
                 
             } else {