top-think / framework

src/think/Filesystem.php

Spacing +2 added lines, -2 removed lines

@@ -8,7 +8,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: yunwuxin <448901948@qq.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think;
 
@@ -56,7 +56,7 @@ 
     public function getConfig(string $name = null, $default = null)
     {
         if (!is_null($name)) {
-            return $this->app->config->get('filesystem.' . $name, $default);
+            return $this->app->config->get('filesystem.'.$name, $default);
         }
 
         return $this->app->config->get('filesystem');

tests/ViewTest.php

Spacing +1 added lines, -1 removed lines

@@ -55,7 +55,7 @@
     {
         $this->config->shouldReceive("get")->with("view.type", 'php')->andReturn(TestTemplate::class);
 
-        $this->view->filter(function ($content) {
+        $this->view->filter(function($content) {
             return $content;
         });
 

src/think/View.php

Spacing +3 added lines, -3 removed lines

@@ -8,7 +8,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think;
 
@@ -86,7 +86,7 @@ 
      */
     public function fetch(string $template = '', array $vars = []): string
     {
-        return $this->getContent(function () use ($vars, $template) {
+        return $this->getContent(function() use ($vars, $template) {
             $this->engine()->fetch($template, array_merge($this->data, $vars));
         });
     }
@@ -100,7 +100,7 @@ 
      */
     public function display(string $content, array $vars = []): string
     {
-        return $this->getContent(function () use ($vars, $content) {
+        return $this->getContent(function() use ($vars, $content) {
             $this->engine()->display($content, array_merge($this->data, $vars));
         });
     }

tests/SessionTest.php

Spacing +2 added lines, -2 removed lines

@@ -43,11 +43,11 @@
         $this->config = m::mock(Config::class)->makePartial();
 
         $this->app->shouldReceive('get')->with('config')->andReturn($this->config);
-        $handlerClass = "\\think\\session\\driver\\Test" . Str::random(10);
+        $handlerClass = "\\think\\session\\driver\\Test".Str::random(10);
         $this->config->shouldReceive("get")->with("session.type", "file")->andReturn($handlerClass);
         $this->session = new Session($this->app);
 
-        $this->handler = m::mock('overload:' . $handlerClass, SessionHandlerInterface::class);
+        $this->handler = m::mock('overload:'.$handlerClass, SessionHandlerInterface::class);
     }
 
     public function testLoadData()

src/think/session/driver/Cache.php

Spacing +3 added lines, -3 removed lines

@@ -35,16 +35,16 @@
 
     public function read(string $sessionId): string
     {
-        return (string) $this->handler->get($this->prefix . $sessionId);
+        return (string) $this->handler->get($this->prefix.$sessionId);
     }
 
     public function delete(string $sessionId): bool
     {
-        return $this->handler->delete($this->prefix . $sessionId);
+        return $this->handler->delete($this->prefix.$sessionId);
     }
 
     public function write(string $sessionId, string $data): bool
     {
-        return $this->handler->set($this->prefix . $sessionId, $data, $this->expire);
+        return $this->handler->set($this->prefix.$sessionId, $data, $this->expire);
     }
 }

src/think/Session.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;
 
@@ -41,7 +41,7 @@ 
     public function getConfig(string $name = null, $default = null)
     {
         if (!is_null($name)) {
-            return $this->app->config->get('session.' . $name, $default);
+            return $this->app->config->get('session.'.$name, $default);
         }
 
         return $this->app->config->get('session');

src/helper.php

Spacing +13 added lines, -14 removed lines

@@ -8,7 +8,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 //------------------------
 // ThinkPHP 助手函数
@@ -190,12 +190,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;
@@ -274,8 +274,7 @@ 
         }
 
         return isset($has) ?
-        request()->has($key, $method) :
-        request()->$method($key, $default, $filter);
+        request()->has($key, $method) : request()->$method($key, $default, $filter);
     }
 }
 
@@ -352,7 +351,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);
 
@@ -459,7 +458,7 @@ 
     {
         $token = Request::buildToken($name, $type);
 
-        return '<input type="hidden" name="' . $name . '" value="' . $token . '" />';
+        return '<input type="hidden" name="'.$name.'" value="'.$token.'" />';
     }
 }
 
@@ -474,7 +473,7 @@ 
     {
         $token = Request::buildToken($name, $type);
 
-        return '<meta name="csrf-token" content="' . $token . '">';
+        return '<meta name="csrf-token" content="'.$token.'">';
     }
 }
 
@@ -599,7 +598,7 @@ 
      */
     function app_path($path = '')
     {
-        return app()->getAppPath() . ($path ? $path . DIRECTORY_SEPARATOR : $path);
+        return app()->getAppPath().($path ? $path.DIRECTORY_SEPARATOR : $path);
     }
 }
 
@@ -612,7 +611,7 @@ 
      */
     function base_path($path = '')
     {
-        return app()->getBasePath() . ($path ? $path . DIRECTORY_SEPARATOR : $path);
+        return app()->getBasePath().($path ? $path.DIRECTORY_SEPARATOR : $path);
     }
 }
 
@@ -625,7 +624,7 @@ 
      */
     function config_path($path = '')
     {
-        return app()->getConfigPath() . ($path ? $path . DIRECTORY_SEPARATOR : $path);
+        return app()->getConfigPath().($path ? $path.DIRECTORY_SEPARATOR : $path);
     }
 }
 
@@ -638,7 +637,7 @@ 
      */
     function public_path($path = '')
     {
-        return app()->getRootPath() . ($path ? ltrim($path, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR : $path);
+        return app()->getRootPath().($path ? ltrim($path, DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR : $path);
     }
 }
 
@@ -651,7 +650,7 @@ 
      */
     function runtime_path($path = '')
     {
-        return app()->getRuntimePath() . ($path ? $path . DIRECTORY_SEPARATOR : $path);
+        return app()->getRuntimePath().($path ? $path.DIRECTORY_SEPARATOR : $path);
     }
 }
 
@@ -664,6 +663,6 @@ 
      */
     function root_path($path = '')
     {
-        return app()->getRootPath() . ($path ? $path . DIRECTORY_SEPARATOR : $path);
+        return app()->getRootPath().($path ? $path.DIRECTORY_SEPARATOR : $path);
     }
 }

src/think/middleware/LoadLangPack.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\middleware;
 
@@ -48,7 +48,7 @@ 
         if ($this->lang->defaultLangSet() != $langset) {
             // 加载系统语言包
             $this->lang->load([
-                $this->app->getThinkPath() . 'lang' . DIRECTORY_SEPARATOR . $langset . '.php',
+                $this->app->getThinkPath().'lang'.DIRECTORY_SEPARATOR.$langset.'.php',
             ]);
 
             $this->app->LoadLangPack($langset);

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