top-think / framework

src/think/Log.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;
 
@@ -56,7 +56,7 @@ 
     public function getConfig(string $name = null, $default = null)
     {
         if (!is_null($name)) {
-            return $this->app->config->get('log.' . $name, $default);
+            return $this->app->config->get('log.'.$name, $default);
         }
 
         return $this->app->config->get('log');
@@ -180,7 +180,7 @@ 
      */
     public function record($msg, string $type = 'info', array $context = [], bool $lazy = true)
     {
-        $channel = $this->getConfig('type_channel.' . $type);
+        $channel = $this->getConfig('type_channel.'.$type);
 
         $this->channel($channel)->record($msg, $type, $context, $lazy);
 

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;
@@ -115,7 +115,7 @@ 
         $type   = $this->resolveType($name);
         $config = $this->resolveConfig($name);
 
-        $method = 'create' . Str::studly($type) . 'Driver';
+        $method = 'create'.Str::studly($type).'Driver';
 
         if (method_exists($this, $method)) {
             return $this->$method($config);

src/think/log/driver/File.php

Spacing +14 added lines, -15 removed lines

@@ -8,7 +8,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think\log\driver;
 
@@ -48,7 +48,7 @@ 
         }
 
         if (empty($this->config['path'])) {
-            $this->config['path'] = $app->getRuntimePath() . 'log';
+            $this->config['path'] = $app->getRuntimePath().'log';
         }
 
         if (substr($this->config['path'], -1) != DIRECTORY_SEPARATOR) {
@@ -82,8 +82,7 @@ 
                 }
 
                 $message[] = $this->config['json'] ?
-                    json_encode(['time' => $time, 'type' => $type, 'msg' => $msg], $this->config['json_options']) :
-                    sprintf($this->config['format'], $time, $type, $msg);
+                    json_encode(['time' => $time, 'type' => $type, 'msg' => $msg], $this->config['json_options']) : sprintf($this->config['format'], $time, $type, $msg);
             }
 
             if (true === $this->config['apart_level'] || in_array($type, $this->config['apart_level'])) {
@@ -121,7 +120,7 @@ 
             $info[$type] = is_array($msg) ? implode(PHP_EOL, $msg) : $msg;
         }
 
-        $message = implode(PHP_EOL, $info) . PHP_EOL;
+        $message = implode(PHP_EOL, $info).PHP_EOL;
 
         return error_log($message, 3, $destination);
     }
