update: router config modify

Author: inhere

examples/cached/index.php

@@ -34,11 +34,9 @@
 
     // enable autoRoute
     // you can access '/demo' '/admin/user/info', Don't need to configure any route
-    'autoRoute' => [
-        'enable' => 1,
-        'controllerNamespace' => 'inhere\sroute\examples\controllers',
-        'controllerSuffix' => 'Controller',
-    ],
+    'autoRoute' =>  1,
+    'controllerNamespace' => 'inhere\sroute\examples\controllers',
+    'controllerSuffix' => 'Controller',
 ]);
 
 require __DIR__ . '/routes.php';

examples/cached/routes-cache.php

@@ -1,7 +1,7 @@
 <?php
 /*
  * This inhere/sroute routes cache file. is auto generate by inhere\sroute\ORouter.
- * @date 2017-08-08 14:03:49
+ * @date 2017-08-08 15:07:34
  */
 return [
     'staticRoutes' => array (

examples/object/index.php

@@ -33,11 +33,9 @@
 
     // enable autoRoute
     // you can access '/demo' '/admin/user/info', Don't need to configure any route
-    'autoRoute' => [
-        'enable' => 1,
-        'controllerNamespace' => 'inhere\sroute\examples\controllers',
-        'controllerSuffix' => 'Controller',
-    ],
+    'autoRoute' => 1,
+    'controllerNamespace' => 'inhere\sroute\examples\controllers',
+    'controllerSuffix' => 'Controller',
 ]);
 
 require __DIR__ . '/routes.php';

examples/static/index.php

@@ -30,11 +30,9 @@
 
     // enable autoRoute
     // you can access '/demo' '/admin/user/info', Don't need to configure any route
-    'autoRoute' => [
-        'enable' => 1,
-        'controllerNamespace' => 'inhere\sroute\examples\controllers',
-        'controllerSuffix' => 'Controller',
-    ],
+    'autoRoute' =>  1,
+    'controllerNamespace' => 'inhere\sroute\examples\controllers',
+    'controllerSuffix' => 'Controller',
 ]);
 
 require __DIR__ . '/routes.php';

src/ORouter.php

@@ -170,14 +170,12 @@ class ORouter implements RouterInterface
         'matchAll' => '',
 
         // auto route match @like yii framework
-        'autoRoute' => [
-            // If is True, will auto find the handler controller file.
-            'enable' => false,
-            // The default controllers namespace, is valid when `'enable' = true`
-            'controllerNamespace' => '', // eg: 'app\\controllers'
-            // controller suffix, is valid when `'enable' = true`
-            'controllerSuffix' => '',    // eg: 'Controller'
-        ],
+        // If is True, will auto find the handler controller file.
+        'autoRoute' => false,
+        // The default controllers namespace, is valid when `'enable' = true`
+        'controllerNamespace' => '', // eg: 'app\\controllers'
+        // controller suffix, is valid when `'enable' = true`
+        'controllerSuffix' => '',    // eg: 'Controller'
     ];
 
     /** @var DispatcherInterface */
@@ -218,11 +216,7 @@ public function setConfig(array $config)
         }
 
         foreach ($config as $name => $value) {
-            if ($name === 'autoRoute') {
-                $this->config['autoRoute'] = array_merge($this->config['autoRoute'], (array)$value);
-            } else {
-                $this->config[$name] = $value;
-            }
+            $this->config[$name] = $value;
         }
     }
 
@@ -494,7 +488,7 @@ public function match($path, $method)
         // clear '//', '///' => '/'
         $path = rawurldecode(preg_replace('#\/\/+#', '/', $path));
         $method = strtoupper($method);
-        $number = $this->config['tmpCacheNumber'];
+        $number = (int)$this->config['tmpCacheNumber'];
 
         // setting 'ignoreLastSep'
         if ($path !== '/' && $this->config['ignoreLastSep']) {
@@ -582,7 +576,10 @@ public function match($path, $method)
         }
 
         // handle Auto Route
-        if ($handler = self::matchAutoRoute($path, $this->config['autoRoute'])) {
+        if (
+            $this->config['autoRoute'] &&
+            ($handler = self::matchAutoRoute($path, $this->config['controllerNamespace'], $this->config['controllerSuffix']))
+        ) {
             return [$path, [
                 'path' => $path,
                 'handler' => $handler,
@@ -594,25 +591,16 @@ public function match($path, $method)
     }
 
     /**
-     * handle auto route match
-     *  when config `'autoRoute' => true`
+     * handle auto route match, when config `'autoRoute' => true`
      * @param string $path The route path
-     * @param array $opts  The some options
-     * contains: [
-     *  'controllerNamespace' => '', // controller namespace. eg: 'app\\controllers'
-     *  'controllerSuffix' => '',    // controller suffix. eg: 'Controller'
-     * ]
+     * @param string $controllerNamespace controller namespace. eg: 'app\\controllers'
+     * @param string $controllerSuffix controller suffix. eg: 'Controller'
      * @return bool|callable
      */
-    public static function matchAutoRoute($path, array $opts)
+    public static function matchAutoRoute($path, $controllerNamespace, $controllerSuffix = '')
     {
-        // not enabled
-        if (!$opts || !isset($opts['enable']) || !$opts['enable']) {
-            return false;
-        }
-
-        $cnp = $opts['controllerNamespace'];
-        $sfx = $opts['controllerSuffix'];
+        $cnp = $controllerNamespace;
+        $sfx = $controllerSuffix;
         $tmp = trim($path, '/- ');
 
         // one node. eg: 'home'

src/SRouter.php

@@ -110,14 +110,12 @@ class SRouter implements RouterInterface
         'matchAll' => '',
 
         // auto route match @like yii framework
-        'autoRoute' => [
-            // If is True, will auto find the handler controller file.
-            'enable' => false,
-            // The default controllers namespace, is valid when `'enable' = true`
-            'controllerNamespace' => '', // eg: 'app\\controllers'
-            // controller suffix, is valid when `'enable' = true`
-            'controllerSuffix' => '',    // eg: 'Controller'
-        ],
+        // If is True, will auto find the handler controller file.
+        'autoRoute' => false,
+        // The default controllers namespace, is valid when `'enable' = true`
+        'controllerNamespace' => '', // eg: 'app\\controllers'
+        // controller suffix, is valid when `'enable' = true`
+        'controllerSuffix' => '',    // eg: 'Controller'
     ];
 
     /** @var DispatcherInterface */
@@ -134,11 +132,7 @@ public static function setConfig(array $config)
         }
 
         foreach ($config as $name => $value) {
-            if ($name === 'autoRoute') {
-                static::$config['autoRoute'] = array_merge(static::$config['autoRoute'], (array)$value);
-            } elseif (isset(static::$config[$name])) {
-                static::$config[$name] = $value;
-            }
+            static::$config[$name] = $value;
         }
     }
 
@@ -387,7 +381,10 @@ public static function match($path, $method)
         }
 
         // handle Auto Route
-        if ($handler = ORouter::matchAutoRoute($path, static::$config['autoRoute'])) {
+        if (
+            self::$config['autoRoute'] &&
+            ($handler = ORouter::matchAutoRoute($path, self::$config['controllerNamespace'], self::$config['controllerSuffix']))
+        ) {
             return [$path, [
                 'handler' => $handler
             ]];