Passed
Pull Request — master (#737)
by Vadim
07:15
created
src/Http/tests/PipelineTest.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -26,7 +26,7 @@  discard block
 block discarded – undo
26 26
     {
27 27
         $pipeline = new Pipeline(new Container());
28 28
 
29
-        $handler = new CallableHandler(function () {
29
+        $handler = new CallableHandler(function (){
30 30
             return 'response';
31 31
         }, new ResponseFactory(new HttpConfig(['headers' => []])));
32 32
 
@@ -41,7 +41,7 @@  discard block
 block discarded – undo
41 41
     {
42 42
         $pipeline = new Pipeline(new Container());
43 43
 
44
-        $handler = new CallableHandler(function () {
44
+        $handler = new CallableHandler(function (){
45 45
             return 'response';
46 46
         }, new ResponseFactory(new HttpConfig(['headers' => []])));
47 47
 
Please login to merge, or discard this patch.
Braces   +4 added lines, -2 removed lines patch added patch discarded remove patch
@@ -26,7 +26,8 @@  discard block
 block discarded – undo
26 26
     {
27 27
         $pipeline = new Pipeline(new Container());
28 28
 
29
-        $handler = new CallableHandler(function () {
29
+        $handler = new CallableHandler(function ()
30
+        {
30 31
             return 'response';
31 32
         }, new ResponseFactory(new HttpConfig(['headers' => []])));
32 33
 
@@ -41,7 +42,8 @@  discard block
 block discarded – undo
41 42
     {
42 43
         $pipeline = new Pipeline(new Container());
43 44
 
44
-        $handler = new CallableHandler(function () {
45
+        $handler = new CallableHandler(function ()
46
+        {
45 47
             return 'response';
46 48
         }, new ResponseFactory(new HttpConfig(['headers' => []])));
47 49
 
Please login to merge, or discard this patch.
src/Http/tests/AcceptHeaderItemTest.php 2 patches
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -33,7 +33,7 @@  discard block
 block discarded – undo
33 33
     public function emptyItemProvider(): iterable
34 34
     {
35 35
         $values = ['', ' '];
36
-        foreach ($values as $value) {
36
+        foreach ($values as $value){
37 37
             yield from [
38 38
                 [AcceptHeaderItem::fromString($value)],
39 39
                 [new AcceptHeaderItem($value)],
@@ -82,11 +82,11 @@  discard block
 block discarded – undo
82 82
      */
83 83
     public function testItemQualityBoundaries(float $quality, AcceptHeaderItem $item): void
84 84
     {
85
-        if ($quality > 1) {
85
+        if ($quality > 1){
86 86
             $this->assertSame(1.0, $item->getQuality());
87 87
         }
88 88
 
89
-        if ($quality < 0) {
89
+        if ($quality < 0){
90 90
             $this->assertSame(0.0, $item->getQuality());
91 91
         }
92 92
 
@@ -100,7 +100,7 @@  discard block
 block discarded – undo
100 100
     public function qualityBoundariesProvider(): iterable
101 101
     {
102 102
         $qualities = [-1, 0, 0.5, 1, 2];
103
-        foreach ($qualities as $quality) {
103
+        foreach ($qualities as $quality){
104 104
             yield from [
105 105
                 [$quality, AcceptHeaderItem::fromString("*;q=$quality")],
106 106
                 [$quality, AcceptHeaderItem::fromString("*;Q=$quality")],
@@ -140,9 +140,9 @@  discard block
 block discarded – undo
140 140
             ]
141 141
         ];
142 142
 
143
-        foreach ($set as $params) {
143
+        foreach ($set as $params){
144 144
             $formattedParams = [];
145
-            foreach ($params['passed'] as $k => $v) {
145
+            foreach ($params['passed'] as $k => $v){
146 146
                 $formattedParams[] = "$k=$v";
147 147
             }
148 148
 
Please login to merge, or discard this patch.
Braces   +12 added lines, -6 removed lines patch added patch discarded remove patch
@@ -33,7 +33,8 @@  discard block
 block discarded – undo
33 33
     public function emptyItemProvider(): iterable
34 34
     {
35 35
         $values = ['', ' '];
36
-        foreach ($values as $value) {
36
+        foreach ($values as $value)
37
+        {
37 38
             yield from [
38 39
                 [AcceptHeaderItem::fromString($value)],
39 40
                 [new AcceptHeaderItem($value)],
@@ -82,11 +83,13 @@  discard block
 block discarded – undo
82 83
      */
83 84
     public function testItemQualityBoundaries(float $quality, AcceptHeaderItem $item): void
84 85
     {
85
-        if ($quality > 1) {
86
+        if ($quality > 1)
87
+        {
86 88
             $this->assertSame(1.0, $item->getQuality());
87 89
         }
88 90
 
89
-        if ($quality < 0) {
91
+        if ($quality < 0)
92
+        {
90 93
             $this->assertSame(0.0, $item->getQuality());
91 94
         }
92 95
 
@@ -100,7 +103,8 @@  discard block
 block discarded – undo
100 103
     public function qualityBoundariesProvider(): iterable
101 104
     {
102 105
         $qualities = [-1, 0, 0.5, 1, 2];
103
-        foreach ($qualities as $quality) {
106
+        foreach ($qualities as $quality)
107
+        {
104 108
             yield from [
105 109
                 [$quality, AcceptHeaderItem::fromString("*;q=$quality")],
106 110
                 [$quality, AcceptHeaderItem::fromString("*;Q=$quality")],
@@ -140,9 +144,11 @@  discard block
 block discarded – undo
140 144
             ]
141 145
         ];
142 146
 
143
-        foreach ($set as $params) {
147
+        foreach ($set as $params)
148
+        {
144 149
             $formattedParams = [];
145
-            foreach ($params['passed'] as $k => $v) {
150
+            foreach ($params['passed'] as $k => $v)
151
+            {
146 152
                 $formattedParams[] = "$k=$v";
147 153
             }
148 154
 
Please login to merge, or discard this patch.
src/Http/tests/Diactoros/UploadedFileFactory.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -26,7 +26,7 @@
 block discarded – undo
26 26
         string $clientFilename = null,
27 27
         string $clientMediaType = null
28 28
     ): UploadedFileInterface {
29
-        if ($size === null) {
29
+        if ($size === null){
30 30
             $size = $stream->getSize();
31 31
         }
32 32
 
Please login to merge, or discard this patch.
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -26,7 +26,8 @@
 block discarded – undo
26 26
         string $clientFilename = null,
27 27
         string $clientMediaType = null
28 28
     ): UploadedFileInterface {
29
-        if ($size === null) {
29
+        if ($size === null)
30
+        {
30 31
             $size = $stream->getSize();
31 32
         }
32 33
 
Please login to merge, or discard this patch.
src/Http/tests/Diactoros/ResponseFactory.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -37,7 +37,7 @@
 block discarded – undo
37 37
         $response = new Response('php://memory', $code, []);
38 38
         $response = $response->withStatus($code, $reasonPhrase);
39 39
 
40
-        foreach ($this->config->getBaseHeaders() as $header => $value) {
40
+        foreach ($this->config->getBaseHeaders() as $header => $value){
41 41
             $response = $response->withAddedHeader($header, $value);
42 42
         }
43 43
 
Please login to merge, or discard this patch.
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -37,7 +37,8 @@
 block discarded – undo
37 37
         $response = new Response('php://memory', $code, []);
38 38
         $response = $response->withStatus($code, $reasonPhrase);
39 39
 
40
-        foreach ($this->config->getBaseHeaders() as $header => $value) {
40
+        foreach ($this->config->getBaseHeaders() as $header => $value)
41
+        {
41 42
             $response = $response->withAddedHeader($header, $value);
42 43
         }
43 44
 
Please login to merge, or discard this patch.
src/Http/tests/ServerTest.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -164,7 +164,7 @@  discard block
 block discarded – undo
164 164
         $this->container->bind(ServerRequestInterface::class, $request);
165 165
 
166 166
         $this->assertSame(
167
-            ['PATH' => 'sample',],
167
+            ['PATH' => 'sample', ],
168 168
             $this->input->server->__debugInfo()
169 169
         );
170 170
     }
@@ -178,7 +178,7 @@  discard block
 block discarded – undo
178 178
         $this->container->bind(ServerRequestInterface::class, $request);
179 179
 
180 180
         $this->assertSame(
181
-            ['PATH' => 'sample',],
181
+            ['PATH' => 'sample', ],
182 182
             iterator_to_array($this->input->server)
183 183
         );
184 184
     }
Please login to merge, or discard this patch.
src/Http/src/CallableHandler.php 2 patches
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -51,21 +51,21 @@  discard block
 block discarded – undo
51 51
         $output = $result = null;
52 52
 
53 53
         $response = $this->responseFactory->createResponse(200);
54
-        try {
54
+        try{
55 55
             $result = ($this->callable)($request, $response);
56
-        } catch (\Throwable $e) {
56
+        }catch (\Throwable $e){
57 57
             ob_get_clean();
58 58
             throw $e;
59
-        } finally {
60
-            while (ob_get_level() > $outputLevel + 1) {
61
-                $output = ob_get_clean() . $output;
59
+        }finally{
60
+            while (ob_get_level() > $outputLevel + 1){
61
+                $output = ob_get_clean().$output;
62 62
             }
63 63
         }
64 64
 
65 65
         return $this->wrapResponse(
66 66
             $response,
67 67
             $result,
68
-            ob_get_clean() . $output
68
+            ob_get_clean().$output
69 69
         );
70 70
     }
71 71
 
@@ -80,17 +80,17 @@  discard block
 block discarded – undo
80 80
      */
81 81
     private function wrapResponse(Response $response, $result = null, string $output = ''): Response
82 82
     {
83
-        if ($result instanceof Response) {
84
-            if (!empty($output) && $result->getBody()->isWritable()) {
83
+        if ($result instanceof Response){
84
+            if (!empty($output) && $result->getBody()->isWritable()){
85 85
                 $result->getBody()->write($output);
86 86
             }
87 87
 
88 88
             return $result;
89 89
         }
90 90
 
91
-        if (is_array($result) || $result instanceof \JsonSerializable) {
91
+        if (is_array($result) || $result instanceof \JsonSerializable){
92 92
             $response = $this->writeJson($response, $result);
93
-        } else {
93
+        }else{
94 94
             $response->getBody()->write((string)$result);
95 95
         }
96 96
 
Please login to merge, or discard this patch.
Braces   +19 added lines, -8 removed lines patch added patch discarded remove patch
@@ -51,13 +51,19 @@  discard block
 block discarded – undo
51 51
         $output = $result = null;
52 52
 
53 53
         $response = $this->responseFactory->createResponse(200);
54
-        try {
54
+        try
55
+        {
55 56
             $result = ($this->callable)($request, $response);
56
-        } catch (\Throwable $e) {
57
+        }
58
+        catch (\Throwable $e)
59
+        {
57 60
             ob_get_clean();
58 61
             throw $e;
59
-        } finally {
60
-            while (ob_get_level() > $outputLevel + 1) {
62
+        }
63
+        finally
64
+        {
65
+            while (ob_get_level() > $outputLevel + 1)
66
+            {
61 67
                 $output = ob_get_clean() . $output;
62 68
             }
63 69
         }
@@ -80,17 +86,22 @@  discard block
 block discarded – undo
80 86
      */
81 87
     private function wrapResponse(Response $response, $result = null, string $output = ''): Response
82 88
     {
83
-        if ($result instanceof Response) {
84
-            if (!empty($output) && $result->getBody()->isWritable()) {
89
+        if ($result instanceof Response)
90
+        {
91
+            if (!empty($output) && $result->getBody()->isWritable())
92
+            {
85 93
                 $result->getBody()->write($output);
86 94
             }
87 95
 
88 96
             return $result;
89 97
         }
90 98
 
91
-        if (is_array($result) || $result instanceof \JsonSerializable) {
99
+        if (is_array($result) || $result instanceof \JsonSerializable)
100
+        {
92 101
             $response = $this->writeJson($response, $result);
93
-        } else {
102
+        }
103
+        else
104
+        {
94 105
             $response->getBody()->write((string)$result);
95 106
         }
96 107
 
Please login to merge, or discard this patch.
src/Http/src/Http.php 2 patches
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -47,13 +47,13 @@  discard block
 block discarded – undo
47 47
         Pipeline $pipeline,
48 48
         ResponseFactoryInterface $responseFactory,
49 49
         ContainerInterface $container
50
-    ) {
50
+    ){
51 51
         $this->config = $config;
52 52
         $this->pipeline = $pipeline;
53 53
         $this->responseFactory = $responseFactory;
54 54
         $this->container = $container;
55 55
 
56
-        foreach ($this->config->getMiddleware() as $middleware) {
56
+        foreach ($this->config->getMiddleware() as $middleware){
57 57
             $this->pipeline->pushMiddleware($this->container->get($middleware));
58 58
         }
59 59
     }
@@ -72,11 +72,11 @@  discard block
 block discarded – undo
72 72
      */
73 73
     public function setHandler($handler): self
74 74
     {
75
-        if ($handler instanceof RequestHandlerInterface) {
75
+        if ($handler instanceof RequestHandlerInterface){
76 76
             $this->handler = $handler;
77
-        } elseif (is_callable($handler)) {
77
+        } elseif (is_callable($handler)){
78 78
             $this->handler = new CallableHandler($handler, $this->responseFactory);
79
-        } else {
79
+        }else{
80 80
             throw new HttpException(
81 81
                 'Invalid handler is given, expects callable or RequestHandlerInterface.'
82 82
             );
@@ -93,7 +93,7 @@  discard block
 block discarded – undo
93 93
      */
94 94
     public function handle(ServerRequestInterface $request): ResponseInterface
95 95
     {
96
-        if (empty($this->handler)) {
96
+        if (empty($this->handler)){
97 97
             throw new HttpException('Unable to run HttpCore, no handler is set.');
98 98
         }
99 99
 
Please login to merge, or discard this patch.
Braces   +12 added lines, -5 removed lines patch added patch discarded remove patch
@@ -53,7 +53,8 @@  discard block
 block discarded – undo
53 53
         $this->responseFactory = $responseFactory;
54 54
         $this->container = $container;
55 55
 
56
-        foreach ($this->config->getMiddleware() as $middleware) {
56
+        foreach ($this->config->getMiddleware() as $middleware)
57
+        {
57 58
             $this->pipeline->pushMiddleware($this->container->get($middleware));
58 59
         }
59 60
     }
@@ -72,11 +73,16 @@  discard block
 block discarded – undo
72 73
      */
73 74
     public function setHandler($handler): self
74 75
     {
75
-        if ($handler instanceof RequestHandlerInterface) {
76
+        if ($handler instanceof RequestHandlerInterface)
77
+        {
76 78
             $this->handler = $handler;
77
-        } elseif (is_callable($handler)) {
79
+        }
80
+        elseif (is_callable($handler))
81
+        {
78 82
             $this->handler = new CallableHandler($handler, $this->responseFactory);
79
-        } else {
83
+        }
84
+        else
85
+        {
80 86
             throw new HttpException(
81 87
                 'Invalid handler is given, expects callable or RequestHandlerInterface.'
82 88
             );
@@ -93,7 +99,8 @@  discard block
 block discarded – undo
93 99
      */
94 100
     public function handle(ServerRequestInterface $request): ResponseInterface
95 101
     {
96
-        if (empty($this->handler)) {
102
+        if (empty($this->handler))
103
+        {
97 104
             throw new HttpException('Unable to run HttpCore, no handler is set.');
98 105
         }
99 106
 
Please login to merge, or discard this patch.
src/Http/src/Pipeline.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -73,12 +73,12 @@
 block discarded – undo
73 73
      */
74 74
     public function handle(Request $request): Response
75 75
     {
76
-        if (empty($this->handler)) {
76
+        if (empty($this->handler)){
77 77
             throw new PipelineException('Unable to run pipeline, no handler given.');
78 78
         }
79 79
 
80 80
         $position = $this->position++;
81
-        if (isset($this->middleware[$position])) {
81
+        if (isset($this->middleware[$position])){
82 82
             return $this->middleware[$position]->process($request, $this);
83 83
         }
84 84
 
Please login to merge, or discard this patch.
Braces   +6 added lines, -3 removed lines patch added patch discarded remove patch
@@ -73,16 +73,19 @@
 block discarded – undo
73 73
      */
74 74
     public function handle(Request $request): Response
75 75
     {
76
-        if (empty($this->handler)) {
76
+        if (empty($this->handler))
77
+        {
77 78
             throw new PipelineException('Unable to run pipeline, no handler given.');
78 79
         }
79 80
 
80 81
         $position = $this->position++;
81
-        if (isset($this->middleware[$position])) {
82
+        if (isset($this->middleware[$position]))
83
+        {
82 84
             return $this->middleware[$position]->process($request, $this);
83 85
         }
84 86
 
85
-        return $this->scope->runScope([Request::class => $request], function () use ($request) {
87
+        return $this->scope->runScope([Request::class => $request], function () use ($request)
88
+        {
86 89
             return $this->handler->handle($request);
87 90
         });
88 91
     }
Please login to merge, or discard this patch.
src/Http/src/Exception/ClientException.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -34,11 +34,11 @@
 block discarded – undo
34 34
      */
35 35
     public function __construct(?int $code = null, string $message = '', ?\Throwable $previous = null)
36 36
     {
37
-        if (empty($code) && empty($this->code)) {
37
+        if (empty($code) && empty($this->code)){
38 38
             $code = self::BAD_DATA;
39 39
         }
40 40
 
41
-        if (empty($message)) {
41
+        if (empty($message)){
42 42
             $message = "Http Error - {$code}";
43 43
         }
44 44
 
Please login to merge, or discard this patch.
Braces   +4 added lines, -2 removed lines patch added patch discarded remove patch
@@ -34,11 +34,13 @@
 block discarded – undo
34 34
      */
35 35
     public function __construct(?int $code = null, string $message = '', ?\Throwable $previous = null)
36 36
     {
37
-        if (empty($code) && empty($this->code)) {
37
+        if (empty($code) && empty($this->code))
38
+        {
38 39
             $code = self::BAD_DATA;
39 40
         }
40 41
 
41
-        if (empty($message)) {
42
+        if (empty($message))
43
+        {
42 44
             $message = "Http Error - {$code}";
43 45
         }
44 46
 
Please login to merge, or discard this patch.