top-think / framework

src/think/model/concern/RelationShip.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\model\concern;
 
@@ -113,7 +113,7 @@ 
     public function setRelation(string $name, $value, array $data = [])
     {
         // 检测修改器
-        $method = 'set' . App::parseName($name, 1) . 'Attr';
+        $method = 'set'.App::parseName($name, 1).'Attr';
 
         if (method_exists($this, $method)) {
             $value = $this->$method($value, array_merge($this->data, $data));
@@ -312,7 +312,7 @@ 
             $value = $this->getOrigin($key);
 
             if (!is_null($value)) {
-                throw new Exception('bind attr has exists:' . $key);
+                throw new Exception('bind attr has exists:'.$key);
             }
 
             $this->set($key, $relation ? $relation->$attr : null);
@@ -347,7 +347,7 @@ 
             $count    = $this->$relation()->relationCount($result, $closure, $aggregate, $field, $name);
 
             if (empty($name)) {
-                $name = App::parseName($relation) . '_' . $aggregate;
+                $name = App::parseName($relation).'_'.$aggregate;
             }
 
             $result->setAttr($name, $count);
@@ -467,8 +467,8 @@ 
         // 记录当前关联信息
         $model      = $this->parseModel($model);
         $name       = App::parseName(App::classBaseName($model));
-        $middle     = $middle ?: App::parseName($this->name) . '_' . $name;
-        $foreignKey = $foreignKey ?: $name . '_id';
+        $middle     = $middle ?: App::parseName($this->name).'_'.$name;
+        $foreignKey = $foreignKey ?: $name.'_id';
         $localKey   = $localKey ?: $this->getForeignKey($this->name);
 
         return new BelongsToMany($this, $model, $middle, $foreignKey, $localKey);
@@ -495,8 +495,8 @@ 
         if (is_array($morph)) {
             list($morphType, $foreignKey) = $morph;
         } else {
-            $morphType  = $morph . '_type';
-            $foreignKey = $morph . '_id';
+            $morphType  = $morph.'_type';
+            $foreignKey = $morph.'_id';
         }
 
         $type = $type ?: get_class($this);
@@ -527,8 +527,8 @@ 
         if (is_array($morph)) {
             list($morphType, $foreignKey) = $morph;
         } else {
-            $morphType  = $morph . '_type';
-            $foreignKey = $morph . '_id';
+            $morphType  = $morph.'_type';
+            $foreignKey = $morph.'_id';
         }
 
         return new MorphMany($this, $model, $foreignKey, $morphType, $type);
@@ -554,8 +554,8 @@ 
         if (is_array($morph)) {
             list($morphType, $foreignKey) = $morph;
         } else {
-            $morphType  = $morph . '_type';
-            $foreignKey = $morph . '_id';
+            $morphType  = $morph.'_type';
+            $foreignKey = $morph.'_id';
         }
 
         return new MorphTo($this, $morphType, $foreignKey, $alias, $relation);
@@ -591,7 +591,7 @@ 
             $name = App::classBaseName($name);
         }
 
-        return App::parseName($name) . '_id';
+        return App::parseName($name).'_id';
     }
 
     /**

src/think/Model.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;
 
@@ -310,12 +310,12 @@ 
             $query = $this->queryInstance;
         } else {
             $query = $this->db->buildQuery($this->connection)
-                ->name($this->name . $this->suffix)
+                ->name($this->name.$this->suffix)
                 ->pk($this->pk);
         }
         
         if (!empty($this->table)) {
-            $query->table($this->table . $this->suffix);
+            $query->table($this->table.$this->suffix);
         }
 
         $query->model($this)
@@ -515,7 +515,7 @@ 
                 $this->field = array_keys(array_merge($this->schema, $this->jsonType));
             } else {
                 $query = $this->db();
-                $table = $this->table ? $this->table . $this->suffix : $query->getTable();
+                $table = $this->table ? $this->table.$this->suffix : $query->getTable();
 
                 $this->field = $query->getConnection()->getTableFields($table);
             }

src/think/Container.php

Spacing +7 added lines, -7 removed lines

@@ -8,7 +8,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think;
 
@@ -171,7 +171,7 @@ 
             return $this->make($abstract);
         }
 
-        throw new ClassNotFoundException('class not exists: ' . $abstract, $abstract);
+        throw new ClassNotFoundException('class not exists: '.$abstract, $abstract);
     }
 
     /**
@@ -329,7 +329,7 @@ 
 
             return call_user_func_array($function, $args);
         } catch (ReflectionException $e) {
-            throw new Exception('function not exists: ' . $function . '()');
+            throw new Exception('function not exists: '.$function.'()');
         }
     }
 
@@ -357,12 +357,12 @@ 
         } catch (ReflectionException $e) {
             if (is_array($method)) {
                 $class    = is_object($method[0]) ? get_class($method[0]) : $method[0];
-                $callback = $class . '::' . $method[1];
+                $callback = $class.'::'.$method[1];
             } else {
                 $callback = $method;
             }
 
-            throw new Exception('method not exists: ' . $callback . '()');
+            throw new Exception('method not exists: '.$callback.'()');
         }
     }
 
@@ -428,7 +428,7 @@ 
 
             return $object;
         } catch (ReflectionException $e) {
-            throw new ClassNotFoundException('class not exists: ' . $class, $class);
+            throw new ClassNotFoundException('class not exists: '.$class, $class);
         }
     }
 
@@ -489,7 +489,7 @@ 
             } elseif ($param->isDefaultValueAvailable()) {
                 $args[] = $param->getDefaultValue();
             } else {
-                throw new InvalidArgumentException('method param miss:' . $name);
+                throw new InvalidArgumentException('method param miss:'.$name);
             }
         }
 

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/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;
 
@@ -96,7 +96,7 @@ 
         }
 
         if (!isset($this->config['channels'][$name])) {
-            throw new InvalidArgumentException('Undefined log config:' . $name);
+            throw new InvalidArgumentException('Undefined log config:'.$name);
         }
 
         $this->channel = $name;
@@ -152,7 +152,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/Db.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 @@ 
 
         if ($force || !isset($this->instance[$name])) {
             if (!isset($this->config['connections'][$name])) {
-                throw new InvalidArgumentException('Undefined db config:' . $name);
+                throw new InvalidArgumentException('Undefined db config:'.$name);
             }
 
             $config = $this->config['connections'][$name];
@@ -218,7 +218,7 @@ 
     public function event(string $event, callable $callback): void
     {
         if ($this->event) {
-            $this->event->listen('db.' . $event, $callback);
+            $this->event->listen('db.'.$event, $callback);
         }
     }
 
@@ -233,7 +233,7 @@ 
     public function trigger(string $event, $params = null, bool $once = false)
     {
         if ($this->event) {
-            return $this->event->trigger('db.' . $event, $params, $once);
+            return $this->event->trigger('db.'.$event, $params, $once);
         }
     }
 

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;
 
@@ -79,7 +79,7 @@ 
 
         if ($force || !isset($this->instance[$name])) {
             if (!isset($this->config['stores'][$name])) {
-                throw new InvalidArgumentException('Undefined cache config:' . $name);
+                throw new InvalidArgumentException('Undefined cache config:'.$name);
             }
 
             $options = $this->config['stores'][$name];

src/think/Http.php

Spacing +24 added lines, -24 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 __construct(App $app)
     {
         $this->app   = $app;
-        $this->multi = is_dir($this->app->getBasePath() . 'controller') ? false : true;
+        $this->multi = is_dir($this->app->getBasePath().'controller') ? false : true;
     }
 
     /**
@@ -172,8 +172,8 @@ 
         $this->initialize();
 
         // 加载全局中间件
-        if (is_file($this->app->getBasePath() . 'middleware.php')) {
-            $this->app->middleware->import(include $this->app->getBasePath() . 'middleware.php');
+        if (is_file($this->app->getBasePath().'middleware.php')) {
+            $this->app->middleware->import(include $this->app->getBasePath().'middleware.php');
         }
 
         if ($this->multi) {
@@ -186,7 +186,7 @@ 
         // 监听HttpRun
         $this->app->event->trigger('HttpRun');
 
-        $withRoute = $this->app->config->get('app.with_route', true) ? function () {
+        $withRoute = $this->app->config->get('app.with_route', true) ? function() {
             $this->loadRoutes();
         } : null;
 
@@ -202,7 +202,7 @@ 
     {
         // 加载路由定义
         if (is_dir($this->getRoutePath())) {
-            $files = glob($this->getRoutePath() . '*.php');
+            $files = glob($this->getRoutePath().'*.php');
             foreach ($files as $file) {
                 include $file;
             }
@@ -218,7 +218,7 @@ 
      */
     protected function getRoutePath(): string
     {
-        return $this->app->getRootPath() . 'route' . DIRECTORY_SEPARATOR . ($this->isMulti() ? $this->getName() . DIRECTORY_SEPARATOR : '');
+        return $this->app->getRootPath().'route'.DIRECTORY_SEPARATOR.($this->isMulti() ? $this->getName().DIRECTORY_SEPARATOR : '');
     }
 
     /**
@@ -303,7 +303,7 @@ 
                         $appName = $map[$name];
                     }
                 } elseif ($name && (false !== array_search($name, $map) || in_array($name, $deny))) {
-                    throw new HttpException(404, 'app not exists:' . $name);
+                    throw new HttpException(404, 'app not exists:'.$name);
                 } elseif ($name && isset($map['*'])) {
                     $appName = $map['*'];
                 } else {
@@ -311,7 +311,7 @@ 
                 }
 
                 if ($name) {
-                    $this->app->request->setRoot('/' . $name);
+                    $this->app->request->setRoot('/'.$name);
                     $this->app->request->setPathinfo(strpos($path, '/') ? ltrim(strstr($path, '/'), '/') : '');
                 }
             }
@@ -331,41 +331,41 @@ 
     {
         $this->name = $appName;
         $this->app->request->setApp($appName);
-        $this->app->setAppPath($this->path ?: $this->app->getBasePath() . $appName . DIRECTORY_SEPARATOR);
-        $this->app->setRuntimePath($this->app->getRootPath() . 'runtime' . DIRECTORY_SEPARATOR . $appName . DIRECTORY_SEPARATOR);
+        $this->app->setAppPath($this->path ?: $this->app->getBasePath().$appName.DIRECTORY_SEPARATOR);
+        $this->app->setRuntimePath($this->app->getRootPath().'runtime'.DIRECTORY_SEPARATOR.$appName.DIRECTORY_SEPARATOR);
 
         //加载app文件
         if (is_dir($this->app->getAppPath())) {
             $appPath = $this->app->getAppPath();
 
-            if (is_file($appPath . 'common.php')) {
-                include_once $appPath . 'common.php';
+            if (is_file($appPath.'common.php')) {
+                include_once $appPath.'common.php';
             }
 
             $configPath = $this->app->getConfigPath();
 
             $files = [];
 
-            if (is_dir($configPath . $appName)) {
-                $files = array_merge($files, glob($configPath . $appName . DIRECTORY_SEPARATOR . '*' . $this->app->getConfigExt()));
-            } elseif (is_dir($appPath . 'config')) {
-                $files = array_merge($files, glob($appPath . 'config' . DIRECTORY_SEPARATOR . '*' . $this->app->getConfigExt()));
+            if (is_dir($configPath.$appName)) {
+                $files = array_merge($files, glob($configPath.$appName.DIRECTORY_SEPARATOR.'*'.$this->app->getConfigExt()));
+            } elseif (is_dir($appPath.'config')) {
+                $files = array_merge($files, glob($appPath.'config'.DIRECTORY_SEPARATOR.'*'.$this->app->getConfigExt()));
             }
 
             foreach ($files as $file) {
                 $this->app->config->load($file, pathinfo($file, PATHINFO_FILENAME));
             }
 
-            if (is_file($appPath . 'event.php')) {
-                $this->app->loadEvent(include $appPath . 'event.php');
+            if (is_file($appPath.'event.php')) {
+                $this->app->loadEvent(include $appPath.'event.php');
             }
 
-            if (is_file($appPath . 'middleware.php')) {
-                $this->app->middleware->import(include $appPath . 'middleware.php');
+            if (is_file($appPath.'middleware.php')) {
+                $this->app->middleware->import(include $appPath.'middleware.php');
             }
 
-            if (is_file($appPath . 'provider.php')) {
-                $this->app->bind(include $appPath . 'provider.php');
+            if (is_file($appPath.'provider.php')) {
+                $this->app->bind(include $appPath.'provider.php');
             }
         }
 
@@ -373,7 +373,7 @@ 
         $this->app->loadLangPack($this->app->lang->defaultLangSet());
 
         // 设置应用命名空间
-        $this->app->setNamespace($this->app->config->get('app.app_namespace') ?: 'app\\' . $appName);
+        $this->app->setNamespace($this->app->config->get('app.app_namespace') ?: 'app\\'.$appName);
     }
 
     /**

src/think/console/command/optimize/Route.php

Spacing +7 added lines, -7 removed lines

@@ -29,14 +29,14 @@ 
     {
         $app = $input->getArgument('app');
 
-        if (empty($app) && !is_dir($this->app->getBasePath() . 'controller')) {
+        if (empty($app) && !is_dir($this->app->getBasePath().'controller')) {
             $output->writeln('<error>Miss app name!</error>');
             return false;
         }
 
-        $path = $this->app->getRootPath() . 'runtime' . DIRECTORY_SEPARATOR . ($app ? $app . DIRECTORY_SEPARATOR : '');
+        $path = $this->app->getRootPath().'runtime'.DIRECTORY_SEPARATOR.($app ? $app.DIRECTORY_SEPARATOR : '');
 
-        $filename = $path . 'route.php';
+        $filename = $path.'route.php';
         if (is_file($filename)) {
             unlink($filename);
         }
@@ -51,21 +51,21 @@ 
         $this->app->route->lazy(false);
 
         // 路由检测
-        $path = $this->app->getRootPath() . 'route' . DIRECTORY_SEPARATOR . ($app ? $app . DIRECTORY_SEPARATOR : '');
+        $path = $this->app->getRootPath().'route'.DIRECTORY_SEPARATOR.($app ? $app.DIRECTORY_SEPARATOR : '');
 
         $files = is_dir($path) ? scandir($path) : [];
 
         foreach ($files as $file) {
             if (strpos($file, '.php')) {
-                include $path . $file;
+                include $path.$file;
             }
         }
 
         //触发路由载入完成事件
         $this->app->event->trigger(RouteLoaded::class);
 
-        $content = '<?php ' . PHP_EOL . 'return ';
-        $content .= '\think\App::unserialize(\'' . \think\App::serialize($this->app->route->getName()) . '\');';
+        $content = '<?php '.PHP_EOL.'return ';
+        $content .= '\think\App::unserialize(\''.\think\App::serialize($this->app->route->getName()).'\');';
         return $content;
     }