Completed
Pull Request — 6.0 (#2072)
by nhzex
05:15
created
src/think/console/command/make/Service.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -26,11 +26,11 @@
 block discarded – undo
26 26
 
27 27
     protected function getStub(): string
28 28
     {
29
-        return __DIR__ . DIRECTORY_SEPARATOR . 'stubs' . DIRECTORY_SEPARATOR . 'service.stub';
29
+        return __DIR__.DIRECTORY_SEPARATOR.'stubs'.DIRECTORY_SEPARATOR.'service.stub';
30 30
     }
31 31
 
32 32
     protected function getNamespace(string $app): string
33 33
     {
34
-        return parent::getNamespace($app) . '\\service';
34
+        return parent::getNamespace($app).'\\service';
35 35
     }
36 36
 }
Please login to merge, or discard this patch.
src/think/console/command/make/Middleware.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -26,7 +26,7 @@
 block discarded – undo
26 26
 
27 27
     protected function getStub(): string
28 28
     {
29
-        return __DIR__ . DIRECTORY_SEPARATOR . 'stubs' . DIRECTORY_SEPARATOR . 'middleware.stub';
29
+        return __DIR__.DIRECTORY_SEPARATOR.'stubs'.DIRECTORY_SEPARATOR.'middleware.stub';
30 30
     }
31 31
 
32 32
     protected function getNamespace(string $app): string
Please login to merge, or discard this patch.
src/think/console/command/make/Subscribe.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -25,11 +25,11 @@
 block discarded – undo
25 25
 
26 26
     protected function getStub(): string
27 27
     {
28
-        return __DIR__ . DIRECTORY_SEPARATOR . 'stubs' . DIRECTORY_SEPARATOR . 'subscribe.stub';
28
+        return __DIR__.DIRECTORY_SEPARATOR.'stubs'.DIRECTORY_SEPARATOR.'subscribe.stub';
29 29
     }
30 30
 
31 31
     protected function getNamespace(string $app): string
32 32
     {
33
-        return parent::getNamespace($app) . '\\subscribe';
33
+        return parent::getNamespace($app).'\\subscribe';
34 34
     }
35 35
 }
Please login to merge, or discard this patch.
src/think/console/command/make/Event.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -25,11 +25,11 @@
 block discarded – undo
25 25
 
26 26
     protected function getStub(): string
27 27
     {
28
-        return __DIR__ . DIRECTORY_SEPARATOR . 'stubs' . DIRECTORY_SEPARATOR . 'event.stub';
28
+        return __DIR__.DIRECTORY_SEPARATOR.'stubs'.DIRECTORY_SEPARATOR.'event.stub';
29 29
     }
30 30
 
31 31
     protected function getNamespace(string $app): string
32 32
     {
33
-        return parent::getNamespace($app) . '\\event';
33
+        return parent::getNamespace($app).'\\event';
34 34
     }
35 35
 }
Please login to merge, or discard this patch.
src/think/console/command/make/Controller.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -30,27 +30,27 @@
 block discarded – undo
30 30
 
31 31
     protected function getStub(): string
32 32
     {
33
-        $stubPath = __DIR__ . DIRECTORY_SEPARATOR . 'stubs' . DIRECTORY_SEPARATOR;
33
+        $stubPath = __DIR__.DIRECTORY_SEPARATOR.'stubs'.DIRECTORY_SEPARATOR;
34 34
 
35 35
         if ($this->input->getOption('api')) {
36
-            return $stubPath . 'controller.api.stub';
36
+            return $stubPath.'controller.api.stub';
37 37
         }
38 38
 
39 39
         if ($this->input->getOption('plain')) {
40
-            return $stubPath . 'controller.plain.stub';
40
+            return $stubPath.'controller.plain.stub';
41 41
         }
42 42
 
43
-        return $stubPath . 'controller.stub';
43
+        return $stubPath.'controller.stub';
44 44
     }
