comodojo / dispatcher.framework

src/Comodojo/Dispatcher/Router/Route.php

Spacing +5 added lines, -5 removed lines

@@ -81,7 +81,7 @@ 
 
     public function getServiceName() {
 
-        return (empty($this->service))?"default":implode('.', $this->service);
+        return (empty($this->service)) ? "default" : implode('.', $this->service);
 
     }
 
@@ -103,7 +103,7 @@ 
 
     public function getParameter($key) {
         
-        return (isset($this->parameters[$key]))?$this->parameters[$key]:null;
+        return (isset($this->parameters[$key])) ? $this->parameters[$key] : null;
 
     }
 
@@ -142,13 +142,13 @@ 
     
     public function isQueryRequired($key) {
         
-        return isset($this->query[$key])?$this->query[$key]["required"]:false;
+        return isset($this->query[$key]) ? $this->query[$key]["required"] : false;
         
     }
     
     public function getQueryRegex($key) {
         
-        return isset($this->query[$key])?$this->query[$key]["regex"]:null;
+        return isset($this->query[$key]) ? $this->query[$key]["regex"] : null;
         
     }
     
@@ -220,7 +220,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.
                     

Braces +6 added lines, -2 removed lines

@@ -113,8 +113,9 @@ 
                 $this->extra
             );
 
+        } else {
+            return null;
         }
-        else return null;
 
     }
 
@@ -294,7 +295,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/Table.php

Spacing +5 added lines, -5 removed lines

@@ -150,9 +150,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']);
 
@@ -190,7 +190,7 @@ 
         
         $routes = array();
         
-        foreach($this->routes as $name => $route) {
+        foreach ($this->routes as $name => $route) {
             
             $routes[$name] = $route->getData();
             
@@ -213,14 +213,14 @@ 
             ->setClassName($class) // Class to be invoked
             ->setParameters($parameters); // Parameters passed via the composer.json configuration (cache, ttl, etc...)
 
-        $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, $route);
 
-        $this->logger->debug("ROUTE: " . $regex);
+        $this->logger->debug("ROUTE: ".$regex);
 
         //$this->logger->debug("PARAMETERS: " . var_export($value, true));
 

src/Comodojo/Dispatcher/Router/Parser.php

Braces +3 added lines, -1 removed lines

@@ -103,7 +103,9 @@
                      */
                     $param_regex .= $this->param($key, $string, $value);
                     
-                    if ($value->isQueryRequired($key)) $param_required = true;
+                    if ($value->isQueryRequired($key)) {
+                        $param_required = true;
+                    }
 
                     $this->logger->debug("PARAMETER REGEX: " . $param_regex);
 

src/Comodojo/Dispatcher/Router/Model.php

Spacing +4 added lines, -4 removed lines

@@ -92,10 +92,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)
             ));
 
         }
@@ -136,7 +136,7 @@ 
 
             $methods = $service->getImplementedMethods();
 
-            if ( in_array($method, $methods) ) {
+            if (in_array($method, $methods)) {
 
                 $callable = $service->getMethod($method);
 
@@ -179,7 +179,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 +3 added lines, -1 removed lines

@@ -104,7 +104,9 @@
 
         if (!$this->bypass) {
             
-            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);
+            }
 
         }