Completed
Pull Request — 6.0 (#1913)
by yun
09:37 queued 04:47
created
src/think/cache/TagSet.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -8,7 +8,7 @@
 block discarded – undo
8 8
 // +----------------------------------------------------------------------
9 9
 // | Author: liu21st <[email protected]>
10 10
 // +----------------------------------------------------------------------
11
-declare (strict_types = 1);
11
+declare(strict_types=1);
12 12
 
13 13
 namespace think\cache;
14 14
 
Please login to merge, or discard this patch.
src/think/session/driver/Memcached.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -8,7 +8,7 @@  discard block
 block discarded – undo
8 8
 // +----------------------------------------------------------------------
9 9
 // | Author: liu21st <[email protected]>
10 10
 // +----------------------------------------------------------------------
11
-declare (strict_types = 1);
11
+declare(strict_types=1);
12 12
 
13 13
 namespace think\session\driver;
14 14
 
@@ -89,7 +89,7 @@  discard block
 block discarded – undo
89 89
      */
90 90
     public function read(string $sessID): string
91 91
     {
92
-        return (string) $this->handler->get($this->config['prefix'] . $sessID);
92
+        return (string) $this->handler->get($this->config['prefix'].$sessID);
93 93
     }
94 94
 
95 95
     /**
@@ -101,7 +101,7 @@  discard block
 block discarded – undo
101 101
      */
102 102
     public function write(string $sessID, string $data): bool
103 103
     {
104
-        return $this->handler->set($this->config['prefix'] . $sessID, $data, $this->config['expire']);
104
+        return $this->handler->set($this->config['prefix'].$sessID, $data, $this->config['expire']);
105 105
     }
106 106
 
107 107
     /**
@@ -112,7 +112,7 @@  discard block
 block discarded – undo
112 112
      */
113 113
     public function delete(string $sessID): bool
114 114
     {
115
-        return $this->handler->delete($this->config['prefix'] . $sessID);
115
+        return $this->handler->delete($this->config['prefix'].$sessID);
116 116
     }
117 117
 
118 118
 }
Please login to merge, or discard this patch.
src/think/session/driver/Memcache.php 1 patch
Spacing   +5 added lines, -6 removed lines patch added patch discarded remove patch
@@ -8,7 +8,7 @@  discard block
 block discarded – undo
8 8
 // +----------------------------------------------------------------------
9 9
 // | Author: liu21st <[email protected]>
10 10
 // +----------------------------------------------------------------------
11
-declare (strict_types = 1);
11
+declare(strict_types=1);
12 12
 
13 13
 namespace think\session\driver;
14 14
 
@@ -62,8 +62,7 @@  discard block
 block discarded – undo
62 62
         foreach ($hosts as $i => $host) {
63 63
             $port = $ports[$i] ?? $ports[0];
64 64
             $this->config['timeout'] > 0 ?
65
-            $this->handler->addServer($host, (int) $port, $this->config['persistent'], 1, $this->config['timeout']) :
66
-            $this->handler->addServer($host, (int) $port, $this->config['persistent'], 1);
65
+            $this->handler->addServer($host, (int) $port, $this->config['persistent'], 1, $this->config['timeout']) : $this->handler->addServer($host, (int) $port, $this->config['persistent'], 1);
67 66
         }
68 67
 
69 68
         return true;
@@ -77,7 +76,7 @@  discard block
 block discarded – undo
77 76
      */
78 77
     public function read(string $sessID): string
79 78
     {
80
-        return (string) $this->handler->get($this->config['prefix'] . $sessID);
79
+        return (string) $this->handler->get($this->config['prefix'].$sessID);
81 80
     }
82 81
 
83 82
     /**
@@ -89,7 +88,7 @@  discard block
 block discarded – undo
89 88
      */
90 89
     public function write(string $sessID, string $data): bool
91 90
     {
92
-        return $this->handler->set($this->config['prefix'] . $sessID, $data, 0, $this->config['expire']);
91
+        return $this->handler->set($this->config['prefix'].$sessID, $data, 0, $this->config['expire']);
93 92
     }
94 93
 
95 94
     /**
@@ -100,7 +99,7 @@  discard block
 block discarded – undo
100 99
      */
101 100
     public function delete(string $sessID): bool
102 101
     {
103
-        return $this->handler->delete($this->config['prefix'] . $sessID);
102
+        return $this->handler->delete($this->config['prefix'].$sessID);
104 103
     }
