comodojo / dispatcher.framework

src/Comodojo/Dispatcher/Router/Collector.php

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.
                     

src/Comodojo/Dispatcher/Router/RoutingTable.php

Spacing +13 added lines, -13 removed lines

@@ -142,9 +142,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 'readparam'
                      * method which will build an appropriate regular expression and will understand 
@@ -152,14 +152,14 @@ 
                      */
                     $param_regex .= $this->readparam($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->readpath(
                     $folders,
                     $value,
-                    $regex.'(?:\/'.$param_regex.')'. (($param_required)?'{1}':'?')
+                    $regex.'(?:\/'.$param_regex.')'.(($param_required) ? '{1}' : '?')
                 );
 
             } else {
@@ -224,7 +224,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}' : '?');
 
     }
 
@@ -232,24 +232,24 @@ 
     private function add($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->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->readpath($folders, $value);
 
-        $this->logger->debug("ROUTE: " . $regex);
+        $this->logger->debug("ROUTE: ".$regex);
 
-        $this->logger->debug("PARAMETERS: " . var_export($value, true));
+        $this->logger->debug("PARAMETERS: ".var_export($value, true));
 
         $this->routes[$regex] = $value;