45 45
 
46 46
     protected function getClassName(string $name): string
47 47
     {
48
-        return parent::getClassName($name) . ($this->app->config->get('route.controller_suffix') ? 'Controller' : '');
48
+        return parent::getClassName($name).($this->app->config->get('route.controller_suffix') ? 'Controller' : '');
49 49
     }
50 50
 
51 51
     protected function getNamespace(string $app): string
52 52
     {
53
-        return parent::getNamespace($app) . '\\controller';
53
+        return parent::getNamespace($app).'\\controller';
54 54
     }
55 55
 
56 56
 }
Please login to merge, or discard this patch.
src/think/console/command/RunServer.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: Slince <[email protected]>
10 10
 // +----------------------------------------------------------------------
11
-declare (strict_types = 1);
11
+declare(strict_types=1);
12 12
 
13 13
 namespace think\console\command;
14 14
 
@@ -37,7 +37,7 @@  discard block
 block discarded – undo
37 37
         $port = $input->getOption('port');
38 38
         $root = $input->getOption('root');
39 39
         if (empty($root)) {
40
-            $root = $this->app->getRootPath() . 'public';
40
+            $root = $this->app->getRootPath().'public';
41 41
         }
42 42
 
43 43
         $command = sprintf(
@@ -45,7 +45,7 @@  discard block
 block discarded – undo
45 45
             $host,
46 46
             $port,
47 47
             escapeshellarg($root),
48
-            escapeshellarg($root . DIRECTORY_SEPARATOR . 'router.php')
48
+            escapeshellarg($root.DIRECTORY_SEPARATOR.'router.php')
49 49
         );
50 50
 
51 51
         $output->writeln(sprintf('ThinkPHP Development server is started On <http://%s:%s/>', '0.0.0.0' == $host ? '127.0.0.1' : $host, $port));
Please login to merge, or discard this patch.
src/think/console/command/VendorPublish.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: yunwuxin <[email protected]>
10 10
 // +----------------------------------------------------------------------
11
-declare (strict_types = 1);
11
+declare(strict_types=1);
12 12
 
13 13
 namespace think\console\command;
14 14
 
@@ -29,7 +29,7 @@  discard block
 block discarded – undo
29 29
 
30 30
         $force = $this->input->getOption('force');
31 31
 
