top-think / framework

src/helper.php

Spacing +7 added lines, -8 removed lines

@@ -8,7 +8,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 //------------------------
 // ThinkPHP 助手函数
@@ -221,12 +221,12 @@ 
         $output = preg_replace('/\]\=\>\n(\s+)/m', '] => ', $output);
 
         if (PHP_SAPI == 'cli') {
-            $output = PHP_EOL . $output . PHP_EOL;
+            $output = PHP_EOL.$output.PHP_EOL;
         } else {
             if (!extension_loaded('xdebug')) {
                 $output = htmlspecialchars($output, ENT_SUBSTITUTE);
             }
-            $output = '<pre>' . $output . '</pre>';
+            $output = '<pre>'.$output.'</pre>';
         }
 
         echo $output;
@@ -305,8 +305,7 @@ 
         }
 
         return isset($has) ?
-        request()->has($key, $method) :
-        request()->$method($key, $default, $filter);
+        request()->has($key, $method) : request()->$method($key, $default, $filter);
     }
 }
 
@@ -383,7 +382,7 @@ 
     function parse_name(string $name, int $type = 0, bool $ucfirst = true): string
     {
         if ($type) {
-            $name = preg_replace_callback('/_([a-zA-Z])/', function ($match) {
+            $name = preg_replace_callback('/_([a-zA-Z])/', function($match) {
                 return strtoupper($match[1]);
             }, $name);
 
@@ -488,7 +487,7 @@ 
     {
         $token = Request::buildToken($name, $type);
 
-        return '<input type="hidden" name="' . $name . '" value="' . $token . '" />';
+        return '<input type="hidden" name="'.$name.'" value="'.$token.'" />';
     }
 }
 
@@ -503,7 +502,7 @@ 
     {
         $token = Request::buildToken($name, $type);
 
-        return '<meta name="csrf-token" content="' . $token . '">';
+        return '<meta name="csrf-token" content="'.$token.'">';
     }
 }
 

tests/DbTest.php

Spacing +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
      */
     public function testConnect($config)
     {
-        $mysql = m::mock('overload:' . Mysql::class);
+        $mysql = m::mock('overload:'.Mysql::class);
 
         $db = new Db($config);
     }

tests/AppTest.php

Spacing +11 added lines, -11 removed lines

@@ -107,27 +107,27 @@ 
 
     public function testPath()
     {
-        $rootPath = __DIR__ . DIRECTORY_SEPARATOR;
+        $rootPath = __DIR__.DIRECTORY_SEPARATOR;
 
         $app = new App($rootPath);
 
         $this->assertEquals($rootPath, $app->getRootPath());
 
-        $this->assertEquals(dirname(__DIR__) . DIRECTORY_SEPARATOR . 'src' . DIRECTORY_SEPARATOR, $app->getThinkPath());
+        $this->assertEquals(dirname(__DIR__).DIRECTORY_SEPARATOR.'src'.DIRECTORY_SEPARATOR, $app->getThinkPath());
 
-        $this->assertEquals($rootPath . 'app' . DIRECTORY_SEPARATOR, $app->getAppPath());
+        $this->assertEquals($rootPath.'app'.DIRECTORY_SEPARATOR, $app->getAppPath());
 
-        $appPath = $rootPath . 'app' . DIRECTORY_SEPARATOR . 'admin' . DIRECTORY_SEPARATOR;
+        $appPath = $rootPath.'app'.DIRECTORY_SEPARATOR.'admin'.DIRECTORY_SEPARATOR;
         $app->setAppPath($appPath);
         $this->assertEquals($appPath, $app->getAppPath());
 
-        $this->assertEquals($rootPath . 'app' . DIRECTORY_SEPARATOR, $app->getBasePath());
+        $this->assertEquals($rootPath.'app'.DIRECTORY_SEPARATOR, $app->getBasePath());
 
-        $this->assertEquals($rootPath . 'config' . DIRECTORY_SEPARATOR, $app->getConfigPath());
+        $this->assertEquals($rootPath.'config'.DIRECTORY_SEPARATOR, $app->getConfigPath());
 
-        $this->assertEquals($rootPath . 'runtime' . DIRECTORY_SEPARATOR, $app->getRuntimePath());
+        $this->assertEquals($rootPath.'runtime'.DIRECTORY_SEPARATOR, $app->getRuntimePath());
 
-        $runtimePath = $rootPath . 'runtime' . DIRECTORY_SEPARATOR . 'admin' . DIRECTORY_SEPARATOR;
+        $runtimePath = $rootPath.'runtime'.DIRECTORY_SEPARATOR.'admin'.DIRECTORY_SEPARATOR;
         $app->setRuntimePath($runtimePath);
         $this->assertEquals($runtimePath, $app->getRuntimePath());
     }
@@ -139,7 +139,7 @@ 
      */
     protected function prepareAppForInitialize(vfsStreamDirectory $root, $debug = true)
     {
-        $rootPath = $root->url() . DIRECTORY_SEPARATOR;
+        $rootPath = $root->url().DIRECTORY_SEPARATOR;
 
         $app = new App($rootPath);
 
@@ -148,12 +148,12 @@ 
 
         $app->instance($initializer->mockery_getName(), $initializer);
 
-        (function () use ($initializer) {
+        (function() use ($initializer) {
             $this->initializers = [$initializer->mockery_getName()];
         })->call($app);
 
         $env = m::mock(Env::class);
-        $env->shouldReceive('load')->once()->with($rootPath . '.env');
+        $env->shouldReceive('load')->once()->with($rootPath.'.env');
         $env->shouldReceive('get')->once()->with('config_ext', '.php')->andReturn('.php');
         $env->shouldReceive('get')->once()->with('app_debug')->andReturn($debug);
 

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;