top-think / framework

src/think/Pipeline.php

Spacing +3 added lines, -3 removed lines

@@ -54,7 +54,7 @@ 
         $pipeline = array_reduce(
             array_reverse($this->pipes),
             $this->carry(),
-            function ($passable) use ($destination) {
+            function($passable) use ($destination) {
                 try {
                     return $destination($passable);
                 } catch (Throwable | Exception $e) {
@@ -78,8 +78,8 @@ 
 
     protected function carry()
     {
-        return function ($stack, $pipe) {
-            return function ($passable) use ($stack, $pipe) {
+        return function($stack, $pipe) {
+            return function($passable) use ($stack, $pipe) {
                 try {
                     return $pipe($passable, $stack);
                 } catch (Throwable | Exception $e) {

tests/DbTest.php

Spacing +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
         $config->shouldReceive('get')->with('database', [])->andReturn([]);
         $this->assertEquals([], $db->getConfig());
 
-        $callback = function () {
+        $callback = function() {
         };
         $event->shouldReceive('listen')->with('db.some', $callback);
         $db->event('some', $callback);

tests/HttpTest.php

Spacing +3 added lines, -3 removed lines

@@ -47,7 +47,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();
             }
@@ -77,8 +77,8 @@ 
             ],
         ]);
 
-        $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();

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

Spacing +13 added lines, -13 removed lines

@@ -48,21 +48,21 @@ 
             $tables = $this->app->db->getConnection()->getTables($dbName);
         } else {
             if ($dir) {
-                $appPath   = $this->app->getBasePath() . $dir . DIRECTORY_SEPARATOR;
-                $namespace = 'app\\' . $dir;
+                $appPath   = $this->app->getBasePath().$dir.DIRECTORY_SEPARATOR;
+                $namespace = 'app\\'.$dir;
             } else {
                 $appPath   = $this->app->getBasePath();
                 $namespace = 'app';
             }
 
-            $path = $appPath . 'model';
+            $path = $appPath.'model';
             $list = is_dir($path) ? scandir($path) : [];
 
             foreach ($list as $file) {
                 if (0 === strpos($file, '.')) {
                     continue;
                 }
-                $class = '\\' . $namespace . '\\model\\' . pathinfo($file, PATHINFO_FILENAME);
+                $class = '\\'.$namespace.'\\model\\'.pathinfo($file, PATHINFO_FILENAME);
                 $this->buildModelSchema($class);
             }
 
@@ -70,7 +70,7 @@ 
             return;
         }
 
-        $db = isset($dbName) ? $dbName . '.' : '';
+        $db = isset($dbName) ? $dbName.'.' : '';
         $this->buildDataBaseSchema($schemaPath, $tables, $db);
 
         $output->writeln('<info>Succeed!</info>');
@@ -89,27 +89,27 @@ 
             if (!is_dir($path)) {
                 mkdir($path, 0755, true);
             }
-            $content = '<?php ' . PHP_EOL . 'return ';
+            $content = '<?php '.PHP_EOL.'return ';
             $info    = $model->db()->getConnection()->getTableFieldsInfo($table);
-            $content .= var_export($info, true) . ';';
+            $content .= var_export($info, true).';';
 
-            file_put_contents($path . $dbName . '.' . $table . '.php', $content);
+            file_put_contents($path.$dbName.'.'.$table.'.php', $content);
         }
     }
 
     protected function buildDataBaseSchema(string $path, array $tables, string $db): void
     {
         if ('' == $db) {
-            $dbName = $this->app->db->getConnection()->getConfig('database') . '.';
+            $dbName = $this->app->db->getConnection()->getConfig('database').'.';
         } else {
             $dbName = $db;
         }
 
         foreach ($tables as $table) {
-            $content = '<?php ' . PHP_EOL . 'return ';
-            $info    = $this->app->db->getConnection()->getTableFieldsInfo($db . $table);
-            $content .= var_export($info, true) . ';';
-            file_put_contents($path . $dbName . $table . '.php', $content);
+            $content = '<?php '.PHP_EOL.'return ';
+            $info    = $this->app->db->getConnection()->getTableFieldsInfo($db.$table);
+            $content .= var_export($info, true).';';
+            file_put_contents($path.$dbName.$table.'.php', $content);
         }
     }
 }

src/think/console/command/RouteList.php

Spacing +6 added lines, -6 removed lines

@@ -42,7 +42,7 @@ 
     {
         $dir = $input->getArgument('dir') ?: '';
 
-        $filename = $this->app->getRootPath() . 'runtime' . DIRECTORY_SEPARATOR . ($dir ? $dir . DIRECTORY_SEPARATOR : '') . 'route_list.php';
+        $filename = $this->app->getRootPath().'runtime'.DIRECTORY_SEPARATOR.($dir ? $dir.DIRECTORY_SEPARATOR : '').'route_list.php';
 
         if (is_file($filename)) {
             unlink($filename);
@@ -51,7 +51,7 @@ 
         }
 
         $content = $this->getRouteList($dir);
-        file_put_contents($filename, 'Route List' . PHP_EOL . $content);
+        file_put_contents($filename, 'Route List'.PHP_EOL.$content);
     }
 
     protected function getRouteList(string $dir = null): string
@@ -60,16 +60,16 @@ 
         $this->app->route->clear();
 
         if ($dir) {
-            $path = $this->app->getRootPath() . 'route' . DIRECTORY_SEPARATOR . $dir . DIRECTORY_SEPARATOR;
+            $path = $this->app->getRootPath().'route'.DIRECTORY_SEPARATOR.$dir.DIRECTORY_SEPARATOR;
         } else {
-            $path = $this->app->getRootPath() . 'route' . DIRECTORY_SEPARATOR;
+            $path = $this->app->getRootPath().'route'.DIRECTORY_SEPARATOR;
         }
 
         $files = is_dir($path) ? scandir($path) : [];
 
         foreach ($files as $file) {
             if (strpos($file, '.php')) {
-                include $path . $file;
+                include $path.$file;
             }
         }
 
@@ -108,7 +108,7 @@ 
                 $sort = $this->sortBy[$sort];
             }
 
-            uasort($rows, function ($a, $b) use ($sort) {
+            uasort($rows, function($a, $b) use ($sort) {
                 $itemA = $a[$sort] ?? null;
                 $itemB = $b[$sort] ?? null;
 

tests/MiddlewareTest.php

Spacing +6 added lines, -6 removed lines

@@ -64,9 +64,9 @@ 
 
         $this->middleware->add('foo');
         $this->assertEquals(3, count($this->middleware->all()));
-        $this->middleware->add(function () {
+        $this->middleware->add(function() {
         });
-        $this->middleware->add(function () {
+        $this->middleware->add(function() {
         });
         $this->assertEquals(5, count($this->middleware->all()));
     }
@@ -85,10 +85,10 @@ 
         $handle->shouldReceive('report')->with($e)->andReturnNull();
         $handle->shouldReceive('render')->with($request, $e)->andReturn($response);
 
-        $foo->shouldReceive('handle')->once()->andReturnUsing(function ($request, $next) {
+        $foo->shouldReceive('handle')->once()->andReturnUsing(function($request, $next) {
             return $next($request);
         });
-        $bar->shouldReceive('handle')->once()->andReturnUsing(function ($request, $next) use ($e) {
+        $bar->shouldReceive('handle')->once()->andReturnUsing(function($request, $next) use ($e) {
             $next($request);
             throw  $e;
         });
@@ -99,13 +99,13 @@ 
 
         $this->config->shouldReceive('get')->once()->with('middleware.priority', [])->andReturn(['FooMiddleware', 'BarMiddleware']);
 
-        $this->middleware->import([function ($request, $next) {
+        $this->middleware->import([function($request, $next) {
             return $next($request);
         }, 'BarMiddleware', 'FooMiddleware']);
 
         $this->assertInstanceOf(Pipeline::class, $pipeline = $this->middleware->pipeline());
 
-        $pipeline->send($request)->then(function ($request) use ($e, $response) {
+        $pipeline->send($request)->then(function($request) use ($e, $response) {
             throw $e;
         });
 

src/think/exception/FuncNotFoundException.php

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
     public function __construct(string $message, string $func = '', Throwable $previous = null)
     {
         $this->message = $message;
-        $this->func   = $func;
+        $this->func = $func;
 
         parent::__construct($message, 0, $previous);
     }

tests/ContainerTest.php

Spacing +12 added lines, -12 removed lines

@@ -63,7 +63,7 @@ 
 
         Container::setInstance($container);
 
-        $container->bind('name', function () {
+        $container->bind('name', function() {
             return 'Taylor';
         });
 
@@ -80,7 +80,7 @@ 
         $this->expectExceptionMessage('class not exists: name');
         $container->get('name');
 
-        $container->bind('name', function () {
+        $container->bind('name', function() {
             return 'Taylor';
         });
 
@@ -91,7 +91,7 @@ 
     {
         $container = new Container;
 
-        $container->bind('name', function () {
+        $container->bind('name', function() {
             return 'Taylor';
         });
 
@@ -106,7 +106,7 @@ 
     {
         $container = new Container;
 
-        $container->bind('name', function () {
+        $container->bind('name', function() {
             return 'Taylor';
         });
 
@@ -198,7 +198,7 @@ 
 
         $this->assertSame($object, Container::getInstance());
 
-        Container::setInstance(function () {
+        Container::setInstance(function() {
             return $this;
         });
 
@@ -210,10 +210,10 @@ 
         $container = new Container();
         $container->bind(Container::class, $container);
 
-        $container->resolving(function (SomeClass $taylor, Container $container) {
+        $container->resolving(function(SomeClass $taylor, Container $container) {
             $taylor->count++;
         });
-        $container->resolving(SomeClass::class, function (SomeClass $taylor, Container $container) {
+        $container->resolving(SomeClass::class, function(SomeClass $taylor, Container $container) {
             $taylor->count++;
         });
 
@@ -252,19 +252,19 @@ 
 
         $this->assertEquals('48', $container->invoke('ord', ['0']));
 
-        $this->assertSame($container, $container->invoke(Taylor::class . '::test', []));
+        $this->assertSame($container, $container->invoke(Taylor::class.'::test', []));
 
-        $this->assertSame($container, $container->invokeMethod(Taylor::class . '::test'));
+        $this->assertSame($container, $container->invokeMethod(Taylor::class.'::test'));
 
         $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 . '::test'));
+        $this->assertSame($container, $container->invoke(Taylor::class.'::test'));
 
         $object = $container->invokeClass(SomeClass::class);
         $this->assertInstanceOf(SomeClass::class, $object);
@@ -272,7 +272,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);

tests/CacheTest.php

Spacing +3 added lines, -3 removed lines

@@ -126,10 +126,10 @@
         $redis->shouldReceive("del")->once()->with('baz')->andReturnTrue();
         $redis->shouldReceive("flushDB")->once()->andReturnTrue();
         $redis->shouldReceive("set")->once()->with('bar', serialize('foobar'))->andReturnTrue();
-        $redis->shouldReceive("sAdd")->once()->with('tag:' . md5('foo'), 'bar')->andReturnTrue();
-        $redis->shouldReceive("sMembers")->once()->with('tag:' . md5('foo'))->andReturn(['bar']);
+        $redis->shouldReceive("sAdd")->once()->with('tag:'.md5('foo'), 'bar')->andReturnTrue();
+        $redis->shouldReceive("sMembers")->once()->with('tag:'.md5('foo'))->andReturn(['bar']);
         $redis->shouldReceive("del")->once()->with(['bar'])->andReturnTrue();
-        $redis->shouldReceive("del")->once()->with('tag:' . md5('foo'))->andReturnTrue();
+        $redis->shouldReceive("del")->once()->with('tag:'.md5('foo'))->andReturnTrue();
 
         $this->cache->set('foo', 5);
         $this->cache->inc('foo');