top-think / framework

src/think/View.php

Spacing +1 added lines, -1 removed lines

@@ -8,7 +8,7 @@
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think;
 

src/think/paginator/driver/Bootstrap.php

Spacing +3 added lines, -3 removed lines

@@ -139,7 +139,7 @@ 
      */
     protected function getAvailablePageWrapper(string $url, string $page): string
     {
-        return '<li><a href="' . htmlentities($url) . '">' . $page . '</a></li>';
+        return '<li><a href="'.htmlentities($url).'">'.$page.'</a></li>';
     }
 
     /**
@@ -150,7 +150,7 @@ 
      */
     protected function getDisabledTextWrapper(string $text): string
     {
-        return '<li class="disabled"><span>' . $text . '</span></li>';
+        return '<li class="disabled"><span>'.$text.'</span></li>';
     }
 
     /**
@@ -161,7 +161,7 @@ 
      */
     protected function getActivePageWrapper(string $text): string
     {
-        return '<li class="active"><span>' . $text . '</span></li>';
+        return '<li class="active"><span>'.$text.'</span></li>';
     }
 
     /**

src/think/File.php

Spacing +6 added lines, -6 removed lines

@@ -8,7 +8,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think;
 
@@ -86,7 +86,7 @@ 
     {
         $target = $this->getTargetFile($directory, $name);
 
-        set_error_handler(function ($type, $msg) use (&$error) {
+        set_error_handler(function($type, $msg) use (&$error) {
             $error = $msg;
         });
         $renamed = rename($this->getPathname(), $target);
@@ -116,7 +116,7 @@ 
             throw new FileException(sprintf('Unable to write in the "%s" directory', $directory));
         }
 
-        $target = rtrim($directory, '/\\') . \DIRECTORY_SEPARATOR . (null === $name ? $this->getBasename() : $this->getName($name));
+        $target = rtrim($directory, '/\\').\DIRECTORY_SEPARATOR.(null === $name ? $this->getBasename() : $this->getName($name));
 
         return new self($target, false);
     }
@@ -159,18 +159,18 @@ 
                 switch (true) {
                     case in_array($rule, hash_algos()):
                         $hash           = $this->hash($rule);
-                        $this->hashName = substr($hash, 0, 2) . DIRECTORY_SEPARATOR . substr($hash, 2);
+                        $this->hashName = substr($hash, 0, 2).DIRECTORY_SEPARATOR.substr($hash, 2);
                         break;
                     case is_callable($rule):
                         $this->hashName = call_user_func($rule);
                         break;
                     default:
-                        $this->hashName = date('Ymd') . DIRECTORY_SEPARATOR . md5((string) microtime(true));
+                        $this->hashName = date('Ymd').DIRECTORY_SEPARATOR.md5((string) microtime(true));
                         break;
                 }
             }
         }
 
-        return $this->hashName . '.' . $this->extension();
+        return $this->hashName.'.'.$this->extension();
     }
 }

src/think/Filesystem.php

Spacing +1 added lines, -1 removed lines

@@ -8,7 +8,7 @@
 // +----------------------------------------------------------------------
 // | Author: yunwuxin <448901948@qq.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think;
 

src/think/App.php

Spacing +29 added lines, -29 removed lines

@@ -8,7 +8,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think;
 
@@ -108,13 +108,13 @@ 
      */
     public function __construct(string $rootPath = '')
     {
-        $this->thinkPath   = dirname(__DIR__) . DIRECTORY_SEPARATOR;
-        $this->rootPath    = $rootPath ? rtrim($rootPath, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR : $this->getDefaultRootPath();
-        $this->appPath     = $this->rootPath . 'app' . DIRECTORY_SEPARATOR;
-        $this->runtimePath = $this->rootPath . 'runtime' . DIRECTORY_SEPARATOR;
+        $this->thinkPath   = dirname(__DIR__).DIRECTORY_SEPARATOR;
+        $this->rootPath    = $rootPath ? rtrim($rootPath, DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR : $this->getDefaultRootPath();
+        $this->appPath     = $this->rootPath.'app'.DIRECTORY_SEPARATOR;
+        $this->runtimePath = $this->rootPath.'runtime'.DIRECTORY_SEPARATOR;
 
-        if (is_file($this->appPath . 'provider.php')) {
-            $this->bind(include $this->appPath . 'provider.php');
+        if (is_file($this->appPath.'provider.php')) {
+            $this->bind(include $this->appPath.'provider.php');
         }
 
         static::setInstance($this);
@@ -174,7 +174,7 @@ 
     public function getService($service)
     {
         $name = is_string($service) ? $service : get_class($service);
-        return array_values(array_filter($this->services, function ($value) use ($name) {
+        return array_values(array_filter($this->services, function($value) use ($name) {
             return $value instanceof $name;
         }, ARRAY_FILTER_USE_BOTH))[0] ?? null;
     }
@@ -250,7 +250,7 @@ 
      */
     public function getBasePath(): string
     {
-        return $this->rootPath . 'app' . DIRECTORY_SEPARATOR;
+        return $this->rootPath.'app'.DIRECTORY_SEPARATOR;
     }
 
     /**
@@ -308,7 +308,7 @@ 
      */
     public function getConfigPath(): string
     {
-        return $this->rootPath . 'config' . DIRECTORY_SEPARATOR;
+        return $this->rootPath.'config'.DIRECTORY_SEPARATOR;
     }
 
     /**
@@ -354,8 +354,8 @@ 
         $this->beginMem  = memory_get_usage();
 
         // 加载环境变量
-        if (is_file($this->rootPath . '.env')) {
-            $this->env->load($this->rootPath . '.env');
+        if (is_file($this->rootPath.'.env')) {
+            $this->env->load($this->rootPath.'.env');
         }
 
         $this->configExt = $this->env->get('config_ext', '.php');
@@ -368,7 +368,7 @@ 
         // 加载框架默认语言包
         $langSet = $this->lang->defaultLangSet();
 
-        $this->lang->load($this->thinkPath . 'lang' . DIRECTORY_SEPARATOR . $langSet . '.php');
+        $this->lang->load($this->thinkPath.'lang'.DIRECTORY_SEPARATOR.$langSet.'.php');
 
         // 加载应用默认语言包
         $this->loadLangPack($langSet);
@@ -407,7 +407,7 @@ 
         }
 
         // 加载系统语言包
-        $files = glob($this->appPath . 'lang' . DIRECTORY_SEPARATOR . $langset . '.*');
+        $files = glob($this->appPath.'lang'.DIRECTORY_SEPARATOR.$langset.'.*');
         $this->lang->load($files);
 
         // 加载扩展（自定义）语言包
@@ -425,7 +425,7 @@ 
      */
     public function boot(): void
     {
-        array_walk($this->services, function ($service) {
+        array_walk($this->services, function($service) {
             $this->bootService($service);
         });
     }
@@ -439,30 +439,30 @@ 
     {
         $appPath = $this->getAppPath();
 
-        if (is_file($appPath . 'common.php')) {
-            include $appPath . 'common.php';
+        if (is_file($appPath.'common.php')) {
+            include $appPath.'common.php';
         }
 
-        include $this->thinkPath . 'helper.php';
+        include $this->thinkPath.'helper.php';
 
         $configPath = $this->getConfigPath();
 
         $files = [];
 
         if (is_dir($configPath)) {
-            $files = glob($configPath . '*' . $this->configExt);
+            $files = glob($configPath.'*'.$this->configExt);
         }
 
         foreach ($files as $file) {
             $this->config->load($file, pathinfo($file, PATHINFO_FILENAME));
         }
 
-        if (is_file($appPath . 'event.php')) {
-            $this->loadEvent(include $appPath . 'event.php');
+        if (is_file($appPath.'event.php')) {
+            $this->loadEvent(include $appPath.'event.php');
         }
 
-        if (is_file($appPath . 'service.php')) {
-            $services = include $appPath . 'service.php';
+        if (is_file($appPath.'service.php')) {
+            $services = include $appPath.'service.php';
             foreach ($services as $service) {
                 $this->register($service);
             }
@@ -527,9 +527,9 @@ 
         $name  = str_replace(['/', '.'], '\\', $name);
         $array = explode('\\', $name);
         $class = self::parseName(array_pop($array), 1);
-        $path  = $array ? implode('\\', $array) . '\\' : '';
+        $path  = $array ? implode('\\', $array).'\\' : '';
 
-        return $this->namespace . '\\' . $layer . '\\' . $path . $class;
+        return $this->namespace.'\\'.$layer.'\\'.$path.$class;
     }
 
     /**
@@ -550,7 +550,7 @@ 
     {
         $path = dirname(dirname(dirname(dirname($this->thinkPath))));
 
-        return $path . DIRECTORY_SEPARATOR;
+        return $path.DIRECTORY_SEPARATOR;
     }
 
     /**
@@ -565,7 +565,7 @@ 
     public static function parseName(string $name = null, int $type = 0, bool $ucfirst = true): string
     {
         if ($type) {
-            $name = preg_replace_callback('/_([a-zA-Z])/', function ($match) {
+            $name = preg_replace_callback('/_([a-zA-Z])/', function($match) {
                 return strtoupper($match[1]);
             }, $name);
             return $ucfirst ? ucfirst($name) : lcfirst($name);
@@ -596,13 +596,13 @@ 
      */
     public static function factory(string $name, string $namespace = '', ...$args)
     {
-        $class = false !== strpos($name, '\\') ? $name : $namespace . ucwords($name);
+        $class = false !== strpos($name, '\\') ? $name : $namespace.ucwords($name);
 
         if (class_exists($class)) {
             return Container::getInstance()->invokeClass($class, $args);
         }
 
-        throw new ClassNotFoundException('class not exists:' . $class, $class);
+        throw new ClassNotFoundException('class not exists:'.$class, $class);
     }
 
     /**

src/think/route/Dispatch.php

Spacing +1 added lines, -1 removed lines

@@ -8,7 +8,7 @@
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think\route;
 

src/think/route/Domain.php

Spacing +3 added lines, -3 removed lines

@@ -8,7 +8,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think\route;
 
@@ -156,7 +156,7 @@ 
             $this->parseUrlParams($array[2], $param);
         }
 
-        return new CallbackDispatch($request, $this, [$namespace . '\\' . App::parseName($class, 1), $method], $param);
+        return new CallbackDispatch($request, $this, [$namespace.'\\'.App::parseName($class, 1), $method], $param);
     }
 
     /**
@@ -177,7 +177,7 @@ 
             $this->parseUrlParams($array[1], $param);
         }
 
-        return new ControllerDispatch($request, $this, $controller . '/' . $action, $param);
+        return new ControllerDispatch($request, $this, $controller.'/'.$action, $param);
     }
 
 }

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;
 
@@ -109,7 +109,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;
         }
@@ -304,13 +304,13 @@ 
     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 => $item) {
             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;
@@ -327,21 +327,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;
                 }
             }
@@ -352,7 +352,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');
         }
@@ -369,7 +369,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;
                     }
@@ -398,7 +398,7 @@ 
      * @access public
      * @return RuleItem|null
      */
-    public function getMissRule():  ? RuleItem
+    public function getMissRule(): ? RuleItem
     {
         return $this->miss;
     }
@@ -473,7 +473,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);
@@ -528,7 +528,7 @@ 
      * @access public
      * @return string
      */
-    public function getFullName():  ? string
+    public function getFullName(): ? string
     {
         return $this->fullName;
     }

src/think/route/Resource.php

Spacing +6 added lines, -6 removed lines

@@ -8,7 +8,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think\route;
 
@@ -90,10 +90,10 @@ 
             $item  = [];
 
             foreach ($array as $val) {
-                $item[] = $val . '/<' . ($option['var'][$val] ?? $val . '_id') . '>';
+                $item[] = $val.'/<'.($option['var'][$val] ?? $val.'_id').'>';
             }
 
-            $rule = implode('/', $item) . '/' . $last;
+            $rule = implode('/', $item).'/'.$last;
         }
 
         $prefix = substr($rule, strlen($this->name) + 1);
@@ -106,12 +106,12 @@ 
             }
 
             if (isset($last) && strpos($val[1], '<id>') && isset($option['var'][$last])) {
-                $val[1] = str_replace('<id>', '<' . $option['var'][$last] . '>', $val[1]);
+                $val[1] = str_replace('<id>', '<'.$option['var'][$last].'>', $val[1]);
             } elseif (strpos($val[1], '<id>') && isset($option['var'][$rule])) {
-                $val[1] = str_replace('<id>', '<' . $option['var'][$rule] . '>', $val[1]);
+                $val[1] = str_replace('<id>', '<'.$option['var'][$rule].'>', $val[1]);
             }
 
-            $this->addRule(trim($prefix . $val[1], '/'), $this->route . '/' . $val[2], $val[0]);
+            $this->addRule(trim($prefix.$val[1], '/'), $this->route.'/'.$val[2], $val[0]);
         }
 
         $this->router->setGroup($origin);