top-think / framework

library/think/Log.php

Spacing +1 added lines, -1 removed lines

@@ -120,7 +120,7 @@
         if (is_string($msg) && !empty($context)) {
             $replace = [];
             foreach ($context as $key => $val) {
-                $replace['{' . $key . '}'] = $val;
+                $replace['{'.$key.'}'] = $val;
             }
 
             $msg = strtr($msg, $replace);

library/think/Session.php

Spacing +3 added lines, -3 removed lines

@@ -188,11 +188,11 @@ 
 
         if (!empty($config['type'])) {
             // 读取session驱动
-            $class = false !== strpos($config['type'], '\\') ? $config['type'] : '\\think\\session\\driver\\' . ucwords($config['type']);
+            $class = false !== strpos($config['type'], '\\') ? $config['type'] : '\\think\\session\\driver\\'.ucwords($config['type']);
 
             // 检查驱动类
             if (!class_exists($class) || !session_set_save_handler(new $class($config))) {
-                throw new ClassNotFoundException('error session handler:' . $class, $class);
+                throw new ClassNotFoundException('error session handler:'.$class, $class);
             }
         }
 
@@ -301,7 +301,7 @@ 
 
         if (!empty($config['type']) && isset($config['use_lock']) && $config['use_lock']) {
             // 读取session驱动
-            $class = false !== strpos($config['type'], '\\') ? $config['type'] : '\\think\\session\\driver\\' . ucwords($config['type']);
+            $class = false !== strpos($config['type'], '\\') ? $config['type'] : '\\think\\session\\driver\\'.ucwords($config['type']);
 
             // 检查驱动类及类中是否存在 lock 和 unlock 函数
             if (class_exists($class) && method_exists($class, 'lock') && method_exists($class, 'unlock')) {

library/think/Loader.php

Spacing +28 added lines, -28 removed lines

@@ -65,11 +65,11 @@ 
 
         $path = realpath(dirname($scriptName));
 
-        if (!is_file($path . DIRECTORY_SEPARATOR . 'think')) {
+        if (!is_file($path.DIRECTORY_SEPARATOR.'think')) {
             $path = dirname($path);
         }
 
-        return $path . DIRECTORY_SEPARATOR;
+        return $path.DIRECTORY_SEPARATOR;
     }
 
     // 注册自动加载机制
@@ -80,12 +80,12 @@ 
 
         $rootPath = self::getRootPath();
 
-        self::$composerPath = $rootPath . 'vendor' . DIRECTORY_SEPARATOR . 'composer' . DIRECTORY_SEPARATOR;
+        self::$composerPath = $rootPath.'vendor'.DIRECTORY_SEPARATOR.'composer'.DIRECTORY_SEPARATOR;
 
         // Composer自动加载支持
         if (is_dir(self::$composerPath)) {
-            if (is_file(self::$composerPath . 'autoload_static.php')) {
-                require self::$composerPath . 'autoload_static.php';
+            if (is_file(self::$composerPath.'autoload_static.php')) {
+                require self::$composerPath.'autoload_static.php';
 
                 $declaredClass = get_declared_classes();
                 $composerClass = array_pop($declaredClass);
@@ -103,16 +103,16 @@ 
         // 注册命名空间定义
         self::addNamespace([
             'think'  => __DIR__,
-            'traits' => dirname(__DIR__) . DIRECTORY_SEPARATOR . 'traits',
+            'traits' => dirname(__DIR__).DIRECTORY_SEPARATOR.'traits',
         ]);
 
         // 加载类库映射文件
-        if (is_file($rootPath . 'runtime' . DIRECTORY_SEPARATOR . 'classmap.php')) {
-            self::addClassMap(__include_file($rootPath . 'runtime' . DIRECTORY_SEPARATOR . 'classmap.php'));
+        if (is_file($rootPath.'runtime'.DIRECTORY_SEPARATOR.'classmap.php')) {
+            self::addClassMap(__include_file($rootPath.'runtime'.DIRECTORY_SEPARATOR.'classmap.php'));
         }
 
         // 自动加载extend目录
-        self::addAutoLoadDir($rootPath . 'extend');
+        self::addAutoLoadDir($rootPath.'extend');
     }
 
     // 自动加载
@@ -148,14 +148,14 @@ 
         }
 
         // 查找 PSR-4
-        $logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR) . '.php';
+        $logicalPathPsr4 = strtr($class, '\\', DIRECTORY_SEPARATOR).'.php';
 
         $first = $class[0];
         if (isset(self::$prefixLengthsPsr4[$first])) {
             foreach (self::$prefixLengthsPsr4[$first] as $prefix => $length) {
                 if (0 === strpos($class, $prefix)) {
                     foreach (self::$prefixDirsPsr4[$prefix] as $dir) {
-                        if (is_file($file = $dir . DIRECTORY_SEPARATOR . substr($logicalPathPsr4, $length))) {
+                        if (is_file($file = $dir.DIRECTORY_SEPARATOR.substr($logicalPathPsr4, $length))) {
                             return $file;
                         }
                     }
@@ -165,7 +165,7 @@ 
 
         // 查找 PSR-4 fallback dirs
         foreach (self::$fallbackDirsPsr4 as $dir) {
-            if (is_file($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr4)) {
+            if (is_file($file = $dir.DIRECTORY_SEPARATOR.$logicalPathPsr4)) {
                 return $file;
             }
         }
@@ -177,14 +177,14 @@ 
             . strtr(substr($logicalPathPsr4, $pos + 1), '_', DIRECTORY_SEPARATOR);
         } else {
             // PEAR-like class name
-            $logicalPathPsr0 = strtr($class, '_', DIRECTORY_SEPARATOR) . '.php';
+            $logicalPathPsr0 = strtr($class, '_', DIRECTORY_SEPARATOR).'.php';
         }
 
         if (isset(self::$prefixesPsr0[$first])) {
             foreach (self::$prefixesPsr0[$first] as $prefix => $dirs) {
                 if (0 === strpos($class, $prefix)) {
                     foreach ($dirs as $dir) {
-                        if (is_file($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
+                        if (is_file($file = $dir.DIRECTORY_SEPARATOR.$logicalPathPsr0)) {
                             return $file;
                         }
                     }
@@ -194,7 +194,7 @@ 
 
         // 查找 PSR-0 fallback dirs
         foreach (self::$fallbackDirsPsr0 as $dir) {
-            if (is_file($file = $dir . DIRECTORY_SEPARATOR . $logicalPathPsr0)) {
+            if (is_file($file = $dir.DIRECTORY_SEPARATOR.$logicalPathPsr0)) {
                 return $file;
             }
         }
@@ -217,10 +217,10 @@ 
     {
         if (is_array($namespace)) {
             foreach ($namespace as $prefix => $paths) {
-                self::addPsr4($prefix . '\\', rtrim($paths, DIRECTORY_SEPARATOR), true);
+                self::addPsr4($prefix.'\\', rtrim($paths, DIRECTORY_SEPARATOR), true);
             }
         } else {
-            self::addPsr4($namespace . '\\', rtrim($path, DIRECTORY_SEPARATOR), true);
+            self::addPsr4($namespace.'\\', rtrim($path, DIRECTORY_SEPARATOR), true);
         }
     }
 
@@ -322,29 +322,29 @@ 
     // 注册composer自动加载
     public static function registerComposerLoader($composerPath)
     {
-        if (is_file($composerPath . 'autoload_namespaces.php')) {
-            $map = require $composerPath . 'autoload_namespaces.php';
+        if (is_file($composerPath.'autoload_namespaces.php')) {
+            $map = require $composerPath.'autoload_namespaces.php';
             foreach ($map as $namespace => $path) {
                 self::addPsr0($namespace, $path);
             }
         }
 
-        if (is_file($composerPath . 'autoload_psr4.php')) {
-            $map = require $composerPath . 'autoload_psr4.php';
+        if (is_file($composerPath.'autoload_psr4.php')) {
+            $map = require $composerPath.'autoload_psr4.php';
             foreach ($map as $namespace => $path) {
                 self::addPsr4($namespace, $path);
             }
         }
 
-        if (is_file($composerPath . 'autoload_classmap.php')) {
-            $classMap = require $composerPath . 'autoload_classmap.php';
+        if (is_file($composerPath.'autoload_classmap.php')) {
+            $classMap = require $composerPath.'autoload_classmap.php';
             if ($classMap) {
                 self::addClassMap($classMap);
             }
         }
 
-        if (is_file($composerPath . 'autoload_files.php')) {
-            self::$files = require $composerPath . 'autoload_files.php';
+        if (is_file($composerPath.'autoload_files.php')) {
+            self::$files = require $composerPath.'autoload_files.php';
         }
     }
 
@@ -372,7 +372,7 @@ 
     public static function parseName($name, $type = 0, $ucfirst = true)
     {
         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);
             return $ucfirst ? ucfirst($name) : lcfirst($name);
@@ -390,12 +390,12 @@ 
      */
     public static function factory($name, $namespace = '', ...$args)
     {
-        $class = false !== strpos($name, '\\') ? $name : $namespace . ucwords($name);
+        $class = false !== strpos($name, '\\') ? $name : $namespace.ucwords($name);
 
         if (class_exists($class)) {
             return Container::getInstance()->invokeClass($class, $args);
         } else {
-            throw new ClassNotFoundException('class not exists:' . $class, $class);
+            throw new ClassNotFoundException('class not exists:'.$class, $class);
         }
     }
 }

library/think/Container.php

Spacing +4 added lines, -4 removed lines

@@ -346,7 +346,7 @@ 
 
             return call_user_func_array($function, $args);
         } catch (ReflectionException $e) {
-            throw new Exception('function not exists: ' . $function . '()');
+            throw new Exception('function not exists: '.$function.'()');
         }
     }
 
@@ -376,7 +376,7 @@ 
                 $method[0] = get_class($method[0]);
             }
 
-            throw new Exception('method not exists: ' . (is_array($method) ? $method[0] . '::' . $method[1] : $method) . '()');
+            throw new Exception('method not exists: '.(is_array($method) ? $method[0].'::'.$method[1] : $method).'()');
         }
     }
 
@@ -439,7 +439,7 @@ 
             return $reflect->newInstanceArgs($args);
 
         } catch (ReflectionException $e) {
-            throw new ClassNotFoundException('class not exists: ' . $class, $class);
+            throw new ClassNotFoundException('class not exists: '.$class, $class);
         }
     }
 
@@ -477,7 +477,7 @@ 
             } elseif ($param->isDefaultValueAvailable()) {
                 $args[] = $param->getDefaultValue();
             } else {
-                throw new InvalidArgumentException('method param miss:' . $name);
+                throw new InvalidArgumentException('method param miss:'.$name);
             }
         }
 

library/think/Controller.php

Spacing +5 added lines, -6 removed lines

@@ -72,8 +72,7 @@ 
         // 前置操作方法 即将废弃
         foreach ((array) $this->beforeActionList as $method => $options) {
             is_numeric($method) ?
-            $this->beforeAction($options) :
-            $this->beforeAction($method, $options);
+            $this->beforeAction($options) : $this->beforeAction($method, $options);
         }
     }
 
@@ -89,11 +88,11 @@ 
                 $only = $except = null;
 
                 if (isset($val['only'])) {
-                    $only = array_map(function ($item) {
+                    $only = array_map(function($item) {
                         return strtolower($item);
                     }, $val['only']);
                 } elseif (isset($val['except'])) {
-                    $except = array_map(function ($item) {
+                    $except = array_map(function($item) {
                         return strtolower($item);
                     }, $val['except']);
                 }
@@ -124,7 +123,7 @@ 
                 $options['only'] = explode(',', $options['only']);
             }
 
-            $only = array_map(function ($val) {
+            $only = array_map(function($val) {
                 return strtolower($val);
             }, $options['only']);
 
@@ -136,7 +135,7 @@ 
                 $options['except'] = explode(',', $options['except']);
             }
 
-            $except = array_map(function ($val) {
+            $except = array_map(function($val) {
                 return strtolower($val);
             }, $options['except']);
 

library/think/view/driver/Think.php

Spacing +8 added lines, -8 removed lines

@@ -44,7 +44,7 @@ 
         $this->config = array_merge($this->config, (array) $config);
 
         if (empty($this->config['view_path'])) {
-            $this->config['view_path'] = $app->getModulePath() . 'view' . DIRECTORY_SEPARATOR;
+            $this->config['view_path'] = $app->getModulePath().'view'.DIRECTORY_SEPARATOR;
         }
 
         $this->template = new Template($app, $this->config);
@@ -83,12 +83,12 @@ 
 
         // 模板不存在 抛出异常
         if (!is_file($template)) {
-            throw new TemplateNotFoundException('template not exists:' . $template, $template);
+            throw new TemplateNotFoundException('template not exists:'.$template, $template);
         }
 
         // 记录视图信息
         $this->app
-            ->log('[ VIEW ] ' . $template . ' [ ' . var_export(array_keys($data), true) . ' ]');
+            ->log('[ VIEW ] '.$template.' [ '.var_export(array_keys($data), true).' ]');
 
         $this->template->fetch($template, $data, $config);
     }
@@ -126,9 +126,9 @@ 
         if ($this->config['view_base']) {
             // 基础视图目录
             $module = isset($module) ? $module : $request->module();
-            $path   = $this->config['view_base'] . ($module ? $module . DIRECTORY_SEPARATOR : '');
+            $path   = $this->config['view_base'].($module ? $module.DIRECTORY_SEPARATOR : '');
         } else {
-            $path = isset($module) ? $this->app->getAppPath() . $module . DIRECTORY_SEPARATOR . 'view' . DIRECTORY_SEPARATOR : $this->config['view_path'];
+            $path = isset($module) ? $this->app->getAppPath().$module.DIRECTORY_SEPARATOR.'view'.DIRECTORY_SEPARATOR : $this->config['view_path'];
         }
 
         $depr = $this->config['view_depr'];
@@ -140,16 +140,16 @@ 
             if ($controller) {
                 if ('' == $template) {
                     // 如果模板文件名为空 按照默认规则定位
-                    $template = str_replace('.', DIRECTORY_SEPARATOR, $controller) . $depr . $this->getActionTemplate($request);
+                    $template = str_replace('.', DIRECTORY_SEPARATOR, $controller).$depr.$this->getActionTemplate($request);
                 } elseif (false === strpos($template, $depr)) {
-                    $template = str_replace('.', DIRECTORY_SEPARATOR, $controller) . $depr . $template;
+                    $template = str_replace('.', DIRECTORY_SEPARATOR, $controller).$depr.$template;
                 }
             }
         } else {
             $template = str_replace(['/', ':'], $depr, substr($template, 1));
         }
 
-        return $path . ltrim($template, '/') . '.' . ltrim($this->config['view_suffix'], '.');
+        return $path.ltrim($template, '/').'.'.ltrim($this->config['view_suffix'], '.');
     }
 
     protected function getActionTemplate($request)

library/think/view/driver/Php.php

Spacing +9 added lines, -9 removed lines

@@ -73,14 +73,14 @@ 
 
         // 模板不存在 抛出异常
         if (!is_file($template)) {
-            throw new TemplateNotFoundException('template not exists:' . $template, $template);
+            throw new TemplateNotFoundException('template not exists:'.$template, $template);
         }
 
         $this->template = $template;
 
         // 记录视图信息
         $this->app
-            ->log('[ VIEW ] ' . $template . ' [ ' . var_export(array_keys($data), true) . ' ]');
+            ->log('[ VIEW ] '.$template.' [ '.var_export(array_keys($data), true).' ]');
 
         extract($data, EXTR_OVERWRITE);
         include $this->template;
@@ -98,7 +98,7 @@ 
         $this->content = $content;
 
         extract($data, EXTR_OVERWRITE);
-        eval('?>' . $this->content);
+        eval('?>'.$this->content);
     }
 
     /**
@@ -110,7 +110,7 @@ 
     private function parseTemplate($template)
     {
         if (empty($this->config['view_path'])) {
-            $this->config['view_path'] = $this->app->getModulePath() . 'view' . DIRECTORY_SEPARATOR;
+            $this->config['view_path'] = $this->app->getModulePath().'view'.DIRECTORY_SEPARATOR;
         }
 
         $request = $this->app['request'];
@@ -124,9 +124,9 @@ 
         if ($this->config['view_base']) {
             // 基础视图目录
             $module = isset($module) ? $module : $request->module();
-            $path   = $this->config['view_base'] . ($module ? $module . DIRECTORY_SEPARATOR : '');
+            $path   = $this->config['view_base'].($module ? $module.DIRECTORY_SEPARATOR : '');
         } else {
-            $path = isset($module) ? $this->app->getAppPath() . $module . DIRECTORY_SEPARATOR . 'view' . DIRECTORY_SEPARATOR : $this->config['view_path'];
+            $path = isset($module) ? $this->app->getAppPath().$module.DIRECTORY_SEPARATOR.'view'.DIRECTORY_SEPARATOR : $this->config['view_path'];
         }
 
         $depr = $this->config['view_depr'];
@@ -138,16 +138,16 @@ 
             if ($controller) {
                 if ('' == $template) {
                     // 如果模板文件名为空 按照默认规则定位
-                    $template = str_replace('.', DIRECTORY_SEPARATOR, $controller) . $depr . $this->getActionTemplate($request);
+                    $template = str_replace('.', DIRECTORY_SEPARATOR, $controller).$depr.$this->getActionTemplate($request);
                 } elseif (false === strpos($template, $depr)) {
-                    $template = str_replace('.', DIRECTORY_SEPARATOR, $controller) . $depr . $template;
+                    $template = str_replace('.', DIRECTORY_SEPARATOR, $controller).$depr.$template;
                 }
             }
         } else {
             $template = str_replace(['/', ':'], $depr, substr($template, 1));
         }
 
-        return $path . ltrim($template, '/') . '.' . ltrim($this->config['view_suffix'], '.');
+        return $path.ltrim($template, '/').'.'.ltrim($this->config['view_suffix'], '.');
     }
 
     protected function getActionTemplate($request)

library/think/Hook.php

Spacing +1 added lines, -1 removed lines

@@ -202,7 +202,7 @@
             }
 
             $call  = [$class, $method];
-            $class = $class . '->' . $method;
+            $class = $class.'->'.$method;
         }
 
         $result = $this->app->invoke($call, [$params]);

helper.php

Spacing +2 added lines, -2 removed lines

@@ -483,7 +483,7 @@ 
     function parse_name($name, $type = 0, $ucfirst = true)
     {
         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);
 
@@ -594,7 +594,7 @@ 
     {
         $token = Request::token($name, $type);
 
-        return '<input type="hidden" name="' . $name . '" value="' . $token . '" />';
+        return '<input type="hidden" name="'.$name.'" value="'.$token.'" />';
     }
 }