top-think / framework

tests/HttpTest.php

Spacing +7 added lines, -7 removed lines

@@ -48,7 +48,7 @@ 
 
         $route = m::mock(Route::class);
 
-        $route->shouldReceive('dispatch')->withArgs(function ($req, $withRoute) use ($request) {
+        $route->shouldReceive('dispatch')->withArgs(function($req, $withRoute) use ($request) {
             if ($withRoute) {
                 $withRoute();
             }
@@ -80,8 +80,8 @@ 
 
         $this->http->multi(false);
 
-        $this->app->shouldReceive('getBasePath')->andReturn($root->getChild('app')->url() . DIRECTORY_SEPARATOR);
-        $this->app->shouldReceive('getRootPath')->andReturn($root->url() . DIRECTORY_SEPARATOR);
+        $this->app->shouldReceive('getBasePath')->andReturn($root->getChild('app')->url().DIRECTORY_SEPARATOR);
+        $this->app->shouldReceive('getRootPath')->andReturn($root->url().DIRECTORY_SEPARATOR);
 
         $request  = m::mock(Request::class)->makePartial();
         $response = m::mock(Response::class)->makePartial();
@@ -140,9 +140,9 @@ 
 
         $this->app->shouldReceive('get')->with('config')->andReturn($config);
 
-        $this->app->shouldReceive('getBasePath')->andReturn($root->getChild('app')->url() . DIRECTORY_SEPARATOR);
-        $this->app->shouldReceive('getRootPath')->andReturn($root->url() . DIRECTORY_SEPARATOR);
-        $this->app->shouldReceive('getConfigPath')->andReturn($root->getChild('config')->url() . DIRECTORY_SEPARATOR);
+        $this->app->shouldReceive('getBasePath')->andReturn($root->getChild('app')->url().DIRECTORY_SEPARATOR);
+        $this->app->shouldReceive('getRootPath')->andReturn($root->url().DIRECTORY_SEPARATOR);
+        $this->app->shouldReceive('getConfigPath')->andReturn($root->getChild('config')->url().DIRECTORY_SEPARATOR);
 
         $response = m::mock(Response::class)->makePartial();
 
@@ -174,7 +174,7 @@ 
             $this->assertTrue($this->http->isBindDomain());
         }
         if ($path) {
-            $this->assertEquals(rtrim($path, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR, $this->app->getAppPath());
+            $this->assertEquals(rtrim($path, DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR, $this->app->getAppPath());
         }
     }
 

tests/ContainerTest.php

Spacing +9 added lines, -9 removed lines

@@ -57,7 +57,7 @@ 
 
         Container::setInstance($container);
 
-        $container->bind('name', function () {
+        $container->bind('name', function() {
             return 'Taylor';
         });
 
@@ -74,7 +74,7 @@ 
         $this->expectExceptionMessage('class not exists: name');
         $container->get('name');
 
-        $container->bind('name', function () {
+        $container->bind('name', function() {
             return 'Taylor';
         });
 
@@ -85,7 +85,7 @@ 
     {
         $container = new Container;
 
-        $container->bind('name', function () {
+        $container->bind('name', function() {
             return 'Taylor';
         });
 
@@ -100,7 +100,7 @@ 
     {
         $container = new Container;
 
-        $container->bind('name', function () {
+        $container->bind('name', function() {
             return 'Taylor';
         });
 
@@ -192,7 +192,7 @@ 
 
         $this->assertSame($object, Container::getInstance());
 
-        Container::setInstance(function () {
+        Container::setInstance(function() {
             return $this;
         });
 
@@ -221,17 +221,17 @@ 
 
         $container->invokeMethod([$stub, 'some']);
 
-        $this->assertSame($container, $container->invokeMethod(Taylor::class . '::static'));
+        $this->assertSame($container, $container->invokeMethod(Taylor::class.'::static'));
 
         $reflect = new ReflectionMethod($container, 'exists');
 
         $this->assertTrue($container->invokeReflectMethod($container, $reflect, [Container::class]));
 
-        $this->assertSame($container, $container->invoke(function (Container $container) {
+        $this->assertSame($container, $container->invoke(function(Container $container) {
             return $container;
         }));
 
-        $this->assertSame($container, $container->invoke(Taylor::class . '::static'));
+        $this->assertSame($container, $container->invoke(Taylor::class.'::static'));
 
         $object = $container->invokeClass(SomeClass::class);
         $this->assertInstanceOf(SomeClass::class, $object);
@@ -239,7 +239,7 @@ 
 
         $stdClass = new stdClass();
 
-        $container->invoke(function (Container $container, stdClass $stdObject, $key1, $lowKey, $key2 = 'default') use ($stdClass) {
+        $container->invoke(function(Container $container, stdClass $stdObject, $key1, $lowKey, $key2 = 'default') use ($stdClass) {
             $this->assertEquals('value1', $key1);
             $this->assertEquals('default', $key2);
             $this->assertEquals('value2', $lowKey);

src/think/middleware/FormTokenCheck.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\middleware;
 

src/think/middleware/AllowCrossDomain.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\middleware;
 

src/think/contract/SessionHandlerInterface.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/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/db/builder/Mysql.php

Spacing +17 added lines, -17 removed lines

@@ -8,7 +8,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think\db\builder;
 
@@ -122,7 +122,7 @@ 
 
         $set = [];
         foreach ($data as $key => $val) {
-            $set[] = $key . ' = ' . $val;
+            $set[] = $key.' = '.$val;
         }
 
         return str_replace(
@@ -167,7 +167,7 @@ 
         foreach ($dataSet as $data) {
             $data = $this->parseData($query, $data, $allowFields, $bind);
 
-            $values[] = '( ' . implode(',', array_values($data)) . ' )';
+            $values[] = '( '.implode(',', array_values($data)).' )';
 
             if (!isset($insertFields)) {
                 $insertFields = array_keys($data);
@@ -210,7 +210,7 @@ 
         }
         $set = [];
         foreach ($data as $key => $val) {
-            $set[] = $key . ' = ' . $val;
+            $set[] = $key.' = '.$val;
         }
 
         return str_replace(
@@ -246,7 +246,7 @@ 
                 $this->parseTable($query, $options['table']),
                 $this->parsePartition($query, $options['partition']),
                 $this->parseExtra($query, $options['extra']),
-                !empty($options['using']) ? ' USING ' . $this->parseTable($query, $options['using']) . ' ' : '',
+                !empty($options['using']) ? ' USING '.$this->parseTable($query, $options['using']).' ' : '',
                 $this->parseJoin($query, $options['join']),
                 $this->parseWhere($query, $options['where']),
                 $this->parseOrder($query, $options['order']),
@@ -273,7 +273,7 @@ 
             $value = $value->getValue();
         }
 
-        return $key . ' ' . $exp . ' ' . $value;
+        return $key.' '.$exp.' '.$value;
     }
 
     /**
@@ -292,7 +292,7 @@ 
             $value = $value->getValue();
         }
 
-        return 'FIND_IN_SET(' . $value . ', ' . $key . ')';
+        return 'FIND_IN_SET('.$value.', '.$key.')';
     }
 
     /**
@@ -316,7 +316,7 @@ 
         if (strpos($key, '->') && false === strpos($key, '(')) {
             // JSON字段支持
             list($field, $name) = explode('->', $key, 2);
-            return 'json_extract(' . $this->parseKey($query, $field) . ', \'$' . (strpos($name, '[') === 0 ? '' : '.') . str_replace('->', '.', $name) . '\')';
+            return 'json_extract('.$this->parseKey($query, $field).', \'$'.(strpos($name, '[') === 0 ? '' : '.').str_replace('->', '.', $name).'\')';
         } elseif (strpos($key, '.') && !preg_match('/[,\'\"\(\)`\s]/', $key)) {
             list($table, $key) = explode('.', $key, 2);
 
@@ -333,11 +333,11 @@ 
         }
 
         if ($strict && !preg_match('/^[\w\.\*]+$/', $key)) {
-            throw new Exception('not support data:' . $key);
+            throw new Exception('not support data:'.$key);
         }
 
         if ('*' != $key && !preg_match('/[,\'\"\*\(\)`.\s]/', $key)) {
-            $key = '`' . $key . '`';
+            $key = '`'.$key.'`';
         }
 
         if (isset($table)) {
@@ -345,7 +345,7 @@ 
                 $table = str_replace('.', '`.`', $table);
             }
 
-            $key = '`' . $table . '`.' . $key;
+            $key = '`'.$table.'`.'.$key;
         }
 
         return $key;
@@ -379,7 +379,7 @@ 
             $partition = explode(',', $partition);
         }
 
-        return ' PARTITION (' . implode(' , ', $partition) . ') ';
+        return ' PARTITION ('.implode(' , ', $partition).') ';
     }
 
     /**
@@ -396,7 +396,7 @@ 
         }
 
         if ($duplicate instanceof Raw) {
-            return ' ON DUPLICATE KEY UPDATE ' . $duplicate->getValue() . ' ';
+            return ' ON DUPLICATE KEY UPDATE '.$duplicate->getValue().' ';
         }
 
         if (is_string($duplicate)) {
@@ -407,15 +407,15 @@ 
         foreach ($duplicate as $key => $val) {
             if (is_numeric($key)) {
                 $val       = $this->parseKey($query, $val);
-                $updates[] = $val . ' = VALUES(' . $val . ')';
+                $updates[] = $val.' = VALUES('.$val.')';
             } elseif ($val instanceof Raw) {
-                $updates[] = $this->parseKey($query, $key) . " = " . $val->getValue();
+                $updates[] = $this->parseKey($query, $key)." = ".$val->getValue();
             } else {
                 $name      = $query->bindValue($val, $query->getConnection()->getFieldBindType($key));
-                $updates[] = $this->parseKey($query, $key) . " = :" . $name;
+                $updates[] = $this->parseKey($query, $key)." = :".$name;
             }
         }
 
-        return ' ON DUPLICATE KEY UPDATE ' . implode(' , ', $updates) . ' ';
+        return ' ON DUPLICATE KEY UPDATE '.implode(' , ', $updates).' ';
     }
 }

src/think/db/BaseQuery.php

Spacing +14 added lines, -14 removed lines

@@ -8,7 +8,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think\db;
 
@@ -129,15 +129,15 @@ 
             $name = App::parseName(substr($method, 5));
             array_unshift($args, $name);
             return call_user_func_array([$this, 'where'], $args);
-        } elseif ($this->model && method_exists($this->model, 'scope' . $method)) {
+        } elseif ($this->model && method_exists($this->model, 'scope'.$method)) {
             // 动态调用命名范围
-            $method = 'scope' . $method;
+            $method = 'scope'.$method;
             array_unshift($args, $this);
 
             call_user_func_array([$this->model, $method], $args);
             return $this;
         } else {
-            throw new Exception('method not exist:' . static::class . '->' . $method);
+            throw new Exception('method not exist:'.static::class.'->'.$method);
         }
     }
 
@@ -211,7 +211,7 @@ 
 
         $name = $name ?: $this->name;
 
-        return $this->prefix . App::parseName($name);
+        return $this->prefix.App::parseName($name);
     }
 
     /**
@@ -436,10 +436,10 @@ 
         $prefix = $prefix ?: $tableName;
         foreach ($field as $key => &$val) {
             if (is_numeric($key) && $alias) {
-                $field[$prefix . '.' . $val] = $alias . $val;
+                $field[$prefix.'.'.$val] = $alias.$val;
                 unset($field[$key]);
             } elseif (is_numeric($key)) {
-                $val = $prefix . '.' . $val;
+                $val = $prefix.'.'.$val;
             }
         }
 
@@ -493,7 +493,7 @@ 
             // 延迟写入
             $condition = $this->options['where'] ?? [];
 
-            $guid = md5($this->getTable() . '_' . $field . '_' . serialize($condition));
+            $guid = md5($this->getTable().'_'.$field.'_'.serialize($condition));
             $step = $this->connection->lazyWrite($op, $guid, $step, $lazyTime);
 
             if (false === $step) {
@@ -561,7 +561,7 @@ 
      */
     public function limit(int $offset, int $length = null)
     {
-        $this->options['limit'] = $offset . ($length ? ',' . $length : '');
+        $this->options['limit'] = $offset.($length ? ','.$length : '');
 
         return $this;
     }
@@ -745,7 +745,7 @@ 
 
         if (is_string($field)) {
             if (!empty($this->options['via'])) {
-                $field = $this->options['via'] . '.' . $field;
+                $field = $this->options['via'].'.'.$field;
             }
             if (strpos($field, ',')) {
                 $field = array_map('trim', explode(',', $field));
@@ -755,9 +755,9 @@ 
         } elseif (!empty($this->options['via'])) {
             foreach ($field as $key => $val) {
                 if (is_numeric($key)) {
-                    $field[$key] = $this->options['via'] . '.' . $val;
+                    $field[$key] = $this->options['via'].'.'.$val;
                 } else {
-                    $field[$this->options['via'] . '.' . $key] = $val;
+                    $field[$this->options['via'].'.'.$key] = $val;
                     unset($field[$key]);
                 }
             }
@@ -1427,7 +1427,7 @@ 
      */
     public function buildSql(bool $sub = true): string
     {
-        return $sub ? '( ' . $this->fetchSql()->select() . ' )' : $this->fetchSql()->select();
+        return $sub ? '( '.$this->fetchSql()->select().' )' : $this->fetchSql()->select();
     }
 
     /**
@@ -1483,7 +1483,7 @@ 
             $page                  = $page > 0 ? $page : 1;
             $listRows              = $listRows ?: (is_numeric($options['limit']) ? $options['limit'] : 20);
             $offset                = $listRows * ($page - 1);
-            $options['limit']      = $offset . ',' . $listRows;
+            $options['limit']      = $offset.','.$listRows;
         }
 
         $this->options = $options;

src/think/db/concern/JoinAndViewQuery.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\db\concern;
 
@@ -201,7 +201,7 @@ 
         $table  = $this->getJoinTable($join, $alias);
 
         if (true === $field) {
-            $fields = $alias . '.*';
+            $fields = $alias.'.*';
         } else {
             if (is_string($field)) {
                 $field = explode(',', $field);
@@ -209,17 +209,17 @@ 
 
             foreach ($field as $key => $val) {
                 if (is_numeric($key)) {
-                    $fields[] = $alias . '.' . $val;
+                    $fields[] = $alias.'.'.$val;
 
-                    $this->options['map'][$val] = $alias . '.' . $val;
+                    $this->options['map'][$val] = $alias.'.'.$val;
                 } else {
                     if (preg_match('/[,=\.\'\"\(\s]/', $key)) {
                         $name = $key;
                     } else {
-                        $name = $alias . '.' . $key;
+                        $name = $alias.'.'.$key;
                     }
 
-                    $fields[] = $name . ' AS ' . $val;
+                    $fields[] = $name.' AS '.$val;
 
                     $this->options['map'][$val] = $name;
                 }