comodojo / dispatcher.framework

src/Comodojo/Dispatcher/Router/Parser.php

Doc Comments +4 added lines

@@ -116,6 +116,10 @@
     }
 
     // This method read a single parameter and build the regular expression
+
+    /**
+     * @param Route $value
+     */
     private function param($key, $string, $value) {
 
         $field_required = false;

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

src/Comodojo/Dispatcher/Response/File.php

Spacing +8 added lines, -8 removed lines

@@ -62,7 +62,7 @@ 
     public function getLocalName() {
         
         if (!empty($this->path))
-            return $this->path . "/" . $this->slug;
+            return $this->path."/".$this->slug;
         else
             return '';
     
@@ -117,7 +117,7 @@ 
             !empty($this->path) &&
             !empty($this->slug) &&
             file_exists($this->getLocalName()) &&
-            file_exists($this->getLocalName() . ".data")
+            file_exists($this->getLocalName().".data")
         );
     
     }
@@ -202,7 +202,7 @@ 
     
     private function loadFileInfo() {
         
-        $info = $this->getLocalName() . ".data";
+        $info = $this->getLocalName().".data";
         
         if (file_exists($info)) {
             
@@ -223,7 +223,7 @@ 
     
     private function saveFileInfo() {
         
-        $info = $this->getLocalName() . ".data";
+        $info = $this->getLocalName().".data";
         
         if (!empty($this->path) && file_exists($this->path)) {
             
@@ -248,17 +248,17 @@ 
         
         preg_match_all("/[a-z0-9]+/", iconv("UTF-8", "ASCII//TRANSLIT", strtolower(preg_replace('/\..*?$/', '', $this->fname))), $matches);
         
-        $this->slug  = implode('-', $matches[0]);
+        $this->slug = implode('-', $matches[0]);
         
         if (!empty($this->path)) {
             
-            $files = glob($this->path . "/" . $slug . "*");
+            $files = glob($this->path."/".$slug."*");
             
-            $count = count ($files);
+            $count = count($files);
             
             if ($count > 0) {
                 
-                $this->slug .= "-" . $count;
+                $this->slug .= "-".$count;
                 
             }
             

Braces +11 added lines, -8 removed lines

@@ -61,10 +61,11 @@ 
     
     public function getLocalName() {
         
-        if (!empty($this->path))
-            return $this->path . "/" . $this->slug;
-        else
-            return '';
+        if (!empty($this->path)) {
+                    return $this->path . "/" . $this->slug;
+        } else {
+                    return '';
+        }
     
     }
     
@@ -101,11 +102,13 @@ 
     public function getFileData() {
    
         $file = $this->getTemporaryName();
-        if (empty($file))
-            $file = $this->getLocalName();
+        if (empty($file)) {
+                    $file = $this->getLocalName();
+        }
         
-        if (file_exists($file))
-            return file_get_contents($file);
+        if (file_exists($file)) {
+                    return file_get_contents($file);
+        }
         
         throw new DispatcherException("File does not exists");
     

src/Comodojo/Dispatcher/Router/Model.php

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

Spacing +6 added lines, -6 removed lines

@@ -117,9 +117,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']);
 
@@ -135,7 +135,7 @@ 
 
     private function readCache() {
 
-        if ( $this->configuration()->get('routing-table-cache') !== true ) return;
+        if ($this->configuration()->get('routing-table-cache') !== true) return;
 
         $this->routes = $this->cache->setNamespace('dispatcherinternals')->get("dispatcher-routes");
 
@@ -147,7 +147,7 @@ 
 
     private function dumpCache() {
 
-        if ( $this->configuration()->get('routing-table-cache') !== true ) return;
+        if ($this->configuration()->get('routing-table-cache') !== true) return;
 
         $ttl = $this->configuration()->get('routing-table-ttl');
 
@@ -166,14 +166,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));