top-think / framework

src/think/service/ModelService.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\service;
 
@@ -25,7 +25,7 @@ 
         Model::setDb($this->app->db);
         Model::setEvent($this->app->event);
         Model::setInvoker([$this->app, 'invoke']);
-        Model::maker(function (Model $model) {
+        Model::maker(function(Model $model) {
             $config = $this->app->config;
 
             $isAutoWriteTimestamp = $model->getAutoWriteTimestamp();

src/think/cache/driver/Memcached.php

Spacing +2 added lines, -3 removed lines

@@ -8,7 +8,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think\cache\driver;
 
@@ -191,8 +191,7 @@ 
         $key = $this->getCacheKey($name);
 
         return false === $ttl ?
-            $this->handler->delete($key) :
-            $this->handler->delete($key, $ttl);
+            $this->handler->delete($key) : $this->handler->delete($key, $ttl);
     }
 
     /**

src/think/route/RuleItem.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;
 
@@ -134,7 +134,7 @@ 
         $rule = '/' != $rule ? ltrim($rule, '/') : '';
 
         if ($this->parent && $prefix = $this->parent->getFullName()) {
-            $rule = $prefix . ($rule ? '/' . ltrim($rule, '/') : '');
+            $rule = $prefix.($rule ? '/'.ltrim($rule, '/') : '');
         }
 
         if (false !== strpos($rule, ':')) {
@@ -237,7 +237,7 @@ 
 
         if (isset($option['ext'])) {
             // 路由ext参数 优先于系统配置的URL伪静态后缀参数
-            $url = preg_replace('/\.(' . $request->ext() . ')$/i', '', $url);
+            $url = preg_replace('/\.('.$request->ext().')$/i', '', $url);
         }
 
         return $url;
@@ -261,38 +261,38 @@ 
         $pattern = array_merge($this->parent->getPattern(), $this->pattern);
 
         // 检查完整规则定义
-        if (isset($pattern['__url__']) && !preg_match(0 === strpos($pattern['__url__'], '/') ? $pattern['__url__'] : '/^' . $pattern['__url__'] . ($completeMatch ? '$' : '') . '/', str_replace('|', $depr, $url))) {
+        if (isset($pattern['__url__']) && !preg_match(0 === strpos($pattern['__url__'], '/') ? $pattern['__url__'] : '/^'.$pattern['__url__'].($completeMatch ? '$' : '').'/', str_replace('|', $depr, $url))) {
             return false;
         }
 
         $var  = [];
-        $url  = $depr . str_replace('|', $depr, $url);
-        $rule = $depr . str_replace('/', $depr, $this->rule);
+        $url  = $depr.str_replace('|', $depr, $url);
+        $rule = $depr.str_replace('/', $depr, $this->rule);
 
         if ($depr == $rule && $depr != $url) {
             return false;
         }
 
         if (false === strpos($rule, '<')) {
-            if (0 === strcasecmp($rule, $url) || (!$completeMatch && 0 === strncasecmp($rule . $depr, $url . $depr, strlen($rule . $depr)))) {
+            if (0 === strcasecmp($rule, $url) || (!$completeMatch && 0 === strncasecmp($rule.$depr, $url.$depr, strlen($rule.$depr)))) {
                 return $var;
             }
             return false;
         }
 
-        $slash = preg_quote('/-' . $depr, '/');
+        $slash = preg_quote('/-'.$depr, '/');
 
-        if ($matchRule = preg_split('/[' . $slash . ']?<\w+\??>/', $rule, 2)) {
+        if ($matchRule = preg_split('/['.$slash.']?<\w+\??>/', $rule, 2)) {
             if ($matchRule[0] && 0 !== strncasecmp($rule, $url, strlen($matchRule[0]))) {
                 return false;
             }
         }
 
-        if (preg_match_all('/[' . $slash . ']?<?\w+\??>?/', $rule, $matches)) {
+        if (preg_match_all('/['.$slash.']?<?\w+\??>?/', $rule, $matches)) {
             $regex = $this->buildRuleRegex($rule, $matches[0], $pattern, $option, $completeMatch);
 
             try {
-                if (!preg_match('/^' . $regex . '/u', $url, $match)) {
+                if (!preg_match('/^'.$regex.'/u', $url, $match)) {
                     return false;
                 }
             } catch (\Exception $e) {

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