top-think / framework

src/think/route/RuleGroup.php

Spacing +13 added lines, -13 removed lines

@@ -8,7 +8,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think\route;
 
@@ -94,7 +94,7 @@ 
         }
 
         if ($this->parent && $this->parent->getFullName()) {
-            $this->fullName = $this->parent->getFullName() . ($this->name ? '/' . $this->name : '');
+            $this->fullName = $this->parent->getFullName().($this->name ? '/'.$this->name : '');
         } else {
             $this->fullName = $this->name;
         }
@@ -278,14 +278,14 @@ 
     protected function checkMergeRuleRegex(Request $request, array &$rules, string $url, bool $completeMatch)
     {
         $depr  = $this->router->config('pathinfo_depr');
-        $url   = $depr . str_replace('|', $depr, $url);
+        $url   = $depr.str_replace('|', $depr, $url);
         $regex = [];
         $items = [];
 
         foreach ($rules as $key => $val) {
             $item = $val[1];
             if ($item instanceof RuleItem) {
-                $rule = $depr . str_replace('/', $depr, $item->getRule());
+                $rule = $depr.str_replace('/', $depr, $item->getRule());
                 if ($depr == $rule && $depr != $url) {
                     unset($rules[$key]);
                     continue;
@@ -302,21 +302,21 @@ 
                     continue;
                 }
 
-                $slash = preg_quote('/-' . $depr, '/');
+                $slash = preg_quote('/-'.$depr, '/');
 
-                if ($matchRule = preg_split('/[' . $slash . ']<\w+\??>/', $rule, 2)) {
+                if ($matchRule = preg_split('/['.$slash.']<\w+\??>/', $rule, 2)) {
                     if ($matchRule[0] && 0 !== strncasecmp($rule, $url, strlen($matchRule[0]))) {
                         unset($rules[$key]);
                         continue;
                     }
                 }
 
-                if (preg_match_all('/[' . $slash . ']?<?\w+\??>?/', $rule, $matches)) {
+                if (preg_match_all('/['.$slash.']?<?\w+\??>?/', $rule, $matches)) {
                     unset($rules[$key]);
                     $pattern = array_merge($this->getPattern(), $item->getPattern());
                     $option  = array_merge($this->getOption(), $item->getOption());
 
-                    $regex[$key] = $this->buildRuleRegex($rule, $matches[0], $pattern, $option, $complete, '_THINK_' . $key);
+                    $regex[$key] = $this->buildRuleRegex($rule, $matches[0], $pattern, $option, $complete, '_THINK_'.$key);
                     $items[$key] = $item;
                 }
             }
@@ -327,7 +327,7 @@ 
         }
 
         try {
-            $result = preg_match('/^(?:' . implode('|', $regex) . ')/u', $url, $match);
+            $result = preg_match('/^(?:'.implode('|', $regex).')/u', $url, $match);
         } catch (\Exception $e) {
             throw new Exception('route pattern error');
         }
@@ -344,7 +344,7 @@ 
 
             if (!isset($pos)) {
                 foreach ($regex as $key => $item) {
-                    if (0 === strpos(str_replace(['\/', '\-', '\\' . $depr], ['/', '-', $depr], $item), $match[0])) {
+                    if (0 === strpos(str_replace(['\/', '\-', '\\'.$depr], ['/', '-', $depr], $item), $match[0])) {
                         $pos = $key;
                         break;
                     }
@@ -373,7 +373,7 @@ 
      * @access public
      * @return RuleItem|null
      */
-    public function getMissRule():  ? RuleItem
+    public function getMissRule(): ? RuleItem
     {
         return $this->miss;
     }
@@ -459,7 +459,7 @@ 
     public function prefix(string $prefix)
     {
         if ($this->parent && $this->parent->getOption('prefix')) {
-            $prefix = $this->parent->getOption('prefix') . $prefix;
+            $prefix = $this->parent->getOption('prefix').$prefix;
         }
 
         return $this->setOption('prefix', $prefix);
@@ -498,7 +498,7 @@ 
             return $this->rules;
         }
 
-        return array_filter($this->rules, function ($item) use ($method) {
+        return array_filter($this->rules, function($item) use ($method) {
             return $method == $item[0] || $item[0] == '*';
         });
     }