comodojo / dispatcher.framework

src/Comodojo/Dispatcher/Components/EventsManager.php

Spacing +7 added lines, -7 removed lines

@@ -47,7 +47,7 @@ 
 
         $callable = $this->convertToListener($class, $event);
 
-        if ( $callable === false ) return null;
+        if ($callable === false) return null;
 
         return $this->addListener($event, $callable, $priority);
 
@@ -57,7 +57,7 @@ 
 
         $callable = $this->convertToListener($class, $event);
 
-        if ( $callable === false ) return null;
+        if ($callable === false) return null;
 
         return $this->addOneTimeListener($event, $callable, $priority);
 
@@ -65,7 +65,7 @@ 
 
     protected function convertToListener($class, $event) {
 
-        if ( !class_exists($class) ) {
+        if (!class_exists($class)) {
 
             $this->logger->error("Cannot subscribe class $class to event $event: cannot find class");
 
@@ -91,11 +91,11 @@ 
 
     public function load($plugins) {
 
-        if ( !empty($plugins) ) {
+        if (!empty($plugins)) {
 
-            foreach( $plugins as $name => $plugin ) {
+            foreach ($plugins as $name => $plugin) {
 
-                if ( !isset($plugin['class']) || !isset($plugin["event"]) ) {
+                if (!isset($plugin['class']) || !isset($plugin["event"])) {
 
                     $this->logger->error("Invalid plugin definition", $plugin);
 
@@ -106,7 +106,7 @@ 
                 $priority = isset($plugin['priority']) ? $plugin['priority'] : 0;
                 $onetime = isset($plugin['onetime']) ? $plugin['onetime'] : 0;
 
-                if ( $onetime ) $this->subscribeOnce($plugin['event'], $plugin['class'], $priority);
+                if ($onetime) $this->subscribeOnce($plugin['event'], $plugin['class'], $priority);
                 else $this->subscribe($plugin['event'], $plugin['class'], $priority);
 
             }

Braces +11 added lines, -4 removed lines

@@ -47,7 +47,9 @@ 
 
         $callable = $this->convertToListener($class, $event);
 
-        if ( $callable === false ) return null;
+        if ( $callable === false ) {
+            return null;
+        }
 
         return $this->addListener($event, $callable, $priority);
 
@@ -57,7 +59,9 @@ 
 
         $callable = $this->convertToListener($class, $event);
 
-        if ( $callable === false ) return null;
+        if ( $callable === false ) {
+            return null;
+        }
 
         return $this->addOneTimeListener($event, $callable, $priority);
 
@@ -106,8 +110,11 @@ 
                 $priority = isset($plugin['priority']) ? $plugin['priority'] : 0;
                 $onetime = isset($plugin['onetime']) ? $plugin['onetime'] : 0;
 
-                if ( $onetime ) $this->subscribeOnce($plugin['event'], $plugin['class'], $priority);
-                else $this->subscribe($plugin['event'], $plugin['class'], $priority);
+                if ( $onetime ) {
+                    $this->subscribeOnce($plugin['event'], $plugin['class'], $priority);
+                } else {
+                    $this->subscribe($plugin['event'], $plugin['class'], $priority);
+                }
 
             }
 

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

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

Spacing +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
         $type = $this->response()->content()->type();
         $charset = $this->response()->content()->charset();
 
-        if ( is_null($charset) ) {
+        if (is_null($charset)) {
             $this->response()->headers()->set("Content-type", strtolower($type));
         } else {
             $this->response()->headers()->set("Content-type", strtolower($type)."; charset=".$charset);

src/Comodojo/Dispatcher/Response/Content.php

Spacing +4 added lines, -4 removed lines

@@ -38,9 +38,9 @@ 
 
     }
 
-    public function set($content=null) {
+    public function set($content = null) {
 
-        if ( !is_scalar($content) && $content != null ) {
+        if (!is_scalar($content) && $content != null) {
 
             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/Service/AbstractService.php

Spacing +6 added lines, -6 removed lines

@@ -96,9 +96,9 @@ 
 
         $supported_methods = $this->configuration()->get('supported-http-methods');
 
-        if ( is_null($supported_methods) ) $supported_methods = array('GET','PUT','POST','DELETE','OPTIONS','HEAD','TRACE','CONNECT','PURGE');
+        if (is_null($supported_methods)) $supported_methods = array('GET', 'PUT', 'POST', 'DELETE', 'OPTIONS', 'HEAD', 'TRACE', 'CONNECT', 'PURGE');
 
-        if ( method_exists($this, 'any') ) {
+        if (method_exists($this, 'any')) {
 
             return $supported_methods;
 
@@ -106,9 +106,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);
 
         }
 
@@ -122,11 +122,11 @@ 
      */
     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 +6 added lines, -2 removed lines

@@ -96,7 +96,9 @@ 
 
         $supported_methods = $this->configuration()->get('supported-http-methods');
 
-        if ( is_null($supported_methods) ) $supported_methods = array('GET','PUT','POST','DELETE','OPTIONS','HEAD','TRACE','CONNECT','PURGE');
+        if ( is_null($supported_methods) ) {
+            $supported_methods = array('GET','PUT','POST','DELETE','OPTIONS','HEAD','TRACE','CONNECT','PURGE');
+        }
 
         if ( method_exists($this, 'any') ) {
 
@@ -108,7 +110,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/Router/Route.php

Doc Comments +5 added lines

@@ -90,6 +90,11 @@
 
     }
 
+    /**
+     * @param string $key
+     *
+     * @return string
+     */
     public function getParameter($key) {
 
         return (isset($this->parameters[$key]))?$this->parameters[$key]:null;

Braces +4 added lines, -1 removed lines

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

Spacing +6 added lines, -6 removed lines

@@ -72,7 +72,7 @@ 
 
     public function getServiceName() {
 
-        return (empty($this->service))?"default":implode('.', $this->service);
+        return (empty($this->service)) ? "default" : implode('.', $this->service);
 
     }
 
@@ -96,7 +96,7 @@ 
 
         $parameters = $this->parameters;
 
-        return (isset($parameters[$key]))?$parameters[$key]:null;
+        return (isset($parameters[$key])) ? $parameters[$key] : null;
 
     }
 
@@ -126,7 +126,7 @@ 
 
         $parameters = $this->request;
 
-        return (isset($parameters[$key]))?$parameters[$key]:null;
+        return (isset($parameters[$key])) ? $parameters[$key] : null;
 
     }
 
@@ -169,7 +169,7 @@ 
 
         $query = $this->query;
 
-        return isset($query[$key])?$query[$key]["required"]:false;
+        return isset($query[$key]) ? $query[$key]["required"] : false;
 
     }
 
@@ -177,7 +177,7 @@ 
 
         $query = $this->query;
 
-        return isset($query[$key])?$query[$key]["regex"]:null;
+        return isset($query[$key]) ? $query[$key]["regex"] : null;
 
     }
 
@@ -218,7 +218,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'] . '$/', $path[$key], $matches)) {
+                if (preg_match('/^'.$value['regex'].'$/', $path[$key], $matches)) {
 
                     if (count($matches) == 1) $matches = $matches[0]; // This is the case where no backreferences are present or available.