comodojo / dispatcher.framework

src/Comodojo/Dispatcher/Events/EventsManager.php

Spacing +5 added lines, -5 removed lines

@@ -29,7 +29,7 @@ 
 
     public function subscribe($event, $class, $method = null, $priority = 0) {
 
-        $callable = ( is_null($method) ) ? $class : array($class, $method);
+        $callable = (is_null($method)) ? $class : array($class, $method);
 
         return $this->addListener($event, $callable, $priority);
 
@@ -37,7 +37,7 @@ 
 
     public function subscribeOnce($event, $class, $method = null, $priority = 0) {
 
-        $callable = ( is_null($method) ) ? $class : array($class, $method);
+        $callable = (is_null($method)) ? $class : array($class, $method);
 
         return $this->addOneTimeListener($event, $callable, $priority);
 
@@ -45,11 +45,11 @@ 
 
     public function loadPlugins($plugins) {
 
-        if ( !empty($plugins) ) {
+        if (!empty($plugins)) {
 
-            foreach( $plugins as $name => $event ) {
+            foreach ($plugins as $name => $event) {
 
-                $callable = ( is_null($event['method']) ) ? $event["class"] : array($event["class"], $event["method"]);
+                $callable = (is_null($event['method'])) ? $event["class"] : array($event["class"], $event["method"]);
 
                 $this->addListener($event["event"], $callable, $event["priority"]);
 

src/Comodojo/Dispatcher/Router/Model.php

Doc Comments +3 added lines

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

Spacing +7 added lines, -7 removed lines

@@ -89,10 +89,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)
             ));
 
         }
@@ -135,7 +135,7 @@ 
 
             $methods = $service->getImplementedMethods();
 
-            if ( in_array($method, $methods) ) {
+            if (in_array($method, $methods)) {
 
                 $callable = $service->getMethod($method);
 
@@ -178,7 +178,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
@@ -198,7 +198,7 @@ 
                 
                 $this->route->setClassName($value['class']);
                 $this->route->setType($value['type']);
-                $this->route->setService(empty($service)?"default":$service);
+                $this->route->setService(empty($service) ? "default" : $service);
 
                 return true;
 
@@ -212,7 +212,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) {
@@ -221,7 +221,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 +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);

src/Comodojo/Dispatcher/Router/Route.php

Braces +2 added lines, -1 removed lines

@@ -118,8 +118,9 @@
                 $extra
             );
 
+        } else {
+            return null;
         }
-        else return null;
 
     }
 

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

@@ -95,7 +95,9 @@
 
             } else {
                 // if the element is not a json string, I assume it's the service name
-                if (!isset($value['service'])) $value['service'] = array();
+                if (!isset($value['service'])) {
+                    $value['service'] = array();
+                }
                 array_push($value['service'], $folder);
 
                 return $this->read(

src/Comodojo/Dispatcher/Router/Table.php

Spacing +8 added lines, -8 removed lines

@@ -145,9 +145,9 @@ 
 
     public function load($routes) {
 
-        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']);
 
@@ -191,22 +191,22 @@ 
     private function register($folders, $type, $class, $parameters) {
 
         // The values associated with a route are as follows:
-        $value   = array(
-            "type"       => $type,       // Type of route
-            "class"      => $class,      // Class to be invoked
-            "service"    => array(),     // Service name (it can be a list of namespaces plus a final service name)
+        $value = array(
+            "type"       => $type, // Type of route
+            "class"      => $class, // Class to be invoked
+            "service"    => array(), // Service name (it can be a list of namespaces plus a final service name)
             "parameters" => $parameters, // Parameters passed via the composer.json configuration (cache, ttl, etc...)
             "query"      => array()      // List of parameters with their regular expression that must be added among the query parameters
         );
 
-        $this->logger->debug("ROUTE: " . implode("/", $folders));
+        $this->logger->debug("ROUTE: ".implode("/", $folders));
 
         //$this->logger->debug("PARAMETERS: " . var_export($value, true));
 
         // This method generate a global regular expression which will be able to match all the URI supported by the route
         $regex = $this->parser->read($folders, $value);
 
-        $this->logger->debug("ROUTE: " . $regex);
+        $this->logger->debug("ROUTE: ".$regex);
 
         //$this->logger->debug("PARAMETERS: " . var_export($value, true));
 

Braces +11 added lines, -6 removed lines

@@ -104,10 +104,11 @@ 
 
         $regex = $this->parser->read($folders);
 
-        if (isset($this->routes[$regex]))
-            return $this->routes[$regex];
-        else
-            return null;
+        if (isset($this->routes[$regex])) {
+                    return $this->routes[$regex];
+        } else {
+                    return null;
+        }
 
     }
 
@@ -117,7 +118,9 @@ 
 
         $regex = $this->parser->read($folders);
 
-        if (isset($this->routes[$regex])) unset($this->routes[$regex]);
+        if (isset($this->routes[$regex])) {
+            unset($this->routes[$regex]);
+        }
 
     }
 
@@ -165,7 +168,9 @@ 
         
         $routes = $this->cache->get("dispatcher_routes");
         
-        if (is_null($routes)) return null;
+        if (is_null($routes)) {
+            return null;
+        }
         
         $this->routes($routes);