Completed
Pull Request — 6.0 (#1913)
by yun
09:37 queued 04:47
created
src/think/response/File.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
34 34
     protected function output($data)
35 35
     {
36 36
         if (!$this->isContent && !is_file($data)) {
37
-            throw new Exception('file not exists:' . $data);
37
+            throw new Exception('file not exists:'.$data);
38 38
         }
39 39
 
40 40
         ob_end_clean();
@@ -55,13 +55,13 @@  discard block
 block discarded – undo
55 55
 
56 56
         $this->header['Pragma']                    = 'public';
57 57
         $this->header['Content-Type']              = $mimeType ?: 'application/octet-stream';
58
-        $this->header['Cache-control']             = 'max-age=' . $this->expire;
59
-        $this->header['Content-Disposition']       = 'attachment; filename="' . $name . '"';
58
+        $this->header['Cache-control']             = 'max-age='.$this->expire;
59
+        $this->header['Content-Disposition']       = 'attachment; filename="'.$name.'"';
60 60
         $this->header['Content-Length']            = $size;
61 61
         $this->header['Content-Transfer-Encoding'] = 'binary';
62
-        $this->header['Expires']                   = gmdate("D, d M Y H:i:s", time() + $this->expire) . ' GMT';
62
+        $this->header['Expires']                   = gmdate("D, d M Y H:i:s", time() + $this->expire).' GMT';
63 63
 
64
-        $this->lastModified(gmdate('D, d M Y H:i:s', time()) . ' GMT');
64
+        $this->lastModified(gmdate('D, d M Y H:i:s', time()).' GMT');
65 65
 
66 66
         return $this->isContent ? $data : file_get_contents($data);
67 67
     }
@@ -131,7 +131,7 @@  discard block
 block discarded – undo
131 131
         $this->name = $filename;
132 132
 
133 133
         if ($extension && false === strpos($filename, '.')) {
134
-            $this->name .= '.' . pathinfo($this->data, PATHINFO_EXTENSION);
134
+            $this->name .= '.'.pathinfo($this->data, PATHINFO_EXTENSION);
135 135
         }
136 136
 
137 137
         return $this;
Please login to merge, or discard this patch.
src/think/initializer/Error.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: 麦当苗儿 <[email protected]> <http://zjzit.cn>
10 10
 // +----------------------------------------------------------------------
11
-declare (strict_types = 1);
11
+declare(strict_types=1);
12 12
 
13 13
 namespace think\initializer;
14 14
 
Please login to merge, or discard this patch.
src/think/initializer/BootService.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\initializer;
14 14
 
Please login to merge, or discard this patch.
src/think/initializer/RegisterService.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -8,7 +8,7 @@  discard block
 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\initializer;
14 14
 
@@ -31,7 +31,7 @@  discard block
 block discarded – undo
31 31
 
32 32
     public function init(App $app)
33 33
     {
34
-        $file = $app->getRootPath() . 'runtime' . DIRECTORY_SEPARATOR . 'services.php';
34
+        $file = $app->getRootPath().'runtime'.DIRECTORY_SEPARATOR.'services.php';
35 35
 
36 36
         $services = $this->services;
37 37
 
Please login to merge, or discard this patch.
src/think/Session.php 1 patch
Spacing   +2 added lines, -2 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
 
@@ -387,7 +387,7 @@  discard block
 block discarded – undo
387 387
             $this->data = $data;
388 388
         }
389 389
 
390
-        $sessionId = md5(microtime(true) . uniqid());
390
+        $sessionId = md5(microtime(true).uniqid());
391 391
 
392 392
         $this->setId($sessionId);
393 393
         return $sessionId;
Please login to merge, or discard this patch.
src/think/Config.php 1 patch
Spacing   +3 added lines, -3 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
 
@@ -64,8 +64,8 @@  discard block
 block discarded – undo
64 64
     {
65 65
         if (is_file($file)) {
66 66
             $filename = $file;
67
-        } elseif (is_file($this->path . $file . $this->ext)) {
68
-            $filename = $this->path . $file . $this->ext;
67
+        } elseif (is_file($this->path.$file.$this->ext)) {
68
+            $filename = $this->path.$file.$this->ext;
69 69
         }
70 70
 
71 71
         if (isset($filename)) {
Please login to merge, or discard this patch.
src/think/filesystem/CacheStore.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\filesystem;
14 14
 
Please login to merge, or discard this patch.
src/think/filesystem/Driver.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -86,7 +86,7 @@
 block discarded – undo
86 86
         $stream = fopen($file->getRealPath(), 'r');
87 87
 
88 88
         $result = $this->putStream(
89
-            $path = trim($path . '/' . $name, '/'), $stream, $options
89
+            $path = trim($path.'/'.$name, '/'), $stream, $options
90 90
         );
91 91
 
92 92
         if (is_resource($stream)) {
Please login to merge, or discard this patch.
src/think/facade/Console.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\facade;
14 14
 
Please login to merge, or discard this patch.