@@ -31,12 +31,12 @@ |
||
31 | 31 | |
32 | 32 | $fs = new Files(); |
33 | 33 | |
34 | - if ($fs->isDirectory(__DIR__ . '/../app/migrations')) { |
|
35 | - $fs->deleteDirectory(__DIR__ . '/../app/migrations'); |
|
34 | + if ($fs->isDirectory(__DIR__.'/../app/migrations')){ |
|
35 | + $fs->deleteDirectory(__DIR__.'/../app/migrations'); |
|
36 | 36 | } |
37 | 37 | |
38 | 38 | $runtime = $this->app->get(DirectoriesInterface::class)->get('runtime'); |
39 | - if ($fs->isDirectory($runtime)) { |
|
39 | + if ($fs->isDirectory($runtime)){ |
|
40 | 40 | $fs->deleteDirectory($runtime); |
41 | 41 | } |
42 | 42 | } |
@@ -31,12 +31,14 @@ |
||
31 | 31 | |
32 | 32 | $fs = new Files(); |
33 | 33 | |
34 | - if ($fs->isDirectory(__DIR__ . '/../app/migrations')) { |
|
34 | + if ($fs->isDirectory(__DIR__ . '/../app/migrations')) |
|
35 | + { |
|
35 | 36 | $fs->deleteDirectory(__DIR__ . '/../app/migrations'); |
36 | 37 | } |
37 | 38 | |
38 | 39 | $runtime = $this->app->get(DirectoriesInterface::class)->get('runtime'); |
39 | - if ($fs->isDirectory($runtime)) { |
|
40 | + if ($fs->isDirectory($runtime)) |
|
41 | + { |
|
40 | 42 | $fs->deleteDirectory($runtime); |
41 | 43 | } |
42 | 44 | } |
@@ -17,10 +17,10 @@ |
||
17 | 17 | public function makeApp(array $env = []): TestApp |
18 | 18 | { |
19 | 19 | return TestApp::init([ |
20 | - 'root' => __DIR__ . '/../..', |
|
21 | - 'app' => __DIR__ . '/../app', |
|
22 | - 'runtime' => sys_get_temp_dir() . '/spiral', |
|
23 | - 'cache' => sys_get_temp_dir() . '/spiral', |
|
20 | + 'root' => __DIR__.'/../..', |
|
21 | + 'app' => __DIR__.'/../app', |
|
22 | + 'runtime' => sys_get_temp_dir().'/spiral', |
|
23 | + 'cache' => sys_get_temp_dir().'/spiral', |
|
24 | 24 | ], new Environment($env), false); |
25 | 25 | } |
26 | 26 | } |
@@ -20,9 +20,9 @@ |
||
20 | 20 | { |
21 | 21 | $app = $this->makeApp(); |
22 | 22 | |
23 | - try { |
|
23 | + try{ |
|
24 | 24 | throw new \Error('test error'); |
25 | - } catch (\Error $e) { |
|
25 | + }catch (\Error $e){ |
|
26 | 26 | /** @var SnapshotInterface $s */ |
27 | 27 | $s = $app->get(SnapshotterInterface::class)->register($e); |
28 | 28 | } |
@@ -20,9 +20,12 @@ |
||
20 | 20 | { |
21 | 21 | $app = $this->makeApp(); |
22 | 22 | |
23 | - try { |
|
23 | + try |
|
24 | + { |
|
24 | 25 | throw new \Error('test error'); |
25 | - } catch (\Error $e) { |
|
26 | + } |
|
27 | + catch (\Error $e) |
|
28 | + { |
|
26 | 29 | /** @var SnapshotInterface $s */ |
27 | 30 | $s = $app->get(SnapshotterInterface::class)->register($e); |
28 | 31 | } |
@@ -15,12 +15,12 @@ discard block |
||
15 | 15 | |
16 | 16 | class PublishTest extends ConsoleTest |
17 | 17 | { |
18 | - protected const TEST_FILE = __DIR__ . '/test.txt'; |
|
19 | - protected const TEST_FILE_2 = __DIR__ . '/PublishTest.php'; |
|
18 | + protected const TEST_FILE = __DIR__.'/test.txt'; |
|
19 | + protected const TEST_FILE_2 = __DIR__.'/PublishTest.php'; |
|
20 | 20 | |
21 | 21 | public function tearDown(): void |
22 | 22 | { |
23 | - if (file_exists(self::TEST_FILE)) { |
|
23 | + if (file_exists(self::TEST_FILE)){ |
|
24 | 24 | unlink(self::TEST_FILE); |
25 | 25 | } |
26 | 26 | |
@@ -176,7 +176,7 @@ discard block |
||
176 | 176 | $this->runCommandDebug('publish', [ |
177 | 177 | 'type' => 'replace', |
178 | 178 | 'target' => '@runtime', |
179 | - 'source' => __DIR__ . '/*', |
|
179 | + 'source' => __DIR__.'/*', |
|
180 | 180 | 'mode' => 'runtime' |
181 | 181 | ]); |
182 | 182 | |
@@ -194,7 +194,7 @@ discard block |
||
194 | 194 | $this->runCommandDebug('publish', [ |
195 | 195 | 'type' => 'follow', |
196 | 196 | 'target' => '@runtime', |
197 | - 'source' => __DIR__ . '/*', |
|
197 | + 'source' => __DIR__.'/*', |
|
198 | 198 | 'mode' => 'runtime' |
199 | 199 | ]); |
200 | 200 | |
@@ -212,7 +212,7 @@ discard block |
||
212 | 212 | $this->runCommandDebug('publish', [ |
213 | 213 | 'type' => 'follow', |
214 | 214 | 'target' => '@runtime/test.txt', |
215 | - 'source' => self::TEST_FILE . 'invalid', |
|
215 | + 'source' => self::TEST_FILE.'invalid', |
|
216 | 216 | 'mode' => 'runtime' |
217 | 217 | ]); |
218 | 218 | } |
@@ -227,13 +227,13 @@ discard block |
||
227 | 227 | $this->runCommandDebug('publish', [ |
228 | 228 | 'type' => 'follow', |
229 | 229 | 'target' => '@runtime/test.txt', |
230 | - 'source' => self::TEST_FILE . 'invalid/*', |
|
230 | + 'source' => self::TEST_FILE.'invalid/*', |
|
231 | 231 | 'mode' => 'runtime' |
232 | 232 | ]); |
233 | 233 | } |
234 | 234 | |
235 | 235 | protected function file(string $dir, string $name) |
236 | 236 | { |
237 | - return $this->app->get(DirectoriesInterface::class)->get($dir) . $name; |
|
237 | + return $this->app->get(DirectoriesInterface::class)->get($dir).$name; |
|
238 | 238 | } |
239 | 239 | } |
@@ -20,7 +20,8 @@ |
||
20 | 20 | |
21 | 21 | public function tearDown(): void |
22 | 22 | { |
23 | - if (file_exists(self::TEST_FILE)) { |
|
23 | + if (file_exists(self::TEST_FILE)) |
|
24 | + { |
|
24 | 25 | unlink(self::TEST_FILE); |
25 | 26 | } |
26 | 27 |
@@ -18,7 +18,7 @@ discard block |
||
18 | 18 | { |
19 | 19 | public function testSetSid(): void |
20 | 20 | { |
21 | - $this->http->setHandler(function () { |
|
21 | + $this->http->setHandler(function (){ |
|
22 | 22 | return ++$this->session()->getSection('cli')->value; |
23 | 23 | }); |
24 | 24 | |
@@ -32,7 +32,7 @@ discard block |
||
32 | 32 | |
33 | 33 | public function testSessionResume(): void |
34 | 34 | { |
35 | - $this->http->setHandler(function () { |
|
35 | + $this->http->setHandler(function (){ |
|
36 | 36 | return ++$this->session()->getSection('cli')->value; |
37 | 37 | }); |
38 | 38 | |
@@ -56,7 +56,7 @@ discard block |
||
56 | 56 | |
57 | 57 | public function testSessionRegenerateId(): void |
58 | 58 | { |
59 | - $this->http->setHandler(function () { |
|
59 | + $this->http->setHandler(function (){ |
|
60 | 60 | return ++$this->session()->getSection('cli')->value; |
61 | 61 | }); |
62 | 62 | |
@@ -73,7 +73,7 @@ discard block |
||
73 | 73 | $this->assertSame(200, $result->getStatusCode()); |
74 | 74 | $this->assertSame('2', $result->getBody()->__toString()); |
75 | 75 | |
76 | - $this->http->setHandler(function () { |
|
76 | + $this->http->setHandler(function (){ |
|
77 | 77 | $this->session()->regenerateID(false); |
78 | 78 | |
79 | 79 | return ++$this->session()->getSection('cli')->value; |
@@ -92,7 +92,7 @@ discard block |
||
92 | 92 | |
93 | 93 | public function testDestroySession(): void |
94 | 94 | { |
95 | - $this->http->setHandler(function () { |
|
95 | + $this->http->setHandler(function (){ |
|
96 | 96 | return ++$this->session()->getSection('cli')->value; |
97 | 97 | }); |
98 | 98 | |
@@ -105,7 +105,7 @@ discard block |
||
105 | 105 | ]); |
106 | 106 | $this->assertSame(200, $result->getStatusCode()); |
107 | 107 | $this->assertSame('2', $result->getBody()->__toString()); |
108 | - $this->http->setHandler(function () { |
|
108 | + $this->http->setHandler(function (){ |
|
109 | 109 | $this->session()->destroy(); |
110 | 110 | $this->assertFalse($this->session()->isStarted()); |
111 | 111 |
@@ -18,7 +18,8 @@ discard block |
||
18 | 18 | { |
19 | 19 | public function testSetSid(): void |
20 | 20 | { |
21 | - $this->http->setHandler(function () { |
|
21 | + $this->http->setHandler(function () |
|
22 | + { |
|
22 | 23 | return ++$this->session()->getSection('cli')->value; |
23 | 24 | }); |
24 | 25 | |
@@ -32,7 +33,8 @@ discard block |
||
32 | 33 | |
33 | 34 | public function testSessionResume(): void |
34 | 35 | { |
35 | - $this->http->setHandler(function () { |
|
36 | + $this->http->setHandler(function () |
|
37 | + { |
|
36 | 38 | return ++$this->session()->getSection('cli')->value; |
37 | 39 | }); |
38 | 40 | |
@@ -56,7 +58,8 @@ discard block |
||
56 | 58 | |
57 | 59 | public function testSessionRegenerateId(): void |
58 | 60 | { |
59 | - $this->http->setHandler(function () { |
|
61 | + $this->http->setHandler(function () |
|
62 | + { |
|
60 | 63 | return ++$this->session()->getSection('cli')->value; |
61 | 64 | }); |
62 | 65 | |
@@ -73,7 +76,8 @@ discard block |
||
73 | 76 | $this->assertSame(200, $result->getStatusCode()); |
74 | 77 | $this->assertSame('2', $result->getBody()->__toString()); |
75 | 78 | |
76 | - $this->http->setHandler(function () { |
|
79 | + $this->http->setHandler(function () |
|
80 | + { |
|
77 | 81 | $this->session()->regenerateID(false); |
78 | 82 | |
79 | 83 | return ++$this->session()->getSection('cli')->value; |
@@ -92,7 +96,8 @@ discard block |
||
92 | 96 | |
93 | 97 | public function testDestroySession(): void |
94 | 98 | { |
95 | - $this->http->setHandler(function () { |
|
99 | + $this->http->setHandler(function () |
|
100 | + { |
|
96 | 101 | return ++$this->session()->getSection('cli')->value; |
97 | 102 | }); |
98 | 103 | |
@@ -105,7 +110,8 @@ discard block |
||
105 | 110 | ]); |
106 | 111 | $this->assertSame(200, $result->getStatusCode()); |
107 | 112 | $this->assertSame('2', $result->getBody()->__toString()); |
108 | - $this->http->setHandler(function () { |
|
113 | + $this->http->setHandler(function () |
|
114 | + { |
|
109 | 115 | $this->session()->destroy(); |
110 | 116 | $this->assertFalse($this->session()->isStarted()); |
111 | 117 |
@@ -25,7 +25,7 @@ discard block |
||
25 | 25 | |
26 | 26 | public function setUp(): void |
27 | 27 | { |
28 | - $this->bufferEmitter = new class() implements EmitterInterface { |
|
28 | + $this->bufferEmitter = new class() implements EmitterInterface{ |
|
29 | 29 | public $response; |
30 | 30 | |
31 | 31 | public function emit(ResponseInterface $response): bool |
@@ -59,7 +59,7 @@ discard block |
||
59 | 59 | $e = $this->bufferEmitter; |
60 | 60 | |
61 | 61 | $files = $this->app->get(FilesInterface::class)->getFiles( |
62 | - $this->app->get(DirectoriesInterface::class)->get('runtime') . '/snapshots/' |
|
62 | + $this->app->get(DirectoriesInterface::class)->get('runtime').'/snapshots/' |
|
63 | 63 | ); |
64 | 64 | |
65 | 65 | $this->assertCount(0, $files); |
@@ -68,7 +68,7 @@ discard block |
||
68 | 68 | $this->app->get(SapiDispatcher::class)->serve($e); |
69 | 69 | |
70 | 70 | $files = $this->app->get(FilesInterface::class)->getFiles( |
71 | - $this->app->get(DirectoriesInterface::class)->get('runtime') . '/snapshots/' |
|
71 | + $this->app->get(DirectoriesInterface::class)->get('runtime').'/snapshots/' |
|
72 | 72 | ); |
73 | 73 | |
74 | 74 | $this->assertCount(1, $files); |
@@ -85,7 +85,7 @@ discard block |
||
85 | 85 | ]); |
86 | 86 | |
87 | 87 | $files = $app->get(FilesInterface::class)->getFiles( |
88 | - $app->get(DirectoriesInterface::class)->get('runtime') . '/snapshots/' |
|
88 | + $app->get(DirectoriesInterface::class)->get('runtime').'/snapshots/' |
|
89 | 89 | ); |
90 | 90 | |
91 | 91 | $this->assertCount(0, $files); |
@@ -94,7 +94,7 @@ discard block |
||
94 | 94 | $app->get(SapiDispatcher::class)->serve($e); |
95 | 95 | |
96 | 96 | $files = $app->get(FilesInterface::class)->getFiles( |
97 | - $app->get(DirectoriesInterface::class)->get('runtime') . '/snapshots/' |
|
97 | + $app->get(DirectoriesInterface::class)->get('runtime').'/snapshots/' |
|
98 | 98 | ); |
99 | 99 | |
100 | 100 | $this->assertCount(1, $files); |
@@ -25,7 +25,8 @@ |
||
25 | 25 | |
26 | 26 | public function setUp(): void |
27 | 27 | { |
28 | - $this->bufferEmitter = new class() implements EmitterInterface { |
|
28 | + $this->bufferEmitter = new class() implements EmitterInterface |
|
29 | + { |
|
29 | 30 | public $response; |
30 | 31 | |
31 | 32 | public function emit(ResponseInterface $response): bool |
@@ -48,7 +48,7 @@ |
||
48 | 48 | |
49 | 49 | public function input(InputScope $i) |
50 | 50 | { |
51 | - return 'value: ' . $i->withPrefix('section')->getValue('query', 'value'); |
|
51 | + return 'value: '.$i->withPrefix('section')->getValue('query', 'value'); |
|
52 | 52 | } |
53 | 53 | |
54 | 54 | public function error(): void |
@@ -28,7 +28,7 @@ discard block |
||
28 | 28 | |
29 | 29 | public function do(GuardInterface $guard) |
30 | 30 | { |
31 | - if (!$guard->allows('do')) { |
|
31 | + if (!$guard->allows('do')){ |
|
32 | 32 | throw new ControllerException("Unauthorized permission 'do'", ControllerException::FORBIDDEN); |
33 | 33 | } |
34 | 34 | |
@@ -37,7 +37,7 @@ discard block |
||
37 | 37 | |
38 | 38 | public function token(AuthContextInterface $authContext) |
39 | 39 | { |
40 | - if ($authContext->getToken() !== null) { |
|
40 | + if ($authContext->getToken() !== null){ |
|
41 | 41 | return $authContext->getToken()->getID(); |
42 | 42 | } |
43 | 43 | |
@@ -55,7 +55,7 @@ discard block |
||
55 | 55 | |
56 | 56 | public function token2() |
57 | 57 | { |
58 | - if ($this->auth->getToken() !== null) { |
|
58 | + if ($this->auth->getToken() !== null){ |
|
59 | 59 | return $this->auth->getToken()->getID(); |
60 | 60 | } |
61 | 61 |
@@ -26,10 +26,12 @@ discard block |
||
26 | 26 | $this->auth = $auth; |
27 | 27 | } |
28 | 28 | |
29 | - public function do(GuardInterface $guard) |
|
29 | + public function do{ |
|
30 | + (GuardInterface $guard) |
|
30 | 31 | { |
31 | 32 | if (!$guard->allows('do')) { |
32 | 33 | throw new ControllerException("Unauthorized permission 'do'", ControllerException::FORBIDDEN); |
34 | + } |
|
33 | 35 | } |
34 | 36 | |
35 | 37 | return 'ok'; |
@@ -37,7 +39,8 @@ discard block |
||
37 | 39 | |
38 | 40 | public function token(AuthContextInterface $authContext) |
39 | 41 | { |
40 | - if ($authContext->getToken() !== null) { |
|
42 | + if ($authContext->getToken() !== null) |
|
43 | + { |
|
41 | 44 | return $authContext->getToken()->getID(); |
42 | 45 | } |
43 | 46 | |
@@ -55,7 +58,8 @@ discard block |
||
55 | 58 | |
56 | 59 | public function token2() |
57 | 60 | { |
58 | - if ($this->auth->getToken() !== null) { |
|
61 | + if ($this->auth->getToken() !== null) |
|
62 | + { |
|
59 | 63 | return $this->auth->getToken()->getID(); |
60 | 64 | } |
61 | 65 |
@@ -38,7 +38,7 @@ discard block |
||
38 | 38 | |
39 | 39 | public function testAllowServerAccess(): void |
40 | 40 | { |
41 | - $this->init(static function () { |
|
41 | + $this->init(static function (){ |
|
42 | 42 | return true; |
43 | 43 | }); |
44 | 44 | |
@@ -50,7 +50,7 @@ discard block |
||
50 | 50 | |
51 | 51 | public function testDenyServerAccess(): void |
52 | 52 | { |
53 | - $this->init(static function () { |
|
53 | + $this->init(static function (){ |
|
54 | 54 | return false; |
55 | 55 | }); |
56 | 56 | |
@@ -62,7 +62,7 @@ discard block |
||
62 | 62 | |
63 | 63 | public function testServerAccessWithDependency(): void |
64 | 64 | { |
65 | - $this->init(static function (ServerRequestInterface $request) { |
|
65 | + $this->init(static function (ServerRequestInterface $request){ |
|
66 | 66 | return $request instanceof ServerRequestInterface; |
67 | 67 | }); |
68 | 68 | |
@@ -124,7 +124,7 @@ discard block |
||
124 | 124 | |
125 | 125 | public function testTopicAccessOK(): void |
126 | 126 | { |
127 | - $this->init(null, function () { |
|
127 | + $this->init(null, function (){ |
|
128 | 128 | return true; |
129 | 129 | }); |
130 | 130 | |
@@ -136,7 +136,7 @@ discard block |
||
136 | 136 | |
137 | 137 | public function testTopicWildcardAccessFail(): void |
138 | 138 | { |
139 | - $this->init(null, function () { |
|
139 | + $this->init(null, function (){ |
|
140 | 140 | return true; |
141 | 141 | }); |
142 | 142 | |
@@ -151,7 +151,7 @@ discard block |
||
151 | 151 | $this->init( |
152 | 152 | null, |
153 | 153 | null, |
154 | - function () { |
|
154 | + function (){ |
|
155 | 155 | return true; |
156 | 156 | } |
157 | 157 | ); |
@@ -167,7 +167,7 @@ discard block |
||
167 | 167 | $this->init( |
168 | 168 | null, |
169 | 169 | null, |
170 | - function ($id) { |
|
170 | + function ($id){ |
|
171 | 171 | return $id === '1'; |
172 | 172 | } |
173 | 173 | ); |
@@ -183,7 +183,7 @@ discard block |
||
183 | 183 | $this->init( |
184 | 184 | null, |
185 | 185 | null, |
186 | - function ($id) { |
|
186 | + function ($id){ |
|
187 | 187 | return $id === '1'; |
188 | 188 | } |
189 | 189 | ); |
@@ -204,7 +204,7 @@ discard block |
||
204 | 204 | 'CYCLE_AUTH' => true, |
205 | 205 | 'RR_BROADCAST_PATH' => '/ws/', |
206 | 206 | 'WS_SERVER_CALLBACK' => null, |
207 | - 'WS_TOPIC_CALLBACK' => function (AuthContextInterface $authContext) { |
|
207 | + 'WS_TOPIC_CALLBACK' => function (AuthContextInterface $authContext){ |
|
208 | 208 | return $authContext->getToken() !== null; |
209 | 209 | }, |
210 | 210 | 'WS_TOPIC_WILDCARD_CALLBACK' => null, |
@@ -38,7 +38,8 @@ discard block |
||
38 | 38 | |
39 | 39 | public function testAllowServerAccess(): void |
40 | 40 | { |
41 | - $this->init(static function () { |
|
41 | + $this->init(static function () |
|
42 | + { |
|
42 | 43 | return true; |
43 | 44 | }); |
44 | 45 | |
@@ -50,7 +51,8 @@ discard block |
||
50 | 51 | |
51 | 52 | public function testDenyServerAccess(): void |
52 | 53 | { |
53 | - $this->init(static function () { |
|
54 | + $this->init(static function () |
|
55 | + { |
|
54 | 56 | return false; |
55 | 57 | }); |
56 | 58 | |
@@ -62,7 +64,8 @@ discard block |
||
62 | 64 | |
63 | 65 | public function testServerAccessWithDependency(): void |
64 | 66 | { |
65 | - $this->init(static function (ServerRequestInterface $request) { |
|
67 | + $this->init(static function (ServerRequestInterface $request) |
|
68 | + { |
|
66 | 69 | return $request instanceof ServerRequestInterface; |
67 | 70 | }); |
68 | 71 | |
@@ -124,7 +127,8 @@ discard block |
||
124 | 127 | |
125 | 128 | public function testTopicAccessOK(): void |
126 | 129 | { |
127 | - $this->init(null, function () { |
|
130 | + $this->init(null, function () |
|
131 | + { |
|
128 | 132 | return true; |
129 | 133 | }); |
130 | 134 | |
@@ -136,7 +140,8 @@ discard block |
||
136 | 140 | |
137 | 141 | public function testTopicWildcardAccessFail(): void |
138 | 142 | { |
139 | - $this->init(null, function () { |
|
143 | + $this->init(null, function () |
|
144 | + { |
|
140 | 145 | return true; |
141 | 146 | }); |
142 | 147 | |
@@ -151,7 +156,8 @@ discard block |
||
151 | 156 | $this->init( |
152 | 157 | null, |
153 | 158 | null, |
154 | - function () { |
|
159 | + function () |
|
160 | + { |
|
155 | 161 | return true; |
156 | 162 | } |
157 | 163 | ); |
@@ -167,7 +173,8 @@ discard block |
||
167 | 173 | $this->init( |
168 | 174 | null, |
169 | 175 | null, |
170 | - function ($id) { |
|
176 | + function ($id) |
|
177 | + { |
|
171 | 178 | return $id === '1'; |
172 | 179 | } |
173 | 180 | ); |
@@ -183,7 +190,8 @@ discard block |
||
183 | 190 | $this->init( |
184 | 191 | null, |
185 | 192 | null, |
186 | - function ($id) { |
|
193 | + function ($id) |
|
194 | + { |
|
187 | 195 | return $id === '1'; |
188 | 196 | } |
189 | 197 | ); |
@@ -204,7 +212,8 @@ discard block |
||
204 | 212 | 'CYCLE_AUTH' => true, |
205 | 213 | 'RR_BROADCAST_PATH' => '/ws/', |
206 | 214 | 'WS_SERVER_CALLBACK' => null, |
207 | - 'WS_TOPIC_CALLBACK' => function (AuthContextInterface $authContext) { |
|
215 | + 'WS_TOPIC_CALLBACK' => function (AuthContextInterface $authContext) |
|
216 | + { |
|
208 | 217 | return $authContext->getToken() !== null; |
209 | 218 | }, |
210 | 219 | 'WS_TOPIC_WILDCARD_CALLBACK' => null, |