105 104
 
106 105
 }
Please login to merge, or discard this patch.
src/think/session/driver/Redis.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -8,7 +8,7 @@  discard block
 block discarded – undo
8 8
 // +----------------------------------------------------------------------
9 9
 // | Author: liu21st <[email protected]>
10 10
 // +----------------------------------------------------------------------
11
-declare (strict_types = 1);
11
+declare(strict_types=1);
12 12
 
13 13
 namespace think\session\driver;
14 14
 
@@ -86,7 +86,7 @@  discard block
 block discarded – undo
86 86
      */
87 87
     public function read(string $sessID): string
88 88
     {
89
-        return (string) $this->handler->get($this->config['prefix'] . $sessID);
89
+        return (string) $this->handler->get($this->config['prefix'].$sessID);
90 90
     }
91 91
 
92 92
     /**
@@ -99,9 +99,9 @@  discard block
 block discarded – undo
99 99
     public function write(string $sessID, string $data): bool
100 100
     {
101 101
         if ($this->config['expire'] > 0) {
102
-            $result = $this->handler->setex($this->config['prefix'] . $sessID, $this->config['expire'], $data);
102
+            $result = $this->handler->setex($this->config['prefix'].$sessID, $this->config['expire'], $data);
103 103
         } else {
104
-            $result = $this->handler->set($this->config['prefix'] . $sessID, $data);
104
+            $result = $this->handler->set($this->config['prefix'].$sessID, $data);
105 105
         }
106 106
 
107 107
         return $result ? true : false;
@@ -115,7 +115,7 @@  discard block
 block discarded – undo
115 115
      */
116 116
     public function delete(string $sessID): bool
117 117
     {
118
-        return $this->handler->delete($this->config['prefix'] . $sessID) > 0;
118
+        return $this->handler->delete($this->config['prefix'].$sessID) > 0;
119 119
     }
120 120
 
121 121
 }
Please login to merge, or discard this patch.
src/think/session/driver/File.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -8,7 +8,7 @@  discard block
 block discarded – undo
8 8
 // +----------------------------------------------------------------------
9 9
 // | Author: liu21st <[email protected]>
10 10
 // +----------------------------------------------------------------------
11
-declare (strict_types = 1);
11
+declare(strict_types=1);
12 12
 
13 13
 namespace think\session\driver;
14 14
 
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
34 34
         $this->config = array_merge($this->config, $config);
35 35
 
36 36
         if (empty($this->config['path'])) {
37
-            $this->config['path'] = $app->getRootPath() . 'runtime' . DIRECTORY_SEPARATOR . 'session' . DIRECTORY_SEPARATOR;
37
+            $this->config['path'] = $app->getRootPath().'runtime'.DIRECTORY_SEPARATOR.'session'.DIRECTORY_SEPARATOR;
38 38
         } elseif (substr($this->config['path'], -1) != DIRECTORY_SEPARATOR) {
39 39
             $this->config['path'] .= DIRECTORY_SEPARATOR;
40 40
         }
@@ -72,11 +72,11 @@  discard block
 block discarded – undo
72 72
     public function gc()