@@ -135,7 +134,7 @@ 
     {
 
         if ($this->config['max_files']) {
-            $files = glob($this->config['path'] . '*.log');
+            $files = glob($this->config['path'].'*.log');
 
             try {
                 if (count($files) > $this->config['max_files']) {
@@ -148,16 +147,16 @@ 
 
         if ($this->config['single']) {
             $name        = is_string($this->config['single']) ? $this->config['single'] : 'single';
-            $destination = $this->config['path'] . $name . '.log';
+            $destination = $this->config['path'].$name.'.log';
         } else {
 
             if ($this->config['max_files']) {
-                $filename = date('Ymd') . '.log';
+                $filename = date('Ymd').'.log';
             } else {
-                $filename = date('Ym') . DIRECTORY_SEPARATOR . date('d') . '.log';
+                $filename = date('Ym').DIRECTORY_SEPARATOR.date('d').'.log';
             }
 
-            $destination = $this->config['path'] . $filename;
+            $destination = $this->config['path'].$filename;
         }
 
         return $destination;
@@ -176,14 +175,14 @@ 
         if ($this->config['single']) {
             $name = is_string($this->config['single']) ? $this->config['single'] : 'single';
 
-            $name .= '_' . $type;
+            $name .= '_'.$type;
         } elseif ($this->config['max_files']) {
-            $name = date('Ymd') . '_' . $type;
+            $name = date('Ymd').'_'.$type;
         } else {
-            $name = date('d') . '_' . $type;
+            $name = date('d').'_'.$type;
         }
 
-        return $path . DIRECTORY_SEPARATOR . $name . '.log';
+        return $path.DIRECTORY_SEPARATOR.$name.'.log';
     }
 
     /**
@@ -196,7 +195,7 @@ 
     {
         if (is_file($destination) && floor($this->config['file_size']) <= filesize($destination)) {
             try {
-                rename($destination, dirname($destination) . DIRECTORY_SEPARATOR . time() . '-' . basename($destination));
+                rename($destination, dirname($destination).DIRECTORY_SEPARATOR.time().'-'.basename($destination));
             } catch (\Exception $e) {
                 //
             }

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

src/think/cache/Driver.php

Spacing +8 added lines, -8 removed lines

@@ -8,7 +8,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think\cache;
 
@@ -84,7 +84,7 @@ 
      */
     public function getCacheKey(string $name): string
     {
-        return $this->options['prefix'] . $name;
+        return $this->options['prefix'].$name;
     }
 
     /**
@@ -145,14 +145,14 @@ 
 
         $time = time();
 
-        while ($time + 5 > time() && $this->has($name . '_lock')) {
+        while ($time + 5 > time() && $this->has($name.'_lock')) {
             // 存在锁定则等待
             usleep(200000);
         }
 
         try {
             // 锁定
-            $this->set($name . '_lock', true);
+            $this->set($name.'_lock', true);
 
             if ($value instanceof Closure) {
                 // 获取缓存数据
@@ -163,9 +163,9 @@ 
             $this->set($name, $value, $expire);
 
             // 解锁
-            $this->delete($name . '_lock');
+            $this->delete($name.'_lock');
         } catch (Exception | throwable $e) {
-            $this->delete($name . '_lock');
+            $this->delete($name.'_lock');
             throw $e;
         }
 
@@ -184,7 +184,7 @@ 
         $key  = implode('-', $name);
 
         if (!isset($this->tag[$key])) {
-            $name            = array_map(function ($val) {
+            $name            = array_map(function($val) {
                 return $this->getTagKey($val);
             }, $name);
             $this->tag[$key] = new TagSet($name, $this);
@@ -212,7 +212,7 @@ 
      */
     public function getTagKey(string $tag): string
     {
-        return $this->options['tag_prefix'] . md5($tag);
+        return $this->options['tag_prefix'].md5($tag);
     }
 
     /**

src/think/cache/driver/File.php

Spacing +7 added lines, -7 removed lines

@@ -8,7 +8,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think\cache\driver;
 
@@ -48,7 +48,7 @@ 
         }
 
         if (empty($this->options['path'])) {
-            $this->options['path'] = $app->getRuntimePath() . 'cache';
+            $this->options['path'] = $app->getRuntimePath().'cache';
         }
 
         if (substr($this->options['path'], -1) != DIRECTORY_SEPARATOR) {
@@ -68,14 +68,14 @@ 
 
         if ($this->options['cache_subdir']) {
             // 使用子目录
-            $name = substr($name, 0, 2) . DIRECTORY_SEPARATOR . substr($name, 2);
+            $name = substr($name, 0, 2).DIRECTORY_SEPARATOR.substr($name, 2);
         }
 
         if ($this->options['prefix']) {
-            $name = $this->options['prefix'] . DIRECTORY_SEPARATOR . $name;
+            $name = $this->options['prefix'].DIRECTORY_SEPARATOR.$name;
         }
 
-        return $this->options['path'] . $name . '.php';
+        return $this->options['path'].$name.'.php';
     }
 
     /**
@@ -181,7 +181,7 @@ 
             $data = gzcompress($data, 3);
         }
 
-        $data   = "<?php\n//" . sprintf('%012d', $expire) . "\n exit();?>\n" . $data;
+        $data   = "<?php\n//".sprintf('%012d', $expire)."\n exit();?>\n".$data;
         $result = file_put_contents($filename, $data);
 
         if ($result) {
@@ -250,7 +250,7 @@ 
     {
         $this->writeTimes++;
 
-        $dirname = $this->options['path'] . $this->options['prefix'];
+        $dirname = $this->options['path'].$this->options['prefix'];
 
         $this->rmdir($dirname);
 

src/think/cache/driver/Memcache.php

Spacing +2 added lines, -4 removed lines

@@ -63,8 +63,7 @@ 
         foreach ($hosts as $i => $host) {
             $port = $ports[$i] ?? $ports[0];
             $this->options['timeout'] > 0 ?
-                $this->handler->addServer($host, (int) $port, $this->options['persistent'], 1, $this->options['timeout']) :
-                $this->handler->addServer($host, (int) $port, $this->options['persistent'], 1);
+                $this->handler->addServer($host, (int) $port, $this->options['persistent'], 1, $this->options['timeout']) : $this->handler->addServer($host, (int) $port, $this->options['persistent'], 1);
         }
     }
 
@@ -176,8 +175,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);
     }
 
     /**

tests/CacheTest.php

Spacing +3 added lines, -3 removed lines

@@ -118,10 +118,10 @@
         $redis->shouldReceive("del")->once()->with('baz')->andReturnTrue();
         $redis->shouldReceive("flushDB")->once()->andReturnTrue();
         $redis->shouldReceive("set")->once()->with('bar', \Opis\Closure\serialize('foobar'))->andReturnTrue();
-        $redis->shouldReceive("sAdd")->once()->with('tag:' . md5('foo'), 'bar')->andReturnTrue();
-        $redis->shouldReceive("sMembers")->once()->with('tag:' . md5('foo'))->andReturn(['bar']);
+        $redis->shouldReceive("sAdd")->once()->with('tag:'.md5('foo'), 'bar')->andReturnTrue();
+        $redis->shouldReceive("sMembers")->once()->with('tag:'.md5('foo'))->andReturn(['bar']);
         $redis->shouldReceive("del")->once()->with(['bar'])->andReturnTrue();
-        $redis->shouldReceive("del")->once()->with('tag:' . md5('foo'))->andReturnTrue();
+        $redis->shouldReceive("del")->once()->with('tag:'.md5('foo'))->andReturnTrue();
 
         $this->cache->set('foo', 5);
         $this->cache->inc('foo');

src/think/App.php

Spacing +26 added lines, -26 removed lines

@@ -8,7 +8,7 @@ 
 // +----------------------------------------------------------------------
 // | Author: liu21st <liu21st@gmail.com>
 // +----------------------------------------------------------------------
-declare (strict_types = 1);
+declare(strict_types=1);
 
 namespace think;
 
@@ -155,13 +155,13 @@ 
      */
     public function __construct(string $rootPath = '')
     {
-        $this->thinkPath   = dirname(__DIR__) . DIRECTORY_SEPARATOR;
-        $this->rootPath    = $rootPath ? rtrim($rootPath, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR : $this->getDefaultRootPath();
-        $this->appPath     = $this->rootPath . 'app' . DIRECTORY_SEPARATOR;
-        $this->runtimePath = $this->rootPath . 'runtime' . DIRECTORY_SEPARATOR;
+        $this->thinkPath   = dirname(__DIR__).DIRECTORY_SEPARATOR;
+        $this->rootPath    = $rootPath ? rtrim($rootPath, DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR : $this->getDefaultRootPath();
+        $this->appPath     = $this->rootPath.'app'.DIRECTORY_SEPARATOR;
+        $this->runtimePath = $this->rootPath.'runtime'.DIRECTORY_SEPARATOR;
 
-        if (is_file($this->appPath . 'provider.php')) {
-            $this->bind(include $this->appPath . 'provider.php');
+        if (is_file($this->appPath.'provider.php')) {
+            $this->bind(include $this->appPath.'provider.php');
         }
 
         static::setInstance($this);
@@ -221,7 +221,7 @@ 
     public function getService($service)
     {
         $name = is_string($service) ? $service : get_class($service);
-        return array_values(array_filter($this->services, function ($value) use ($name) {
+        return array_values(array_filter($this->services, function($value) use ($name) {
             return $value instanceof $name;
         }, ARRAY_FILTER_USE_BOTH))[0] ?? null;
     }
@@ -297,7 +297,7 @@ 
      */
     public function getBasePath(): string
     {
-        return $this->rootPath . 'app' . DIRECTORY_SEPARATOR;
+        return $this->rootPath.'app'.DIRECTORY_SEPARATOR;
     }
 
     /**
@@ -355,7 +355,7 @@ 
      */
     public function getConfigPath(): string
     {
-        return $this->rootPath . 'config' . DIRECTORY_SEPARATOR;
+        return $this->rootPath.'config'.DIRECTORY_SEPARATOR;
     }
 
     /**
@@ -401,8 +401,8 @@ 
         $this->beginMem  = memory_get_usage();
 
         // 加载环境变量
-        if (is_file($this->rootPath . '.env')) {
-            $this->env->load($this->rootPath . '.env');
+        if (is_file($this->rootPath.'.env')) {
+            $this->env->load($this->rootPath.'.env');
         }
 
         $this->configExt = $this->env->get('config_ext', '.php');
@@ -415,7 +415,7 @@ 
         // 加载框架默认语言包
         $langSet = $this->lang->defaultLangSet();
 
-        $this->lang->load($this->thinkPath . 'lang' . DIRECTORY_SEPARATOR . $langSet . '.php');
+        $this->lang->load($this->thinkPath.'lang'.DIRECTORY_SEPARATOR.$langSet.'.php');
 
         // 加载应用默认语言包
         $this->loadLangPack($langSet);
@@ -454,7 +454,7 @@ 
         }
 
         // 加载系统语言包
-        $files = glob($this->appPath . 'lang' . DIRECTORY_SEPARATOR . $langset . '.*');
+        $files = glob($this->appPath.'lang'.DIRECTORY_SEPARATOR.$langset.'.*');
         $this->lang->load($files);
 
         // 加载扩展（自定义）语言包
@@ -472,7 +472,7 @@ 
      */
     public function boot(): void
     {
-        array_walk($this->services, function ($service) {
+        array_walk($this->services, function($service) {
             $this->bootService($service);
         });
     }
@@ -486,30 +486,30 @@ 
     {
         $appPath = $this->getAppPath();
 
-        if (is_file($appPath . 'common.php')) {
-            include_once $appPath . 'common.php';
+        if (is_file($appPath.'common.php')) {
+            include_once $appPath.'common.php';
         }
 
-        include_once $this->thinkPath . 'helper.php';
+        include_once $this->thinkPath.'helper.php';
 
         $configPath = $this->getConfigPath();
 
         $files = [];
 
         if (is_dir($configPath)) {
-            $files = glob($configPath . '*' . $this->configExt);
+            $files = glob($configPath.'*'.$this->configExt);
         }
 
         foreach ($files as $file) {
             $this->config->load($file, pathinfo($file, PATHINFO_FILENAME));
         }
 
-        if (is_file($appPath . 'event.php')) {
-            $this->loadEvent(include $appPath . 'event.php');
+        if (is_file($appPath.'event.php')) {
+            $this->loadEvent(include $appPath.'event.php');
         }
 
-        if (is_file($appPath . 'service.php')) {
-            $services = include $appPath . 'service.php';
+        if (is_file($appPath.'service.php')) {
+            $services = include $appPath.'service.php';
             foreach ($services as $service) {
                 $this->register($service);
             }
@@ -574,9 +574,9 @@ 
         $name  = str_replace(['/', '.'], '\\', $name);
         $array = explode('\\', $name);
         $class = Str::studly(array_pop($array));
-        $path  = $array ? implode('\\', $array) . '\\' : '';
+        $path  = $array ? implode('\\', $array).'\\' : '';
 
-        return $this->namespace . '\\' . $layer . '\\' . $path . $class;
+        return $this->namespace.'\\'.$layer.'\\'.$path.$class;
     }
 
     /**
@@ -597,7 +597,7 @@ 
     {
         $path = dirname(dirname(dirname(dirname($this->thinkPath))));
 
-        return $path . DIRECTORY_SEPARATOR;
+        return $path.DIRECTORY_SEPARATOR;
     }
 
 }