top-think / framework

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/Handle.php

Spacing +5 added lines, -5 removed lines

@@ -8,7 +8,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: yunwuxin <448901948@qq.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think\exception;
 
@@ -73,7 +73,7 @@ 
             }
 
             if ($this->app->config->get('log.record_trace')) {
-                $log .= PHP_EOL . $exception->getTraceAsString();
+                $log .= PHP_EOL.$exception->getTraceAsString();
             }
 
             $this->app->log->record($log, 'error');
@@ -213,7 +213,7 @@ 
         ob_start();
         $data = $this->convertExceptionToArray($exception);
         extract($data);
-        include $this->app->config->get('app.exception_tmpl') ?: __DIR__ . '/../../tpl/think_exception.tpl';
+        include $this->app->config->get('app.exception_tmpl') ?: __DIR__.'/../../tpl/think_exception.tpl';
 
         return ob_get_clean();
     }
@@ -255,10 +255,10 @@ 
 
         if (strpos($message, ':')) {
             $name    = strstr($message, ':', true);
-            $message = $lang->has($name) ? $lang->get($name) . strstr($message, ':') : $message;
+            $message = $lang->has($name) ? $lang->get($name).strstr($message, ':') : $message;
         } elseif (strpos($message, ',')) {
             $name    = strstr($message, ',', true);
-            $message = $lang->has($name) ? $lang->get($name) . ':' . substr(strstr($message, ','), 1) : $message;
+            $message = $lang->has($name) ? $lang->get($name).':'.substr(strstr($message, ','), 1) : $message;
         } elseif ($lang->has($message)) {
             $message = $lang->get($message);
         }

src/think/session/driver/File.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\session\driver;
 
@@ -39,7 +39,7 @@ 
         $this->config = array_merge($this->config, $config);
 
         if (empty($this->config['path'])) {
-            $this->config['path'] = $app->getRootPath() . 'runtime' . DIRECTORY_SEPARATOR . 'session' . DIRECTORY_SEPARATOR;
+            $this->config['path'] = $app->getRootPath().'runtime'.DIRECTORY_SEPARATOR.'session'.DIRECTORY_SEPARATOR;
         } elseif (substr($this->config['path'], -1) != DIRECTORY_SEPARATOR) {
             $this->config['path'] .= DIRECTORY_SEPARATOR;
         }
@@ -76,7 +76,7 @@ 
         $lifetime = $this->config['expire'];
         $now      = time();
 
