top-think / framework

library/think/Config.php

Spacing +7 added lines, -7 removed lines

@@ -117,8 +117,8 @@ 
     {
         if (is_file($file)) {
             $filename = $file;
-        } elseif (is_file($this->path . $file . $this->ext)) {
-            $filename = $this->path . $file . $this->ext;
+        } elseif (is_file($this->path.$file.$this->ext)) {
+            $filename = $this->path.$file.$this->ext;
         }
 
         if (isset($filename)) {
@@ -139,7 +139,7 @@ 
     protected function getYaconfName($name)
     {
         if ($this->yaconf && is_string($this->yaconf)) {
-            return $this->yaconf . '.' . $name;
+            return $this->yaconf.'.'.$name;
         }
 
         return $name;
@@ -188,7 +188,7 @@ 
     public function has($name)
     {
         if (false === strpos($name, '.')) {
-            $name = $this->prefix . '.' . $name;
+            $name = $this->prefix.'.'.$name;
         }
 
         return !is_null($this->get($name));
@@ -226,7 +226,7 @@ 
     public function get($name = null, $default = null)
     {
         if ($name && false === strpos($name, '.')) {
-            $name = $this->prefix . '.' . $name;
+            $name = $this->prefix.'.'.$name;
         }
 
         // 无参数时获取所有
@@ -273,7 +273,7 @@ 
     {
         if (is_string($name)) {
             if (false === strpos($name, '.')) {
-                $name = $this->prefix . '.' . $name;
+                $name = $this->prefix.'.'.$name;
             }
 
             $name = explode('.', $name, 3);
@@ -315,7 +315,7 @@ 
     public function remove($name)
     {
         if (false === strpos($name, '.')) {
-            $name = $this->prefix . '.' . $name;
+            $name = $this->prefix.'.'.$name;
         }
 
         $name = explode('.', $name, 3);

library/think/paginator/driver/Bootstrap.php

Spacing +3 added lines, -3 removed lines

@@ -136,7 +136,7 @@ 
      */
     protected function getAvailablePageWrapper($url, $page)
     {
-        return '<li><a href="' . htmlentities($url) . '">' . $page . '</a></li>';
+        return '<li><a href="'.htmlentities($url).'">'.$page.'</a></li>';
     }
 
     /**
@@ -147,7 +147,7 @@ 
      */
     protected function getDisabledTextWrapper($text)
     {
-        return '<li class="disabled"><span>' . $text . '</span></li>';
+        return '<li class="disabled"><span>'.$text.'</span></li>';
     }
 
     /**
@@ -158,7 +158,7 @@ 
      */
     protected function getActivePageWrapper($text)
     {
-        return '<li class="active"><span>' . $text . '</span></li>';
+        return '<li class="active"><span>'.$text.'</span></li>';
     }
 
     /**

library/think/session/driver/Redis.php

Spacing +6 added lines, -6 removed lines

@@ -95,7 +95,7 @@ 
      */
     public function read($sessID)
     {
-        return (string) $this->handler->get($this->config['session_name'] . $sessID);
+        return (string) $this->handler->get($this->config['session_name'].$sessID);
     }
 
     /**
@@ -108,9 +108,9 @@ 
     public function write($sessID, $sessData)
     {
         if ($this->config['expire'] > 0) {
-            $result = $this->handler->setex($this->config['session_name'] . $sessID, $this->config['expire'], $sessData);
+            $result = $this->handler->setex($this->config['session_name'].$sessID, $this->config['expire'], $sessData);
         } else {
-            $result = $this->handler->set($this->config['session_name'] . $sessID, $sessData);
+            $result = $this->handler->set($this->config['session_name'].$sessID, $sessData);
         }
 
         return $result ? true : false;
@@ -124,7 +124,7 @@ 
      */
     public function destroy($sessID)
     {
-        return $this->handler->delete($this->config['session_name'] . $sessID) > 0;
+        return $this->handler->delete($this->config['session_name'].$sessID) > 0;
     }
 
     /**
@@ -151,7 +151,7 @@ 
             $this->open('', '');
         }
 
-        $lockKey = 'LOCK_PREFIX_' . $sessID;
+        $lockKey = 'LOCK_PREFIX_'.$sessID;
         // 使用setnx操作加锁
         $isLock = $this->handler->setnx($lockKey, 1);
         if ($isLock) {
@@ -174,6 +174,6 @@ 
             $this->open('', '');
         }
 
-        $this->handler->del('LOCK_PREFIX_' . $sessID);
+        $this->handler->del('LOCK_PREFIX_'.$sessID);
     }
 }

library/think/session/driver/Memcached.php

Spacing +3 added lines, -3 removed lines

@@ -96,7 +96,7 @@ 
      */
     public function read($sessID)
     {
-        return (string) $this->handler->get($this->config['session_name'] . $sessID);
+        return (string) $this->handler->get($this->config['session_name'].$sessID);
     }
 
     /**
@@ -108,7 +108,7 @@ 
      */
     public function write($sessID, $sessData)
     {
-        return $this->handler->set($this->config['session_name'] . $sessID, $sessData, $this->config['expire']);
+        return $this->handler->set($this->config['session_name'].$sessID, $sessData, $this->config['expire']);
     }
 
     /**
@@ -119,7 +119,7 @@ 
      */
     public function destroy($sessID)
     {
-        return $this->handler->delete($this->config['session_name'] . $sessID);
+        return $this->handler->delete($this->config['session_name'].$sessID);
     }
 
     /**

library/think/session/driver/Memcache.php

Spacing +4 added lines, -5 removed lines

@@ -58,8 +58,7 @@ 
         foreach ((array) $hosts as $i => $host) {
             $port = isset($ports[$i]) ? $ports[$i] : $ports[0];
             $this->config['timeout'] > 0 ?
-            $this->handler->addServer($host, $port, $this->config['persistent'], 1, $this->config['timeout']) :
-            $this->handler->addServer($host, $port, $this->config['persistent'], 1);
+            $this->handler->addServer($host, $port, $this->config['persistent'], 1, $this->config['timeout']) : $this->handler->addServer($host, $port, $this->config['persistent'], 1);
         }
 
         return true;
@@ -85,7 +84,7 @@ 
      */
     public function read($sessID)
     {
-        return (string) $this->handler->get($this->config['session_name'] . $sessID);
+        return (string) $this->handler->get($this->config['session_name'].$sessID);
     }
 
     /**
@@ -97,7 +96,7 @@ 
      */
     public function write($sessID, $sessData)
     {
-        return $this->handler->set($this->config['session_name'] . $sessID, $sessData, 0, $this->config['expire']);
+        return $this->handler->set($this->config['session_name'].$sessID, $sessData, 0, $this->config['expire']);
     }
 
     /**
@@ -108,7 +107,7 @@ 
      */
     public function destroy($sessID)
     {
-        return $this->handler->delete($this->config['session_name'] . $sessID);
+        return $this->handler->delete($this->config['session_name'].$sessID);
     }
 
     /**

library/think/Model.php

Spacing +1 added lines, -1 removed lines

@@ -323,7 +323,7 @@
 
         // 全局作用域
         if (true === $useBaseQuery && method_exists($this, 'base')) {
-            call_user_func_array([$this, 'base'], [ & $query]);
+            call_user_func_array([$this, 'base'], [& $query]);
         }
 
         $globalScope = is_array($useBaseQuery) && $useBaseQuery ? $useBaseQuery : $this->globalScope;

library/think/File.php

Spacing +6 added lines, -6 removed lines

@@ -356,10 +356,10 @@ 
             return false;
         }
 
-        $path = rtrim($path, DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR;
+        $path = rtrim($path, DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR;
         // 文件保存命名规则
         $saveName = $this->buildSaveName($savename, $autoAppendExt);
-        $filename = $path . $saveName;
+        $filename = $path.$saveName;
 
         // 检测目录
         if (false === $this->checkPath(dirname($filename))) {
@@ -406,7 +406,7 @@ 
         }
 
         if ($autoAppendExt && false === strpos($savename, '.')) {
-            $savename .= '.' . pathinfo($this->getInfo('name'), PATHINFO_EXTENSION);
+            $savename .= '.'.pathinfo($this->getInfo('name'), PATHINFO_EXTENSION);
         }
 
         return $savename;
@@ -424,16 +424,16 @@ 
         } else {
             switch ($this->rule) {
                 case 'date':
-                    $savename = date('Ymd') . DIRECTORY_SEPARATOR . md5(microtime(true));
+                    $savename = date('Ymd').DIRECTORY_SEPARATOR.md5(microtime(true));
                     break;
                 default:
                     if (in_array($this->rule, hash_algos())) {
                         $hash     = $this->hash($this->rule);
-                        $savename = substr($hash, 0, 2) . DIRECTORY_SEPARATOR . substr($hash, 2);
+                        $savename = substr($hash, 0, 2).DIRECTORY_SEPARATOR.substr($hash, 2);
                     } elseif (is_callable($this->rule)) {
                         $savename = call_user_func($this->rule);
                     } else {
-                        $savename = date('Ymd') . DIRECTORY_SEPARATOR . md5(microtime(true));
+                        $savename = date('Ymd').DIRECTORY_SEPARATOR.md5(microtime(true));
                     }
             }
         }

library/think/Route.php

Spacing +8 added lines, -8 removed lines

@@ -327,7 +327,7 @@ 
         $domainName = is_array($name) ? array_shift($name) : $name;
 
         if ('*' != $domainName && false === strpos($domainName, '.')) {
-            $domainName .= '.' . $this->request->rootDomain();
+            $domainName .= '.'.$this->request->rootDomain();
         }
 
         if (!isset($this->domains[$domainName])) {
@@ -345,7 +345,7 @@ 
             $root = $this->request->rootDomain();
             foreach ($name as $item) {
                 if (false === strpos($item, '.')) {
-                    $item .= '.' . $root;
+                    $item .= '.'.$root;
                 }
 
                 $this->domains[$item] = $domainName;
@@ -395,13 +395,13 @@ 
         } elseif (true === $domain) {
             return $this->bind;
         } elseif (false === strpos($domain, '.')) {
-            $domain .= '.' . $this->request->rootDomain();
+            $domain .= '.'.$this->request->rootDomain();
         }
 
         $subDomain = $this->request->subDomain();
 
         if (strpos($subDomain, '.')) {
-            $name = '*' . strstr($subDomain, '.');
+            $name = '*'.strstr($subDomain, '.');
         }
 
         if (isset($this->bind[$domain])) {
@@ -709,10 +709,10 @@ 
         $group = new RuleGroup($this, $this->group, $rule, null, $option, $pattern);
 
         foreach ($this->methodPrefix as $type => $val) {
-            $group->addRule('<action>', $val . '<action>', $type);
+            $group->addRule('<action>', $val.'<action>', $type);
         }
 
-        return $group->prefix($route . '/');
+        return $group->prefix($route.'/');
     }
 
     /**
@@ -927,9 +927,9 @@ 
             if ($subDomain && 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)) {
                 // 泛二级域名

library/think/Console.php

Spacing +11 added lines, -11 removed lines

@@ -136,7 +136,7 @@ 
 
                 foreach ($files as $file) {
                     if (pathinfo($file, PATHINFO_EXTENSION) == 'php') {
-                        include $config['auto_path'] . $file;
+                        include $config['auto_path'].$file;
                     }
                 }
 
@@ -145,7 +145,7 @@ 
             }
         }
 
-        $file = Container::get('env')->get('app_path') . 'command.php';
+        $file = Container::get('env')->get('app_path').'command.php';
 
         if (is_file($file)) {
             $appCommands = include $file;
@@ -513,10 +513,10 @@ 
     public function findNamespace($namespace)
     {
         $allNamespaces = $this->getNamespaces();
-        $expr          = preg_replace_callback('{([^:]+|)}', function ($matches) {
-            return preg_quote($matches[1]) . '[^:]*';
+        $expr          = preg_replace_callback('{([^:]+|)}', function($matches) {
+            return preg_quote($matches[1]).'[^:]*';
         }, $namespace);
-        $namespaces = preg_grep('{^' . $expr . '}', $allNamespaces);
+        $namespaces = preg_grep('{^'.$expr.'}', $allNamespaces);
 
         if (empty($namespaces)) {
             $message = sprintf('There are no commands defined in the "%s" namespace.', $namespace);
@@ -553,13 +553,13 @@ 
     {
         $allCommands = array_keys($this->commands);
 
-        $expr = preg_replace_callback('{([^:]+|)}', function ($matches) {
-            return preg_quote($matches[1]) . '[^:]*';
+        $expr = preg_replace_callback('{([^:]+|)}', function($matches) {
+            return preg_quote($matches[1]).'[^:]*';
         }, $name);
 
-        $commands = preg_grep('{^' . $expr . '}', $allCommands);
+        $commands = preg_grep('{^'.$expr.'}', $allCommands);
 
-        if (empty($commands) || count(preg_grep('{^' . $expr . '$}', $commands)) < 1) {
+        if (empty($commands) || count(preg_grep('{^'.$expr.'$}', $commands)) < 1) {
             if (false !== $pos = strrpos($name, ':')) {
                 $this->findNamespace(substr($name, 0, $pos));
             }
@@ -779,7 +779,7 @@ 
             }
         }
 
-        $alternatives = array_filter($alternatives, function ($lev) use ($threshold) {
+        $alternatives = array_filter($alternatives, function($lev) use ($threshold) {
             return $lev < 2 * $threshold;
         });
         asort($alternatives);
@@ -810,7 +810,7 @@ 
 
         foreach ($parts as $part) {
             if (count($namespaces)) {
-                $namespaces[] = end($namespaces) . ':' . $part;
+                $namespaces[] = end($namespaces).':'.$part;
             } else {
                 $namespaces[] = $part;
             }