drmvc / framework

src/Core/Route.php

Spacing +14 added lines, -14 removed lines

@@ -33,7 +33,7 @@ 
     {
         // The URI should be considered literal except for keys and optional parts
         // Escape everything preg_quote would escape except for : ( ) < >
-        $expression = preg_replace('#'.Route::REGEX_ESCAPE.'#', '\\\\$0', $uri);
+        $expression = preg_replace('#' . Route::REGEX_ESCAPE . '#', '\\\\$0', $uri);
 
         if (strpos($expression, '(') !== FALSE)
         {
@@ -42,14 +42,14 @@ 
         }
 
         // Insert default regex for keys
-        $expression = str_replace(array('<', '>'), array('(?P<', '>'.Route::REGEX_SEGMENT.')'), $expression);
+        $expression = str_replace(array('<', '>'), array('(?P<', '>' . Route::REGEX_SEGMENT . ')'), $expression);
 
         if ($regex)
         {
             $search = $replace = array();
             foreach ($regex as $key => $value)
             {
-                $search[]  = "<$key>".Route::REGEX_SEGMENT;
+                $search[]  = "<$key>" . Route::REGEX_SEGMENT;
                 $replace[] = "<$key>$value";
             }
 
@@ -57,7 +57,7 @@ 
             $expression = str_replace($search, $replace, $expression);
         }
 
-        return '#^'.$expression.'$#uD';
+        return '#^' . $expression . '$#uD';
     }
 
     /**
@@ -104,12 +104,12 @@ 
             return;
         }
 
-        if ( ! empty($uri))
+        if (!empty($uri))
         {
             $this->_uri = $uri;
         }
 
-        if ( ! empty($regex))
+        if (!empty($regex))
         {
             $this->_regex = $regex;
         }
@@ -147,7 +147,7 @@ 
         $uri = trim($request->uri(), '/');
 // 		$uri = $request->uri();
 
-        if ( ! preg_match($this->_route_regex, $uri, $matches))
+        if (!preg_match($this->_route_regex, $uri, $matches))
             return FALSE;
 
         $params = array();
@@ -166,20 +166,20 @@ 
 
         foreach ($this->_defaults as $key => $value)
         {
-            if ( ! isset($params[$key]) OR $params[$key] === '')
+            if (!isset($params[$key]) OR $params[$key] === '')
             {
                 // Set default values for any key that was not matched
                 $params[$key] = $value;
             }
         }
 
-        if ( ! empty($params['controller']))
+        if (!empty($params['controller']))
         {
             // PSR-0: Replace underscores with spaces, run ucwords, then replace underscore
             $params['controller'] = str_replace(' ', '_', ucwords(str_replace('_', ' ', $params['controller'])));
         }
 
-        if ( ! empty($params['directory']))
+        if (!empty($params['directory']))
         {
             // PSR-0: Replace underscores with spaces, run ucwords, then replace underscore
             $params['directory'] = str_replace(' ', '_', ucwords(str_replace('_', ' ', $params['directory'])));
@@ -210,12 +210,12 @@ 
          * @param   boolean $required   Whether or not parameters are required (initially)
          * @return  array   Tuple of the compiled portion and whether or not it contained specified parameters
          */
-        $compile = function ($portion, $required) use (&$compile, $defaults, $params)
+        $compile = function($portion, $required) use (&$compile, $defaults, $params)
         {
             $missing = array();
 
-            $pattern = '#(?:'.Route::REGEX_KEY.'|'.Route::REGEX_GROUP.')#';
-            $result = preg_replace_callback($pattern, function ($matches) use (&$compile, $defaults, &$missing, $params, &$required)
+            $pattern = '#(?:' . Route::REGEX_KEY . '|' . Route::REGEX_GROUP . ')#';
+            $result = preg_replace_callback($pattern, function($matches) use (&$compile, $defaults, &$missing, $params, &$required)
             {
                 if ($matches[0][0] === '<')
                 {
@@ -226,7 +226,7 @@ 
                     {
                         // This portion is required when a specified
                         // parameter does not match the default
-                        $required = ($required OR ! isset($defaults[$param]) OR $params[$param] !== $defaults[$param]);
+                        $required = ($required OR !isset($defaults[$param]) OR $params[$param] !== $defaults[$param]);
 
                         // Add specified parameter to this result
                         return $params[$param];