32
-        if (is_file($path = $this->app->getRootPath() . 'vendor/composer/installed.json')) {
32
+        if (is_file($path = $this->app->getRootPath().'vendor/composer/installed.json')) {
33 33
             $packages = json_decode(@file_get_contents($path), true);
34 34
 
35 35
             foreach ($packages as $package) {
@@ -38,12 +38,12 @@  discard block
 block discarded – undo
38 38
 
39 39
                 if (!empty($package['extra']['think']['config'])) {
40 40
 
41
-                    $installPath = $this->app->getRootPath() . 'vendor/' . $package['name'] . DIRECTORY_SEPARATOR;
41
+                    $installPath = $this->app->getRootPath().'vendor/'.$package['name'].DIRECTORY_SEPARATOR;
42 42
 
43 43
                     foreach ((array) $package['extra']['think']['config'] as $name => $file) {
44 44
 
45
-                        $target = $configDir . $name . '.php';
46
-                        $source = $installPath . $file;
45
+                        $target = $configDir.$name.'.php';
46
+                        $source = $installPath.$file;
47 47
 
48 48
                         if (is_file($target) && !$force) {
49 49
                             $this->output->info("File {$target} exist!");
Please login to merge, or discard this patch.
tests/AppTest.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -107,27 +107,27 @@  discard block
 block discarded – undo
107 107
 
108 108
     public function testPath()
109 109
     {
110
-        $rootPath = __DIR__ . DIRECTORY_SEPARATOR;
110
+        $rootPath = __DIR__.DIRECTORY_SEPARATOR;
111 111
 
112 112
         $app = new App($rootPath);
113 113
 
114 114
         $this->assertEquals($rootPath, $app->getRootPath());
115 115
 
116
-        $this->assertEquals(dirname(__DIR__) . DIRECTORY_SEPARATOR . 'src' . DIRECTORY_SEPARATOR, $app->getThinkPath());
116
+        $this->assertEquals(dirname(__DIR__).DIRECTORY_SEPARATOR.'src'.DIRECTORY_SEPARATOR, $app->getThinkPath());
117 117
 
118
-        $this->assertEquals($rootPath . 'app' . DIRECTORY_SEPARATOR, $app->getAppPath());
118
+        $this->assertEquals($rootPath.'app'.DIRECTORY_SEPARATOR, $app->getAppPath());
119 119
 
120
-        $appPath = $rootPath . 'app' . DIRECTORY_SEPARATOR . 'admin' . DIRECTORY_SEPARATOR;
120
+        $appPath = $rootPath.'app'.DIRECTORY_SEPARATOR.'admin'.DIRECTORY_SEPARATOR;
121 121
         $app->setAppPath($appPath);
122 122
         $this->assertEquals($appPath, $app->getAppPath());
123 123
 
124
-        $this->assertEquals($rootPath . 'app' . DIRECTORY_SEPARATOR, $app->getBasePath());
124
+        $this->assertEquals($rootPath.'app'.DIRECTORY_SEPARATOR, $app->getBasePath());
125 125
 
126
-        $this->assertEquals($rootPath . 'config' . DIRECTORY_SEPARATOR, $app->getConfigPath());
126
+        $this->assertEquals($rootPath.'config'.DIRECTORY_SEPARATOR, $app->getConfigPath());
127 127
 
128
-        $this->assertEquals($rootPath . 'runtime' . DIRECTORY_SEPARATOR, $app->getRuntimePath());
128
+        $this->assertEquals($rootPath.'runtime'.DIRECTORY_SEPARATOR, $app->getRuntimePath());
129 129
 
130
-        $runtimePath = $rootPath . 'runtime' . DIRECTORY_SEPARATOR . 'admin' . DIRECTORY_SEPARATOR;
130
+        $runtimePath = $rootPath.'runtime'.DIRECTORY_SEPARATOR.'admin'.DIRECTORY_SEPARATOR;
131 131
         $app->setRuntimePath($runtimePath);
132 132
         $this->assertEquals($runtimePath, $app->getRuntimePath());
133 133
     }
@@ -139,7 +139,7 @@  discard block
 block discarded – undo
139 139
      */
140 140
     protected function prepareAppForInitialize(vfsStreamDirectory $root, $debug = true)
141 141
     {
142
-        $rootPath = $root->url() . DIRECTORY_SEPARATOR;
142
+        $rootPath = $root->url().DIRECTORY_SEPARATOR;
143 143
 
144 144
         $app = new App($rootPath);
145 145
 
@@ -148,12 +148,12 @@  discard block
 block discarded – undo
148 148
 
149 149
         $app->instance($initializer->mockery_getName(), $initializer);
150 150
 
151
-        (function () use ($initializer) {
151
+        (function() use ($initializer) {
152 152
             $this->initializers = [$initializer->mockery_getName()];
153 153
         })->call($app);
154 154
 
155 155
         $env = m::mock(Env::class);
156
-        $env->shouldReceive('load')->once()->with($rootPath . '.env');
156
+        $env->shouldReceive('load')->once()->with($rootPath.'.env');
157 157
         $env->shouldReceive('get')->once()->with('config_ext', '.php')->andReturn('.php');
158 158
         $env->shouldReceive('get')->once()->with('app_debug')->andReturn($debug);
159 159
 
Please login to merge, or discard this patch.
src/think/middleware/FormTokenCheck.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\middleware;
14 14
 
Please login to merge, or discard this patch.