comodojo / dispatcher.framework

src/Router/RoutingTable.php

Doc Comments +3 added lines

@@ -62,6 +62,9 @@
         
     }
     
+    /**
+     * @param string $route
+     */
     public function get($route) {
         
         $folders = explode("/", $route);

Spacing +2 added lines, -2 removed lines

@@ -128,7 +128,7 @@ 
                 $this->readpath( 
                     $folders,
                     $value,
-                    $regex.'(?:\/'.$param_regex.')'. (($param_required)?'{1}':'?')
+                    $regex.'(?:\/'.$param_regex.')'.(($param_required) ? '{1}' : '?')
                 );
                 
             } else {
@@ -171,7 +171,7 @@ 
         $string = preg_replace('/(?<!\\)\((?!\?)/', '(?:', $string);
         $string = preg_replace('/\.([\*\+])(?!\?)/', '.\${1}?', $string);
         
-        return '(?P<' . $key . '>' . $string . ')' . (($field_required)?'{1}':'?');
+        return '(?P<'.$key.'>'.$string.')'.(($field_required) ? '{1}' : '?');
         
     }
     

Braces +11 added lines, -6 removed lines

@@ -68,10 +68,11 @@ 
         
         $regex = $this->readpath($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;
+        }
         
     }
     
@@ -81,7 +82,9 @@ 
         
         $regex = $this->readpath($folders);
         
-        if (isset($this->routes[$regex])) unset($this->routes[$regex]);
+        if (isset($this->routes[$regex])) {
+            unset($this->routes[$regex]);
+        }
         
     }
     
@@ -99,7 +102,9 @@ 
     
     private function readpath($folders = array(), &$value = null, $regex = '') {
         
-        if (!empty($folders) && empty($folders[0])) array_shift($folders);
+        if (!empty($folders) && empty($folders[0])) {
+            array_shift($folders);
+        }
         
         if (empty($folders)) {
             

src/Router/Collector.php

Spacing +5 added lines, -5 removed lines

@@ -132,7 +132,7 @@ 
             
             $result = "";
 
-            switch( $_SERVER['REQUEST_METHOD'] ) {
+            switch ($_SERVER['REQUEST_METHOD']) {
     
                 case 'POST':
     
@@ -177,7 +177,7 @@ 
         
         foreach ($this->table as $regex => $value) {
             
-            if (preg_match("/" . $regex . "/", $path, $matches)) {
+            if (preg_match("/".$regex."/", $path, $matches)) {
                 
                 $this->evalUri($value['query'], $matches);
                 
@@ -190,7 +190,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;
                 
@@ -204,13 +204,13 @@ 
     
     private function evalUri($parameters, $bits) {
         
-        $count  = 0;
+        $count = 0;
         
         foreach ($parameters as $key => $value) {
             
             if (isset($bits[$key])) {
                 
-                if (preg_match('/^' . $value['regex'] . '$/', $bits[$key], $matches)) {
+                if (preg_match('/^'.$value['regex'].'$/', $bits[$key], $matches)) {
                     
                     if (count($matches) == 1) $matches = $matches[0];