@@ -37,7 +37,7 @@ |
||
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 |
@@ -52,7 +52,7 @@ discard block |
||
52 | 52 | { |
53 | 53 | $core = $this->httpCore([CsrfMiddleware::class]); |
54 | 54 | $core->setHandler( |
55 | - static function ($r) { |
|
55 | + static function ($r){ |
|
56 | 56 | return $r->getAttribute(CsrfMiddleware::ATTRIBUTE); |
57 | 57 | } |
58 | 58 | ); |
@@ -82,7 +82,7 @@ discard block |
||
82 | 82 | |
83 | 83 | $core = $this->httpCore([CsrfMiddleware::class]); |
84 | 84 | $core->setHandler( |
85 | - static function () { |
|
85 | + static function (){ |
|
86 | 86 | return 'all good'; |
87 | 87 | } |
88 | 88 | ); |
@@ -94,7 +94,7 @@ discard block |
||
94 | 94 | { |
95 | 95 | $core = $this->httpCore([CsrfMiddleware::class, CsrfFirewall::class]); |
96 | 96 | $core->setHandler( |
97 | - static function () { |
|
97 | + static function (){ |
|
98 | 98 | return 'all good'; |
99 | 99 | } |
100 | 100 | ); |
@@ -108,7 +108,7 @@ discard block |
||
108 | 108 | $this->expectException(\LogicException::class); |
109 | 109 | $core = $this->httpCore([CsrfFirewall::class]); |
110 | 110 | $core->setHandler( |
111 | - static function () { |
|
111 | + static function (){ |
|
112 | 112 | return 'all good'; |
113 | 113 | } |
114 | 114 | ); |
@@ -120,7 +120,7 @@ discard block |
||
120 | 120 | { |
121 | 121 | $core = $this->httpCore([CsrfMiddleware::class, CsrfFirewall::class]); |
122 | 122 | $core->setHandler( |
123 | - static function () { |
|
123 | + static function (){ |
|
124 | 124 | return 'all good'; |
125 | 125 | } |
126 | 126 | ); |
@@ -153,7 +153,7 @@ discard block |
||
153 | 153 | { |
154 | 154 | $core = $this->httpCore([CsrfMiddleware::class, CsrfFirewall::class]); |
155 | 155 | $core->setHandler( |
156 | - static function () { |
|
156 | + static function (){ |
|
157 | 157 | return 'all good'; |
158 | 158 | } |
159 | 159 | ); |
@@ -186,7 +186,7 @@ discard block |
||
186 | 186 | { |
187 | 187 | $core = $this->httpCore([CsrfMiddleware::class, StrictCsrfFirewall::class]); |
188 | 188 | $core->setHandler( |
189 | - static function () { |
|
189 | + static function (){ |
|
190 | 190 | return 'all good'; |
191 | 191 | } |
192 | 192 | ); |
@@ -277,10 +277,10 @@ discard block |
||
277 | 277 | { |
278 | 278 | $result = []; |
279 | 279 | |
280 | - foreach ($response->getHeaders() as $header) { |
|
281 | - foreach ($header as $headerLine) { |
|
280 | + foreach ($response->getHeaders() as $header){ |
|
281 | + foreach ($header as $headerLine){ |
|
282 | 282 | $chunk = explode(';', $headerLine); |
283 | - if (!count($chunk) || mb_strpos($chunk[0], '=') === false) { |
|
283 | + if (!count($chunk) || mb_strpos($chunk[0], '=') === false){ |
|
284 | 284 | continue; |
285 | 285 | } |
286 | 286 |
@@ -46,9 +46,9 @@ discard block |
||
46 | 46 | */ |
47 | 47 | public function process(Request $request, RequestHandlerInterface $handler): Response |
48 | 48 | { |
49 | - if (isset($request->getCookieParams()[$this->config->getCookie()])) { |
|
49 | + if (isset($request->getCookieParams()[$this->config->getCookie()])){ |
|
50 | 50 | $token = $request->getCookieParams()[$this->config->getCookie()]; |
51 | - } else { |
|
51 | + }else{ |
|
52 | 52 | //Making new token |
53 | 53 | $token = $this->random($this->config->getTokenLength()); |
54 | 54 | |
@@ -59,7 +59,7 @@ discard block |
||
59 | 59 | //CSRF issues must be handled by Firewall middleware |
60 | 60 | $response = $handler->handle($request->withAttribute(static::ATTRIBUTE, $token)); |
61 | 61 | |
62 | - if (!empty($cookie)) { |
|
62 | + if (!empty($cookie)){ |
|
63 | 63 | return $response->withAddedHeader('Set-Cookie', $cookie); |
64 | 64 | } |
65 | 65 | |
@@ -94,11 +94,11 @@ discard block |
||
94 | 94 | */ |
95 | 95 | private function random(int $length = 32): string |
96 | 96 | { |
97 | - try { |
|
98 | - if (empty($string = random_bytes($length))) { |
|
97 | + try{ |
|
98 | + if (empty($string = random_bytes($length))){ |
|
99 | 99 | throw new \RuntimeException('Unable to generate random string'); |
100 | 100 | } |
101 | - } catch (\Throwable $e) { |
|
101 | + }catch (\Throwable $e){ |
|
102 | 102 | throw new \RuntimeException('Unable to generate random string', $e->getCode(), $e); |
103 | 103 | } |
104 | 104 |
@@ -61,11 +61,11 @@ discard block |
||
61 | 61 | { |
62 | 62 | $token = $request->getAttribute(CsrfMiddleware::ATTRIBUTE); |
63 | 63 | |
64 | - if (empty($token)) { |
|
64 | + if (empty($token)){ |
|
65 | 65 | throw new \LogicException('Unable to apply CSRF firewall, attribute is missing'); |
66 | 66 | } |
67 | 67 | |
68 | - if ($this->isRequired($request) && !hash_equals($token, $this->fetchToken($request))) { |
|
68 | + if ($this->isRequired($request) && !hash_equals($token, $this->fetchToken($request))){ |
|
69 | 69 | return $this->responseFactory->createResponse(412, 'Bad CSRF Token'); |
70 | 70 | } |
71 | 71 | |
@@ -91,12 +91,12 @@ discard block |
||
91 | 91 | */ |
92 | 92 | protected function fetchToken(Request $request): string |
93 | 93 | { |
94 | - if ($request->hasHeader(self::HEADER)) { |
|
94 | + if ($request->hasHeader(self::HEADER)){ |
|
95 | 95 | return (string)$request->getHeaderLine(self::HEADER); |
96 | 96 | } |
97 | 97 | |
98 | 98 | $data = $request->getParsedBody(); |
99 | - if (is_array($data) && isset($data[self::PARAMETER]) && is_string($data[self::PARAMETER])) { |
|
99 | + if (is_array($data) && isset($data[self::PARAMETER]) && is_string($data[self::PARAMETER])){ |
|
100 | 100 | return $data[self::PARAMETER]; |
101 | 101 | } |
102 | 102 |