top-think / framework

src/think/contract/TemplateHandlerInterface.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\contract;
 

src/think/filesystem/driver/Local.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\filesystem\driver;
 

src/think/Service.php

Spacing +3 added lines, -3 removed lines

@@ -8,7 +8,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: yunwuxin <448901948@qq.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think;
 
@@ -36,7 +36,7 @@ 
      */
     protected function loadRoutesFrom($path)
     {
-        $this->registerRoutes(function () use ($path) {
+        $this->registerRoutes(function() use ($path) {
             include $path;
         });
     }
@@ -59,7 +59,7 @@ 
     {
         $commands = is_array($commands) ? $commands : func_get_args();
 
-        Console::starting(function (Console $console) use ($commands) {
+        Console::starting(function(Console $console) use ($commands) {
             $console->addCommands($commands);
         });
     }

src/think/route/RuleGroup.php

Spacing +12 added lines, -12 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;
     }
@@ -484,7 +484,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);

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;
 
@@ -109,10 +109,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);
@@ -125,12 +125,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]);
             }
 
-            $ruleItem = $this->addRule(trim($prefix . $val[1], '/'), $this->route . '/' . $val[2], $val[0]);
+            $ruleItem = $this->addRule(trim($prefix.$val[1], '/'), $this->route.'/'.$val[2], $val[0]);
 
             foreach (['model', 'validate', 'middleware'] as $name) {
                 if (isset($this->$name[$key])) {

src/think/exception/InvalidArgumentException.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\exception;
 
 use Psr\Cache\InvalidArgumentException as Psr6CacheInvalidArgumentInterface;

src/think/Log.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;
 
@@ -56,7 +56,7 @@ 
     public function getConfig(string $name = null, $default = null)
     {
         if (!is_null($name)) {
-            return $this->app->config->get('log.' . $name, $default);
+            return $this->app->config->get('log.'.$name, $default);
         }
 
         return $this->app->config->get('log');
@@ -180,7 +180,7 @@ 
      */
     public function record($msg, string $type = 'info', array $context = [], bool $lazy = true)
     {
-        $channel = $this->getConfig('type_channel.' . $type);
+        $channel = $this->getConfig('type_channel.'.$type);
 
         $this->channel($channel)->record($msg, $type, $context, $lazy);
 

src/think/log/driver/File.php

Spacing +14 added lines, -15 removed lines

@@ -8,7 +8,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think\log\driver;
 
@@ -48,7 +48,7 @@ 
         }
 
         if (empty($this->config['path'])) {
-            $this->config['path'] = $app->getRuntimePath() . 'log';
+            $this->config['path'] = $app->getRuntimePath().'log';
         }
 
         if (substr($this->config['path'], -1) != DIRECTORY_SEPARATOR) {
@@ -82,8 +82,7 @@ 
                 }
 
                 $message[] = $this->config['json'] ?
-                    json_encode(['time' => $time, 'type' => $type, 'msg' => $msg], $this->config['json_options']) :
-                    sprintf($this->config['format'], $time, $type, $msg);
+                    json_encode(['time' => $time, 'type' => $type, 'msg' => $msg], $this->config['json_options']) : sprintf($this->config['format'], $time, $type, $msg);
             }
 
             if (true === $this->config['apart_level'] || in_array($type, $this->config['apart_level'])) {
@@ -121,7 +120,7 @@ 
             $info[$type] = is_array($msg) ? implode(PHP_EOL, $msg) : $msg;
         }
 
-        $message = implode(PHP_EOL, $info) . PHP_EOL;
+        $message = implode(PHP_EOL, $info).PHP_EOL;
 
         return error_log($message, 3, $destination);
     }
@@ -135,7 +134,7 @@ 
     {
 
         if ($this->config['max_files']) {
-            $files = glob($this->config['path'] . '*.log');
+            $files = glob($this->config['path'].'*.log');
 
             try {
                 if (count($files) > $this->config['max_files']) {
@@ -148,16 +147,16 @@ 
 
         if ($this->config['single']) {
             $name        = is_string($this->config['single']) ? $this->config['single'] : 'single';
-            $destination = $this->config['path'] . $name . '.log';
+            $destination = $this->config['path'].$name.'.log';
         } else {
 
             if ($this->config['max_files']) {
-                $filename = date('Ymd') . '.log';
+                $filename = date('Ymd').'.log';
             } else {
-                $filename = date('Ym') . DIRECTORY_SEPARATOR . date('d') . '.log';
+                $filename = date('Ym').DIRECTORY_SEPARATOR.date('d').'.log';
             }
 
-            $destination = $this->config['path'] . $filename;
+            $destination = $this->config['path'].$filename;
         }
 
         return $destination;
@@ -176,14 +175,14 @@ 
         if ($this->config['single']) {
             $name = is_string($this->config['single']) ? $this->config['single'] : 'single';
 
-            $name .= '_' . $type;
+            $name .= '_'.$type;
         } elseif ($this->config['max_files']) {
-            $name = date('Ymd') . '_' . $type;
+            $name = date('Ymd').'_'.$type;
         } else {
-            $name = date('d') . '_' . $type;
+            $name = date('d').'_'.$type;
         }
 
-        return $path . DIRECTORY_SEPARATOR . $name . '.log';
+        return $path.DIRECTORY_SEPARATOR.$name.'.log';
     }
 
     /**
@@ -196,7 +195,7 @@ 
     {
         if (is_file($destination) && floor($this->config['file_size']) <= filesize($destination)) {
             try {
-                rename($destination, dirname($destination) . DIRECTORY_SEPARATOR . time() . '-' . basename($destination));
+                rename($destination, dirname($destination).DIRECTORY_SEPARATOR.time().'-'.basename($destination));
             } catch (\Exception $e) {
                 //
             }

src/think/Cache.php

Spacing +2 added lines, -2 removed lines

@@ -8,7 +8,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think;
 
@@ -46,7 +46,7 @@ 
     public function getConfig(string $name = null, $default = null)
     {
         if (!is_null($name)) {
-            return $this->app->config->get('cache.' . $name, $default);
+            return $this->app->config->get('cache.'.$name, $default);
         }
 
         return $this->app->config->get('cache');