drmvc / framework

src/Framework/View.php

Braces +8 added lines, -3 removed lines

@@ -59,8 +59,11 @@ 
     public function registerEngines(array $engines = array())
     {
         foreach ($engines as $key => $value) {
-            if ($value instanceof \Closure) $this->_engines[$key] = $value();
-            else $this->_engines[$key] = $value;
+            if ($value instanceof \Closure) {
+                $this->_engines[$key] = $value();
+            } else {
+                $this->_engines[$key] = $value;
+            }
         }
     }
 
@@ -73,7 +76,9 @@ 
      */
     public function render($path, $data = false)
     {
-        if ($data === false) $data = $this->data;
+        if ($data === false) {
+            $data = $this->data;
+        }
 
         // Application view
         $appfile = APPPATH . 'Views' . DIRECTORY_SEPARATOR . THEME . DIRECTORY_SEPARATOR . $path . '.php';

src/Framework/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];

Braces +7 added lines, -6 removed lines

@@ -147,8 +147,9 @@ 
         $uri = trim($request->uri(), '/');
 // 		$uri = $request->uri();
 
-        if ( ! preg_match($this->_route_regex, $uri, $matches))
-            return FALSE;
+        if ( ! preg_match($this->_route_regex, $uri, $matches)) {
+                    return FALSE;
+        }
 
         $params = array();
         foreach ($matches as $key => $value)
@@ -233,13 +234,13 @@ 
                     }
 
                     // Add default parameter to this result
-                    if (isset($defaults[$param]))
-                        return $defaults[$param];
+                    if (isset($defaults[$param])) {
+                                            return $defaults[$param];
+                    }
 
                     // This portion is missing a parameter
                     $missing[] = $param;
-                }
-                else
+                } else
                 {
                     // Group, unwrapped
                     $result = $compile($matches[2], FALSE);

extra/configs/database.php

Spacing +5 added lines, -5 removed lines

@@ -3,13 +3,13 @@
 return [
     'default' => [
         'driver'    => 'mysql',
-        'host'      => '127.0.0.1',         // optional, default: 127.0.0.1
-        'port'      => '3306',              // optional, default: 3306
+        'host'      => '127.0.0.1', // optional, default: 127.0.0.1
+        'port'      => '3306', // optional, default: 3306
         'username'  => 'admin',
         'password'  => 'admin_pass',
         'dbname'    => 'database',
-        'prefix'    => 'prefix_',           // optional, default: is empty
-        'collation' => 'utf8_unicode_ci',   // optional, default: utf8_unicode_ci
-        'charset'   => 'utf8',              // optional, default: utf8
+        'prefix'    => 'prefix_', // optional, default: is empty
+        'collation' => 'utf8_unicode_ci', // optional, default: utf8_unicode_ci
+        'charset'   => 'utf8', // optional, default: utf8
     ],
 ];