改进Route类group方法用法

Author: liu21st

src/think/Route.php

@@ -459,20 +459,6 @@ public function setCrossDomainRule(Rule $rule)
         return $this;
     }
 
-    /**
-     * 注册子目录路由分组
-     * @access public
-     * @param string $name  分组名称或者参数
-     * @param string $subdir 分组子目录名（默认和分组名同名）
-     * @return RuleGroup
-     */
-    public function sub(string $group, string $subdir = ''): RuleGroup
-    {
-        return (new RuleGroup($this, $this->group, $group, null, $this->lazy, $subdir ?: $group))
-            ->removeSlash($this->removeSlash)
-            ->mergeRuleRegex($this->mergeRuleRegex);
-    }
-
     /**
      * 注册路由分组
      * @access public

src/think/route/RuleGroup.php

@@ -77,15 +77,22 @@ class RuleGroup extends Rule
      * @param  string    $name   分组名称
      * @param  mixed     $rule   分组路由
      * @param  bool      $lazy   延迟解析
-     * @param  string    $sub    分组子目录
      */
-    public function __construct(Route $router, ?RuleGroup $parent = null, string $name = '', $rule = null, bool $lazy = false, string $sub = '')
+    public function __construct(Route $router, ?RuleGroup $parent = null, string $name = '', $rule = null, bool $lazy = false)
     {
         $this->router = $router;
         $this->parent = $parent;
         $this->rule   = $rule;
         $this->name   = trim($name, '/');
-        $this->sub    = $sub;
+
+        if ($name && is_string($rule) || is_null($rule)) {
+            if (is_subclass_of($rule, Dispatch::class, false)) {
+                $this->dispatcher($rule);
+                $this->rule = '';
+            } else {
+                $this->sub  =  $rule ?: $this->name;
+            }
+        }
 
         $this->setFullName();
 
@@ -95,7 +102,7 @@ public function __construct(Route $router, ?RuleGroup $parent = null, string $na
         }
 
         if (!$lazy) {
-            $this->parseGroupRule($rule);
+            $this->parseGroupRule();
         }
     }
 
@@ -113,7 +120,7 @@ protected function setFullName(): void
         if ($this->parent && $this->parent->getFullName()) {
             $this->fullName = $this->parent->getFullName() . ($this->name ? '/' . $this->name : '');
             if ($this->sub) {
-                $this->sub  = $this->parent->getFullName() . '/' . $this->sub ;                
+                $this->sub  = $this->parent->getFullName() . '/' . $this->sub;
             }
         } else {
             $this->fullName = $this->name;
@@ -178,7 +185,7 @@ public function check(Request $request, string $url, bool $completeMatch = false
 
         // 解析分组路由
         if (!$this->hasParsed) {
-            $this->parseGroupRule($this->rule);
+            $this->parseGroupRule();
         }
 
         // 获取当前路由规则
@@ -270,23 +277,15 @@ public function alias(string $alias)
     /**
      * 解析分组和域名的路由规则及绑定
      * @access public
-     * @param  mixed $rule 路由规则
      * @return void
      */
-    public function parseGroupRule($rule): void
+    public function parseGroupRule(): void
     {
-        if (is_string($rule) && is_subclass_of($rule, Dispatch::class)) {
-            $this->dispatcher($rule);
-            return;
-        }
-
         $origin = $this->router->getGroup();
         $this->router->setGroup($this);
 
-        if ($rule instanceof Closure) {
-            Container::getInstance()->invokeFunction($rule);
-        } elseif (is_string($rule) && $rule) {
-            $this->bind($rule);
+        if ($this->rule instanceof Closure) {
+            Container::getInstance()->invokeFunction($this->rule);
         } elseif ($this->sub) {
             $this->loadRoutes($this->sub);
         }