top-think / framework

library/think/cache/Driver.php

Spacing +8 added lines, -8 removed lines

@@ -138,7 +138,7 @@ 
      */
     protected function getCacheKey($name)
     {
-        return $this->options['prefix'] . $name;
+        return $this->options['prefix'].$name;
     }
 
     /**
@@ -171,14 +171,14 @@ 
     {
         if (!$this->has($name)) {
             $time = time();
-            while ($time + 5 > time() && $this->has($name . '_lock')) {
+            while ($time + 5 > time() && $this->has($name.'_lock')) {
                 // 存在锁定则等待
                 usleep(200000);
             }
 
             try {
                 // 锁定
-                $this->set($name . '_lock', true);
+                $this->set($name.'_lock', true);
 
                 if ($value instanceof \Closure) {
                     // 获取缓存数据
@@ -189,12 +189,12 @@ 
                 $this->set($name, $value, $expire);
 
                 // 解锁
-                $this->rm($name . '_lock');
+                $this->rm($name.'_lock');
             } catch (\Exception $e) {
-                $this->rm($name . '_lock');
+                $this->rm($name.'_lock');
                 throw $e;
             } catch (\throwable $e) {
-                $this->rm($name . '_lock');
+                $this->rm($name.'_lock');
                 throw $e;
             }
         } else {
@@ -288,7 +288,7 @@ 
 
     protected function getTagKey($tag)
     {
-        return 'tag_' . md5($tag);
+        return 'tag_'.md5($tag);
     }
 
     /**
@@ -305,7 +305,7 @@ 
 
         $serialize = self::$serialize[0];
 
-        return self::$serialize[2] . $serialize($data);
+        return self::$serialize[2].$serialize($data);
     }
 
     /**

library/think/Validate.php

Spacing +10 added lines, -10 removed lines

@@ -304,7 +304,7 @@ 
      */
     public function hasScene($name)
     {
-        return isset($this->scene[$name]) || method_exists($this, 'scene' . $name);
+        return isset($this->scene[$name]) || method_exists($this, 'scene'.$name);
     }
 
     /**
@@ -630,7 +630,7 @@ 
             if (strpos($field, '_confirm')) {
                 $rule = strstr($field, '_confirm', true);
             } else {
-                $rule = $field . '_confirm';
+                $rule = $field.'_confirm';
             }
         }
 
@@ -781,9 +781,9 @@ 
                 if (isset(self::$type[$rule])) {
                     // 注册的验证规则
                     $result = call_user_func_array(self::$type[$rule], [$value]);
-                } elseif (function_exists('ctype_' . $rule)) {
+                } elseif (function_exists('ctype_'.$rule)) {
                     // ctype验证规则
-                    $ctypeFun = 'ctype_' . $rule;
+                    $ctypeFun = 'ctype_'.$rule;
                     $result   = $ctypeFun($value);
                 } elseif (isset($this->filter[$rule])) {
                     // Filter_var验证规则
@@ -1375,7 +1375,7 @@ 
 
         if (0 !== strpos($rule, '/') && !preg_match('/\/[imsU]{0,4}$/', $rule)) {
             // 不是正则表达式则两端补上/
-            $rule = '/^' . $rule . '$/';
+            $rule = '/^'.$rule.'$/';
         }
 
         return is_scalar($value) && 1 === preg_match($rule, (string) $value);
@@ -1458,8 +1458,8 @@ 
     {
         $lang = Container::get('lang');
 
-        if (isset($this->message[$attribute . '.' . $type])) {
-            $msg = $this->message[$attribute . '.' . $type];
+        if (isset($this->message[$attribute.'.'.$type])) {
+            $msg = $this->message[$attribute.'.'.$type];
         } elseif (isset($this->message[$attribute][$type])) {
             $msg = $this->message[$attribute][$type];
         } elseif (isset($this->message[$attribute])) {
@@ -1469,7 +1469,7 @@ 
         } elseif (0 === strpos($type, 'require')) {
             $msg = self::$typeMsg['require'];
         } else {
-            $msg = $title . $lang->get('not conform to the rules');
+            $msg = $title.$lang->get('not conform to the rules');
         }
 
         if (!is_string($msg)) {
@@ -1520,8 +1520,8 @@ 
             return;
         }
 
-        if (method_exists($this, 'scene' . $scene)) {
-            call_user_func([$this, 'scene' . $scene]);
+        if (method_exists($this, 'scene'.$scene)) {
+            call_user_func([$this, 'scene'.$scene]);
         } elseif (isset($this->scene[$scene])) {
             // 如果设置了验证适用场景
             $scene = $this->scene[$scene];

library/think/Response.php

Spacing +6 added lines, -6 removed lines

@@ -104,7 +104,7 @@ 
      */
     public static function create($data = '', $type = '', $code = 200, array $header = [], $options = [])
     {
-        $class = false !== strpos($type, '\\') ? $type : '\\think\\response\\' . ucfirst(strtolower($type));
+        $class = false !== strpos($type, '\\') ? $type : '\\think\\response\\'.ucfirst(strtolower($type));
 
         if (class_exists($class)) {
             return new $class($data, $code, $header, $options);
@@ -135,9 +135,9 @@ 
         if (200 == $this->code && $this->allowCache) {
             $cache = $this->app['request']->getCache();
             if ($cache) {
-                $this->header['Cache-Control'] = 'max-age=' . $cache[1] . ',must-revalidate';
-                $this->header['Last-Modified'] = gmdate('D, d M Y H:i:s') . ' GMT';
-                $this->header['Expires']       = gmdate('D, d M Y H:i:s', $_SERVER['REQUEST_TIME'] + $cache[1]) . ' GMT';
+                $this->header['Cache-Control'] = 'max-age='.$cache[1].',must-revalidate';
+                $this->header['Last-Modified'] = gmdate('D, d M Y H:i:s').' GMT';
+                $this->header['Expires']       = gmdate('D, d M Y H:i:s', $_SERVER['REQUEST_TIME'] + $cache[1]).' GMT';
 
                 $this->app['cache']->tag($cache[2])->set($cache[0], [$data, $this->header], $cache[1]);
             }
@@ -148,7 +148,7 @@ 
             http_response_code($this->code);
             // 发送头部信息
             foreach ($this->header as $name => $val) {
-                header($name . (!is_null($val) ? ':' . $val : ''));
+                header($name.(!is_null($val) ? ':'.$val : ''));
             }
         }
 
@@ -355,7 +355,7 @@ 
      */
     public function contentType($contentType, $charset = 'utf-8')
     {
-        $this->header['Content-Type'] = $contentType . '; charset=' . $charset;
+        $this->header['Content-Type'] = $contentType.'; charset='.$charset;
 
         return $this;
     }

library/think/Cookie.php

Spacing +5 added lines, -5 removed lines

@@ -102,12 +102,12 @@ 
             $config = $this->config;
         }
 
-        $name = $config['prefix'] . $name;
+        $name = $config['prefix'].$name;
 
         // 设置cookie
         if (is_array($value)) {
             array_walk_recursive($value, [$this, 'jsonFormatProtect'], 'encode');
-            $value = 'think:' . json_encode($value);
+            $value = 'think:'.json_encode($value);
         }
 
         $expire = !empty($config['expire']) ? $_SERVER['REQUEST_TIME'] + intval($config['expire']) : 0;
@@ -162,7 +162,7 @@ 
     public function has($name, $prefix = null)
     {
         $prefix = !is_null($prefix) ? $prefix : $this->config['prefix'];
-        $name   = $prefix . $name;
+        $name   = $prefix.$name;
 
         return isset($_COOKIE[$name]);
     }
@@ -177,7 +177,7 @@ 
     public function get($name = '', $prefix = null)
     {
         $prefix = !is_null($prefix) ? $prefix : $this->config['prefix'];
-        $key    = $prefix . $name;
+        $key    = $prefix.$name;
 
         if ('' == $name) {
             if ($prefix) {
@@ -216,7 +216,7 @@ 
     {
         $config = $this->config;
         $prefix = !is_null($prefix) ? $prefix : $config['prefix'];
-        $name   = $prefix . $name;
+        $name   = $prefix.$name;
 
         if ($config['setcookie']) {
             $this->setcookie($name, '', $_SERVER['REQUEST_TIME'] - 3600, $config);

library/think/process/Builder.php

Spacing +1 added lines, -1 removed lines

@@ -213,7 +213,7 @@
         $options = $this->options;
 
         $arguments = array_merge($this->prefix, $this->arguments);
-        $script    = implode(' ', array_map([__NAMESPACE__ . '\\Utils', 'escapeArgument'], $arguments));
+        $script    = implode(' ', array_map([__NAMESPACE__.'\\Utils', 'escapeArgument'], $arguments));
 
         if ($this->inheritEnv) {
             // include $_ENV for BC purposes

library/think/process/exception/Faild.php

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
             throw new \InvalidArgumentException('Expected a failed process, but the given process was successful.');
         }
 
-        $error = sprintf('The command "%s" failed.' . "\nExit Code: %s(%s)", $process->getCommandLine(), $process->getExitCode(), $process->getExitCodeText());
+        $error = sprintf('The command "%s" failed.'."\nExit Code: %s(%s)", $process->getCommandLine(), $process->getExitCode(), $process->getExitCodeText());
 
         if (!$process->isOutputDisabled()) {
             $error .= sprintf("\n\nOutput:\n================\n%s\n\nError Output:\n================\n%s", $process->getOutput(), $process->getErrorOutput());

library/think/process/Utils.php

Spacing +2 added lines, -2 removed lines

@@ -30,7 +30,7 @@ 
                 $escapedArgument .= '\\"';
             } elseif (self::isSurroundedBy($part, '%')) {
                 // Avoid environment variable expansion
-                $escapedArgument .= '^%"' . substr($part, 1, -1) . '"^%';
+                $escapedArgument .= '^%"'.substr($part, 1, -1).'"^%';
             } else {
                 // escape trailing backslash
                 if ('\\' === substr($part, -1)) {
@@ -41,7 +41,7 @@ 
             }
         }
         if ($quote) {
-            $escapedArgument = '"' . $escapedArgument . '"';
+            $escapedArgument = '"'.$escapedArgument.'"';
         }
         return $escapedArgument;
     }

library/think/Collection.php

Spacing +4 added lines, -4 removed lines

@@ -47,7 +47,7 @@ 
 
     public function toArray()
     {
-        return array_map(function ($value) {
+        return array_map(function($value) {
             return ($value instanceof Model || $value instanceof self) ? $value->toArray() : $value;
         }, $this->items);
     }
@@ -344,7 +344,7 @@ 
             $operator = '=';
         }
 
-        return $this->filter(function ($data) use ($field, $operator, $value) {
+        return $this->filter(function($data) use ($field, $operator, $value) {
             if (strpos($field, '.')) {
                 list($field, $relation) = explode('.', $field);
 
@@ -414,7 +414,7 @@ 
     {
         $items = $this->items;
 
-        $callback = $callback ?: function ($a, $b) {
+        $callback = $callback ?: function($a, $b) {
             return $a == $b ? 0 : (($a < $b) ? -1 : 1);
 
         };
@@ -434,7 +434,7 @@ 
      */
     public function order($field, $order = null, $intSort = true)
     {
-        return $this->sort(function ($a, $b) use ($field, $order, $intSort) {
+        return $this->sort(function($a, $b) use ($field, $order, $intSort) {
             $fieldA = isset($a[$field]) ? $a[$field] : null;
             $fieldB = isset($b[$field]) ? $b[$field] : null;
 

library/think/Paginator.php

Spacing +3 added lines, -3 removed lines

@@ -150,10 +150,10 @@ 
 
         $url = $path;
         if (!empty($parameters)) {
-            $url .= '?' . http_build_query($parameters, null, '&');
+            $url .= '?'.http_build_query($parameters, null, '&');
         }
 
-        return $url . $this->buildFragment();
+        return $url.$this->buildFragment();
     }
 
     /**
@@ -288,7 +288,7 @@ 
      */
     protected function buildFragment()
     {
-        return $this->options['fragment'] ? '#' . $this->options['fragment'] : '';
+        return $this->options['fragment'] ? '#'.$this->options['fragment'] : '';
     }
 
     /**