top-think / framework

src/think/Event.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;
 
@@ -214,7 +214,7 @@ 
 
         foreach ($events as $event) {
             $name   = false !== strpos($event, '\\') ? substr(strrchr($event, '\\'), 1) : $event;
-            $method = 'on' . $name;
+            $method = 'on'.$name;
 
             if (method_exists($observer, $method)) {
                 $this->listen($event, [$observer, $method]);

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());
         }
     }
 

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/Route.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;
 
@@ -175,9 +175,9 @@ 
             $this->cache = $this->app->cache->store(true === $this->config['route_check_cache'] ? '' : $this->config['route_check_cache']);
         }
 
-        if (is_file($this->app->getRuntimePath() . 'route.php')) {
+        if (is_file($this->app->getRuntimePath().'route.php')) {
             // 读取路由映射文件
-            $this->import(include $this->app->getRuntimePath() . 'route.php');
+            $this->import(include $this->app->getRuntimePath().'route.php');
         }
     }
 
@@ -390,13 +390,13 @@ 
         if (is_null($domain)) {
             $domain = $this->host;
         } elseif (false === strpos($domain, '.')) {
-            $domain .= '.' . $this->request->rootDomain();
+            $domain .= '.'.$this->request->rootDomain();
         }
 
         $subDomain = $this->request->subDomain();
 
         if (strpos($subDomain, '.')) {
-            $name = '*' . strstr($subDomain, '.');
+            $name = '*'.strstr($subDomain, '.');
         }
 
         if (isset($this->bind[$domain])) {
@@ -727,7 +727,7 @@ 
         $this->init();
 
         if ($withRoute) {
-            $checkCallback = function () use ($request, $withRoute) {
+            $checkCallback = function() use ($request, $withRoute) {
                 //加载路由
                 $withRoute();
                 return $this->check();
@@ -746,7 +746,7 @@ 
 
         $dispatch->init($this->app);
 
-        $this->app->middleware->add(function () use ($dispatch) {
+        $this->app->middleware->add(function() use ($dispatch) {
             try {
                 $response = $dispatch->run();
             } catch (HttpResponseException $exception) {
@@ -770,7 +770,7 @@ 
             $closure  = $this->config['route_check_cache_key'];
             $routeKey = $closure($request);
         } else {
-            $routeKey = md5($request->baseUrl(true) . ':' . $request->method());
+            $routeKey = md5($request->baseUrl(true).':'.$request->method());
         }
 
         return $routeKey;
@@ -820,10 +820,10 @@ 
             $path = $pathinfo;
         } elseif ($suffix) {
             // 去除正常的URL后缀
-            $path = preg_replace('/\.(' . ltrim($suffix, '.') . ')$/i', '', $pathinfo);
+            $path = preg_replace('/\.('.ltrim($suffix, '.').')$/i', '', $pathinfo);
         } else {
             // 允许任何后缀访问
-            $path = preg_replace('/\.' . $this->request->ext() . '$/i', '', $pathinfo);
+            $path = preg_replace('/\.'.$this->request->ext().'$/i', '', $pathinfo);
         }
 
         return $path;
@@ -866,9 +866,9 @@ 
                 $item = $this->domains[$this->host];
             } elseif (isset($this->domains[$subDomain])) {
                 $item = $this->domains[$subDomain];
-            } elseif (isset($this->domains['*.' . $domain2]) && !empty($domain3)) {
+            } elseif (isset($this->domains['*.'.$domain2]) && !empty($domain3)) {
                 // 泛三级域名
-                $item      = $this->domains['*.' . $domain2];
+                $item      = $this->domains['*.'.$domain2];
                 $panDomain = $domain3;
             } elseif (isset($this->domains['*']) && !empty($domain2)) {
                 // 泛二级域名