-        $files = $this->findFiles($this->config['path'], function (SplFileInfo $item) use ($lifetime, $now) {
+        $files = $this->findFiles($this->config['path'], function(SplFileInfo $item) use ($lifetime, $now) {
             return $now - $lifetime > $item->getMTime();
         });
 
@@ -118,12 +118,12 @@ 
     {
         if ($this->config['prefix']) {
             // 使用子目录
-            $name = $this->config['prefix'] . DIRECTORY_SEPARATOR . 'sess_' . $name;
+            $name = $this->config['prefix'].DIRECTORY_SEPARATOR.'sess_'.$name;
         } else {
-            $name = 'sess_' . $name;
+            $name = 'sess_'.$name;
         }
 
-        $filename = $this->config['path'] . $name;
+        $filename = $this->config['path'].$name;
         $dir      = dirname($filename);
 
         if ($auto && !is_dir($dir)) {

src/think/route/dispatch/Controller.php

Spacing +11 added lines, -11 removed lines

@@ -8,7 +8,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think\route\dispatch;
 
@@ -53,7 +53,7 @@ 
 
         if (strpos($controller, '.')) {
             $pos              = strrpos($controller, '.');
-            $this->controller = substr($controller, 0, $pos) . '.' . Str::studly(substr($controller, $pos + 1));
+            $this->controller = substr($controller, 0, $pos).'.'.Str::studly(substr($controller, $pos + 1));
         } else {
             $this->controller = Str::studly($controller);
         }
@@ -73,7 +73,7 @@ 
             // 实例化控制器
             $instance = $this->controller($this->controller);
         } catch (ClassNotFoundException $e) {
-            throw new HttpException(404, 'controller not exists:' . $e->getClass());
+            throw new HttpException(404, 'controller not exists:'.$e->getClass());
         }
 
         // 注册控制器中间件
@@ -81,9 +81,9 @@ 
 
         return $this->app->middleware->pipeline('controller')
             ->send($this->request)
-            ->then(function () use ($instance) {
+            ->then(function() use ($instance) {
                 // 获取当前操作名
-                $action = $this->actionName . $this->rule->config('action_suffix');
+                $action = $this->actionName.$this->rule->config('action_suffix');
 
                 if (is_callable([$instance, $action])) {
                     $vars = $this->request->param();
@@ -99,7 +99,7 @@ 
                     }
                 } else {
                     // 操作不存在
-                    throw new HttpException(404, 'method not exists:' . get_class($instance) . '->' . $action . '()');
+                    throw new HttpException(404, 'method not exists:'.get_class($instance).'->'.$action.'()');
                 }
 
                 $data = $this->app->invokeReflectMethod($instance, $reflect, $vars);
@@ -126,11 +126,11 @@ 
 
             foreach ($middlewares as $key => $val) {
                 if (!is_int($key)) {
-                    if (isset($val['only']) && !in_array($this->request->action(true), array_map(function ($item) {
+                    if (isset($val['only']) && !in_array($this->request->action(true), array_map(function($item) {
                             return strtolower($item);
                         }, is_string($val['only']) ? explode(",", $val['only']) : $val['only']))) {
                         continue;
-                    } elseif (isset($val['except']) && in_array($this->request->action(true), array_map(function ($item) {
+                    } elseif (isset($val['except']) && in_array($this->request->action(true), array_map(function($item) {
                             return strtolower($item);
                         }, is_string($val['except']) ? explode(',', $val['except']) : $val['except']))) {
                         continue;
@@ -162,14 +162,14 @@ 
         $controllerLayer = $this->rule->config('controller_layer') ?: 'controller';
         $emptyController = $this->rule->config('empty_controller') ?: 'Error';
 
-        $class = $this->app->parseClass($controllerLayer, $name . $suffix);
+        $class = $this->app->parseClass($controllerLayer, $name.$suffix);
 
         if (class_exists($class)) {
             return $this->app->make($class, [], true);
-        } elseif ($emptyController && class_exists($emptyClass = $this->app->parseClass($controllerLayer, $emptyController . $suffix))) {
+        } elseif ($emptyController && class_exists($emptyClass = $this->app->parseClass($controllerLayer, $emptyController.$suffix))) {
             return $this->app->make($emptyClass, [], true);
         }
 
-        throw new ClassNotFoundException('class not exists:' . $class, $class);
+        throw new ClassNotFoundException('class not exists:'.$class, $class);
     }
 }

src/think/Route.php

Spacing +10 added lines, -10 removed lines

@@ -8,7 +8,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think;
 
@@ -160,9 +160,9 @@ 
         $this->ruleName = new RuleName();
         $this->setDefaultDomain();
 
-        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');
         }
     }
 
@@ -392,14 +392,14 @@ 
         if (is_null($domain)) {
             $domain = $this->host;
         } elseif (false === strpos($domain, '.') && $this->request) {
-            $domain .= '.' . $this->request->rootDomain();
+            $domain .= '.'.$this->request->rootDomain();
         }
 
         if ($this->request) {
             $subDomain = $this->request->subDomain();
 
             if (strpos($subDomain, '.')) {
-                $name = '*' . strstr($subDomain, '.');
+                $name = '*'.strstr($subDomain, '.');
             }
         }
 
@@ -743,7 +743,7 @@ 
 
         return $this->app->middleware->pipeline('route')
             ->send($request)
-            ->then(function () use ($dispatch) {
+            ->then(function() use ($dispatch) {
                 return $dispatch->run();
             });
     }
@@ -792,10 +792,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;
@@ -838,9 +838,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)) {
                 // 泛二级域名

src/think/console/command/Clear.php

Spacing +9 added lines, -9 removed lines

@@ -30,18 +30,18 @@ 
 
     protected function execute(Input $input, Output $output)
     {
-        $runtimePath = $this->app->getRootPath() . 'runtime' . DIRECTORY_SEPARATOR;
+        $runtimePath = $this->app->getRootPath().'runtime'.DIRECTORY_SEPARATOR;
 
         if ($input->getOption('cache')) {
-            $path = $runtimePath . 'cache';
+            $path = $runtimePath.'cache';
         } elseif ($input->getOption('log')) {
-            $path = $runtimePath . 'log';
+            $path = $runtimePath.'log';
         } else {
             $path = $input->getOption('path') ?: $runtimePath;
         }
 
         $rmdir = $input->getOption('dir') ? true : false;
-        $this->clear(rtrim($path, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR, $rmdir);
+        $this->clear(rtrim($path, DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR, $rmdir);
 
         $output->writeln("<info>Clear Successed</info>");
     }
@@ -51,13 +51,13 @@ 
         $files = is_dir($path) ? scandir($path) : [];
 
         foreach ($files as $file) {
-            if ('.' != $file && '..' != $file && is_dir($path . $file)) {
-                array_map('unlink', glob($path . $file . DIRECTORY_SEPARATOR . '*.*'));
+            if ('.' != $file && '..' != $file && is_dir($path.$file)) {
+                array_map('unlink', glob($path.$file.DIRECTORY_SEPARATOR.'*.*'));
                 if ($rmdir) {
-                    rmdir($path . $file);
+                    rmdir($path.$file);
                 }
-            } elseif ('.gitignore' != $file && is_file($path . $file)) {
-                unlink($path . $file);
+            } elseif ('.gitignore' != $file && is_file($path.$file)) {
+                unlink($path.$file);
             }
         }
     }

src/think/Manager.php

Spacing +3 added lines, -3 removed lines

@@ -8,7 +8,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: yunwuxin <448901948@qq.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think;
 
@@ -93,7 +93,7 @@ 
     protected function resolveClass(string $type): string
     {
         if ($this->namespace || false !== strpos($type, '\\')) {
-            $class = false !== strpos($type, '\\') ? $type : $this->namespace . Str::studly($type);
+            $class = false !== strpos($type, '\\') ? $type : $this->namespace.Str::studly($type);
 
             if (class_exists($class)) {
                 return $class;
@@ -125,7 +125,7 @@ 
     {
         $type = $this->resolveType($name);
 
-        $method = 'create' . Str::studly($type) . 'Driver';
+        $method = 'create'.Str::studly($type).'Driver';
 
         $params = $this->resolveParams($name);
 

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