top-think / framework

src/think/Service.php

Spacing +2 added lines, -2 removed lines

@@ -8,7 +8,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: yunwuxin <448901948@qq.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think;
 
@@ -43,7 +43,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/Request.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;
 
@@ -384,7 +384,7 @@ 
      */
     public function domain(bool $port = false): string
     {
-        return $this->scheme() . '://' . $this->host($port);
+        return $this->scheme().'://'.$this->host($port);
     }
 
     /**
@@ -399,7 +399,7 @@ 
         if (!$root) {
             $item  = explode('.', $this->host());
             $count = count($item);
-            $root  = $count > 1 ? $item[$count - 2] . '.' . $item[$count - 1] : $item[0];
+            $root  = $count > 1 ? $item[$count - 2].'.'.$item[$count - 1] : $item[0];
         }
 
         return $root;
@@ -487,14 +487,14 @@ 
         } elseif ($this->server('REQUEST_URI')) {
             $url = $this->server('REQUEST_URI');
         } elseif ($this->server('ORIG_PATH_INFO')) {
-            $url = $this->server('ORIG_PATH_INFO') . (!empty($this->server('QUERY_STRING')) ? '?' . $this->server('QUERY_STRING') : '');
+            $url = $this->server('ORIG_PATH_INFO').(!empty($this->server('QUERY_STRING')) ? '?'.$this->server('QUERY_STRING') : '');
         } elseif (isset($_SERVER['argv'][1])) {
             $url = $_SERVER['argv'][1];
         } else {
             $url = '';
         }
 
-        return $complete ? $this->domain() . $url : $url;
+        return $complete ? $this->domain().$url : $url;
     }
 
     /**
@@ -522,7 +522,7 @@ 
             $this->baseUrl = strpos($str, '?') ? strstr($str, '?', true) : $str;
         }
 
-        return $complete ? $this->domain() . $this->baseUrl : $this->baseUrl;
+        return $complete ? $this->domain().$this->baseUrl : $this->baseUrl;
     }
 
     /**
@@ -543,8 +543,8 @@ 
                     $url = $this->server('PHP_SELF');
                 } elseif (basename($this->server('ORIG_SCRIPT_NAME')) === $script_name) {
                     $url = $this->server('ORIG_SCRIPT_NAME');
-                } elseif (($pos = strpos($this->server('PHP_SELF'), '/' . $script_name)) !== false) {
-                    $url = substr($this->server('SCRIPT_NAME'), 0, $pos) . '/' . $script_name;
+                } elseif (($pos = strpos($this->server('PHP_SELF'), '/'.$script_name)) !== false) {
+                    $url = substr($this->server('SCRIPT_NAME'), 0, $pos).'/'.$script_name;
                 } elseif ($this->server('DOCUMENT_ROOT') && strpos($this->server('SCRIPT_FILENAME'), $this->server('DOCUMENT_ROOT')) === 0) {
                     $url = str_replace('\\', '/', str_replace($this->server('DOCUMENT_ROOT'), '', $this->server('SCRIPT_FILENAME')));
                 }
@@ -552,7 +552,7 @@ 
             $this->baseFile = $url;
         }
 
-        return $complete ? $this->domain() . $this->baseFile : $this->baseFile;
+        return $complete ? $this->domain().$this->baseFile : $this->baseFile;
     }
 
     /**
@@ -583,7 +583,7 @@ 
             $this->root = rtrim($file, '/');
         }
 
-        return $complete ? $this->domain() . $this->root : $this->root;
+        return $complete ? $this->domain().$this->root : $this->root;
     }
 
     /**
@@ -597,7 +597,7 @@ 
         $root = strpos($base, '.') ? ltrim(dirname($base), DIRECTORY_SEPARATOR) : $base;
 
         if ('' != $root) {
-            $root = '/' . ltrim($root, '/');
+            $root = '/'.ltrim($root, '/');
         }
 
         return $root;
@@ -1334,7 +1334,7 @@ 
                 if (is_scalar($data)) {
                     $data = (string) $data;
                 } else {
-                    throw new \InvalidArgumentException('variable type error：' . gettype($data));
+                    throw new \InvalidArgumentException('variable type error：'.gettype($data));
                 }
                 break;
         }

src/think/Log.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;
 
@@ -125,7 +125,7 @@ 
         if (is_string($msg) && !empty($context)) {
             $replace = [];
             foreach ($context as $key => $val) {
-                $replace['{' . $key . '}'] = $val;
+                $replace['{'.$key.'}'] = $val;
             }
 
             $msg = strtr($msg, $replace);

src/think/Response.php

Spacing +4 added lines, -4 removed lines

@@ -8,7 +8,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think;
 
@@ -101,7 +101,7 @@ 
      */
     public static function create($data = '', string $type = '', int $code = 200): Response
     {
-        $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 Container::getInstance()->invokeClass($class, [$data, $code]);
@@ -150,7 +150,7 @@ 
             http_response_code($this->code);
             // 发送头部信息
             foreach ($this->header as $name => $val) {
-                header($name . (!is_null($val) ? ':' . $val : ''));
+                header($name.(!is_null($val) ? ':'.$val : ''));
             }
         }
 
@@ -343,7 +343,7 @@ 
      */
     public function contentType(string $contentType, string $charset = 'utf-8')
     {
-        $this->header['Content-Type'] = $contentType . '; charset=' . $charset;
+        $this->header['Content-Type'] = $contentType.'; charset='.$charset;
 
         return $this;
     }

