调整资源路由

Author: liu21st

src/think/route/Resource.php

@@ -97,11 +97,11 @@ public function extend(?Closure $extend)
     /**
      * 生成资源路由规则
      * @access public
-     * @param  mixed $rule 路由规则
      * @return void
      */
-    public function parseGroupRule($rule): void
+    public function parseGroupRule(): void
     {
+        $rule   = $this->rule;
         $option = $this->option;
         $origin = $this->router->getGroup();
         $this->router->setGroup($this);

src/think/route/RuleGroup.php

@@ -86,7 +86,7 @@ public function __construct(Route $router, ?RuleGroup $parent = null, string $na
         $this->name   = trim($name, '/');
 
         if ($name && is_string($rule) || is_null($rule)) {
-            if (is_subclass_of($rule, Dispatch::class, false)) {
+            if ($rule && is_subclass_of($rule, Dispatch::class, false)) {
                 $this->dispatcher($rule);
                 $this->rule = '';
             } else {