73 73
     {
74 74
         $maxlifetime = $this->config['gc_maxlifetime'];
75
-        $list        = glob($this->config['path'] . '*');
75
+        $list        = glob($this->config['path'].'*');
76 76
 
77 77
         foreach ($list as $path) {
78 78
             if (is_dir($path)) {
79
-                $files = glob($path . DIRECTORY_SEPARATOR . '*.php');
79
+                $files = glob($path.DIRECTORY_SEPARATOR.'*.php');
80 80
                 foreach ($files as $file) {
81 81
                     if (time() > filemtime($file) + $maxlifetime) {
82 82
                         unlink($file);
@@ -99,12 +99,12 @@  discard block
 block discarded – undo
99 99
     {
100 100
         if ($this->config['prefix']) {
101 101
             // 使用子目录
102
-            $name = $this->config['prefix'] . DIRECTORY_SEPARATOR . 'sess_' . $name;
102
+            $name = $this->config['prefix'].DIRECTORY_SEPARATOR.'sess_'.$name;
103 103
         } else {
104
-            $name = 'sess_' . $name;
104
+            $name = 'sess_'.$name;
105 105
         }
106 106
 
107
-        $filename = $this->config['path'] . $name . '.php';
107
+        $filename = $this->config['path'].$name.'.php';
108 108
         $dir      = dirname($filename);
109 109
 
110 110
         if ($auto && !is_dir($dir)) {
@@ -174,7 +174,7 @@  discard block
 block discarded – undo
174 174
             $data = gzcompress($data, 3);
175 175
         }
176 176
 
177
-        $data   = "<?php\n//" . sprintf('%012d', $expire) . "\n exit();?>\n" . $data;
177
+        $data   = "<?php\n//".sprintf('%012d', $expire)."\n exit();?>\n".$data;
178 178
         $result = file_put_contents($filename, $data);
179 179
 
180 180
         if ($result) {
Please login to merge, or discard this patch.
src/think/View.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -8,7 +8,7 @@
 block discarded – undo
8 8
 // +----------------------------------------------------------------------
9 9
 // | Author: liu21st <[email protected]>
10 10
 // +----------------------------------------------------------------------
11
-declare (strict_types = 1);
11
+declare(strict_types=1);
12 12
 
13 13
 namespace think;
14 14
 
Please login to merge, or discard this patch.
src/think/File.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -8,7 +8,7 @@  discard block
 block discarded – undo
8 8
 // +----------------------------------------------------------------------
9 9
 // | Author: liu21st <[email protected]>
10 10
 // +----------------------------------------------------------------------
11
-declare (strict_types = 1);
11
+declare(strict_types=1);
12 12
 
13 13
 namespace think;
14 14
 
@@ -86,7 +86,7 @@  discard block
 block discarded – undo
86 86
     {
87 87
         $target = $this->getTargetFile($directory, $name);
88 88
 
89
-        set_error_handler(function ($type, $msg) use (&$error) {
89
+        set_error_handler(function($type, $msg) use (&$error) {
90 90
             $error = $msg;
91 91
         });
92 92
         $renamed = rename($this->getPathname(), $target);
@@ -116,7 +116,7 @@  discard block
 block discarded – undo
116 116
             throw new FileException(sprintf('Unable to write in the "%s" directory', $directory));
117 117
         }
118 118
 
119
-        $target = rtrim($directory, '/\\') . \DIRECTORY_SEPARATOR . (null === $name ? $this->getBasename() : $this->getName($name));
119
+        $target = rtrim($directory, '/\\').\DIRECTORY_SEPARATOR.(null === $name ? $this->getBasename() : $this->getName($name));
120 120
 
121 121
         return new self($target, false);
122 122
     }
@@ -159,18 +159,18 @@  discard block
 block discarded – undo
159 159
                 switch (true) {
160 160
                     case in_array($rule, hash_algos()):
161 161
                         $hash           = $this->hash($rule);
162
-                        $this->hashName = substr($hash, 0, 2) . DIRECTORY_SEPARATOR . substr($hash, 2);
162
+                        $this->hashName = substr($hash, 0, 2).DIRECTORY_SEPARATOR.substr($hash, 2);
163 163
                         break;
164 164
                     case is_callable($rule):
165 165
                         $this->hashName = call_user_func($rule);
166 166
                         break;
167 167
                     default:
168
-                        $this->hashName = date('Ymd') . DIRECTORY_SEPARATOR . md5((string) microtime(true));
168
+                        $this->hashName = date('Ymd').DIRECTORY_SEPARATOR.md5((string) microtime(true));
169 169
                         break;
170 170
                 }
171 171
             }
172 172
         }
173 173
 
174
-        return $this->hashName . '.' . $this->extension();
174
+        return $this->hashName.'.'.$this->extension();
175 175
     }
176 176
 }
Please login to merge, or discard this patch.
src/think/Filesystem.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -8,7 +8,7 @@
 block discarded – undo
8 8
 // +----------------------------------------------------------------------
9 9
 // | Author: yunwuxin <[email protected]>
10 10
 // +----------------------------------------------------------------------
11
-declare (strict_types = 1);
11
+declare(strict_types=1);
12 12
 
13 13
 namespace think;
14 14
 
Please login to merge, or discard this patch.
src/think/route/Dispatch.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -8,7 +8,7 @@
 block discarded – undo
8 8
 // +----------------------------------------------------------------------
9 9
 // | Author: liu21st <[email protected]>
10 10
 // +----------------------------------------------------------------------
11
-declare (strict_types = 1);
11
+declare(strict_types=1);
12 12
 
13 13
 namespace think\route;
14 14
 
Please login to merge, or discard this patch.