src/think/model/Collection.php

Spacing +9 added lines, -9 removed lines

@@ -8,7 +8,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: zhangyajun <448901948@qq.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think\model;
 
@@ -44,7 +44,7 @@ 
      */
     public function delete(): bool
     {
-        $this->each(function (Model $model) {
+        $this->each(function(Model $model) {
             $model->delete();
         });
 
@@ -60,7 +60,7 @@ 
      */
     public function update(array $data, array $allowField = []): bool
     {
-        $this->each(function (Model $model) use ($data, $allowField) {
+        $this->each(function(Model $model) use ($data, $allowField) {
             if (!empty($allowField)) {
                 $model->allowField($allowField);
             }
@@ -79,7 +79,7 @@ 
      */
     public function hidden(array $hidden)
     {
-        $this->each(function (Model $model) use ($hidden) {
+        $this->each(function(Model $model) use ($hidden) {
             $model->hidden($hidden);
         });
 
@@ -94,7 +94,7 @@ 
      */
     public function visible(array $visible)
     {
-        $this->each(function (Model $model) use ($visible) {
+        $this->each(function(Model $model) use ($visible) {
             $model->visible($visible);
         });
 
@@ -109,7 +109,7 @@ 
      */
     public function append(array $append)
     {
-        $this->each(function (Model $model) use ($append) {
+        $this->each(function(Model $model) use ($append) {
             $model->append($append);
         });
 
@@ -124,7 +124,7 @@ 
      */
     public function setParent(Model $parent)
     {
-        $this->each(function (Model $model) use ($parent) {
+        $this->each(function(Model $model) use ($parent) {
             $model->setParent($parent);
         });
 
@@ -140,7 +140,7 @@ 
      */
     public function withAttr($name, $callback = null)
     {
-        $this->each(function (Model $model) use ($name, $callback) {
+        $this->each(function(Model $model) use ($name, $callback) {
             $model->withAttribute($name, $callback);
         });
 
@@ -157,7 +157,7 @@ 
      */
     public function bindAttr(string $relation, array $attrs = [])
     {
-        $this->each(function (Model $model) use ($relation, $attrs) {
+        $this->each(function(Model $model) use ($relation, $attrs) {
             $model->bindAttr($relation, $attrs);
         });
 

src/think/model/concern/SoftDelete.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\model\concern;
 
@@ -155,7 +155,7 @@ 
             $query->where($data);
             $data = null;
         } elseif ($data instanceof \Closure) {
-            call_user_func_array($data, [ & $query]);
+            call_user_func_array($data, [& $query]);
             $data = null;
         } elseif (is_null($data)) {
             return false;
@@ -217,7 +217,7 @@ 
         }
 
         if (false === strpos($field, '.')) {
-            $field = '__TABLE__.' . $field;
+            $field = '__TABLE__.'.$field;
         }
 
         if (!$read && strpos($field, '.')) {

src/think/model/concern/ModelEvent.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\model\concern;
 
@@ -52,7 +52,7 @@ 
             return true;
         }
 
-        $call = 'on' . App::parseName($event, 1);
+        $call = 'on'.App::parseName($event, 1);
 
         try {
             if (method_exists(static::class, $call)) {

src/think/model/concern/Conversion.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\model\concern;
 
@@ -83,7 +83,7 @@ 
             foreach ($append as $key => $attr) {
                 $key = is_numeric($key) ? $attr : $key;
                 if (isset($this->data[$key])) {
-                    throw new Exception('bind attr has exists:' . $key);
+                    throw new Exception('bind attr has exists:'.$key);
                 }
 
                 $this->data[$key] = $model->$attr;
@@ -227,7 +227,7 @@ 
                 $key = is_numeric($key) ? $attr : $key;
 
                 if (isset($item[$key])) {
-                    throw new Exception('bind attr has exists:' . $key);
+                    throw new Exception('bind attr has exists:'.$key);
                 }
 
                 $item[$key] = $value ? $value->getAttr($attr) : null;

src/think/model/concern/Attribute.php

Spacing +5 added lines, -5 removed lines

@@ -8,7 +8,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think\model\concern;
 
@@ -282,7 +282,7 @@ 
             return $this->relation[$name];
         }
 
-        throw new InvalidArgumentException('property not exists:' . static::class . '->' . $name);
+        throw new InvalidArgumentException('property not exists:'.static::class.'->'.$name);
     }
 
     /**
@@ -292,7 +292,7 @@ 
      */
     public function getChangedData(): array
     {
-        $data = $this->force ? $this->data : array_udiff_assoc($this->data, $this->origin, function ($a, $b) {
+        $data = $this->force ? $this->data : array_udiff_assoc($this->data, $this->origin, function($a, $b) {
             if ((empty($a) || empty($b)) && $a !== $b) {
                 return 1;
             }
@@ -359,7 +359,7 @@ 
             $value = $this->autoWriteTimestamp($name);
         } else {
             // 检测修改器
-            $method = 'set' . App::parseName($name, 1) . 'Attr';
+            $method = 'set'.App::parseName($name, 1).'Attr';
 
             if (method_exists($this, $method)) {
                 $array = $this->data;
@@ -482,7 +482,7 @@ 
     {
         // 检测属性获取器
         $fieldName = $this->getRealFieldName($name);
-        $method    = 'get' . App::parseName($name, 1) . 'Attr';
+        $method    = 'get'.App::parseName($name, 1).'Attr';
 
         if (isset($this->withAttr[$fieldName])) {
             if ($relation) {