spiral / framework

src/Csrf/tests/TestResponseFactory.php

Spacing +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
         $response = new Response('php://memory', $code, []);
         $response = $response->withStatus($code, $reasonPhrase);
 
-        foreach ($this->config->getBaseHeaders() as $header => $value) {
+        foreach ($this->config->getBaseHeaders() as $header => $value){
             $response = $response->withAddedHeader($header, $value);
         }
 

Braces +2 added lines, -1 removed lines

@@ -37,7 +37,8 @@
         $response = new Response('php://memory', $code, []);
         $response = $response->withStatus($code, $reasonPhrase);
 
-        foreach ($this->config->getBaseHeaders() as $header => $value) {
+        foreach ($this->config->getBaseHeaders() as $header => $value)
+        {
             $response = $response->withAddedHeader($header, $value);
         }
 

src/Csrf/tests/CsrfTest.php

Spacing +10 added lines, -10 removed lines

@@ -52,7 +52,7 @@ 
     {
         $core = $this->httpCore([CsrfMiddleware::class]);
         $core->setHandler(
-            static function ($r) {
+            static function ($r){
                 return $r->getAttribute(CsrfMiddleware::ATTRIBUTE);
             }
         );
@@ -82,7 +82,7 @@ 
 
         $core = $this->httpCore([CsrfMiddleware::class]);
         $core->setHandler(
-            static function () {
+            static function (){
                 return 'all good';
             }
         );
@@ -94,7 +94,7 @@ 
     {
         $core = $this->httpCore([CsrfMiddleware::class, CsrfFirewall::class]);
         $core->setHandler(
-            static function () {
+            static function (){
                 return 'all good';
             }
         );
@@ -108,7 +108,7 @@ 
         $this->expectException(\LogicException::class);
         $core = $this->httpCore([CsrfFirewall::class]);
         $core->setHandler(
-            static function () {
+            static function (){
                 return 'all good';
             }
         );
@@ -120,7 +120,7 @@ 
     {
         $core = $this->httpCore([CsrfMiddleware::class, CsrfFirewall::class]);
         $core->setHandler(
-            static function () {
+            static function (){
                 return 'all good';
             }
         );
@@ -153,7 +153,7 @@ 
     {
         $core = $this->httpCore([CsrfMiddleware::class, CsrfFirewall::class]);
         $core->setHandler(
-            static function () {
+            static function (){
                 return 'all good';
             }
         );
@@ -186,7 +186,7 @@ 
     {
         $core = $this->httpCore([CsrfMiddleware::class, StrictCsrfFirewall::class]);
         $core->setHandler(
-            static function () {
+            static function (){
                 return 'all good';
             }
         );
@@ -277,10 +277,10 @@ 
     {
         $result = [];
 
-        foreach ($response->getHeaders() as $header) {
-            foreach ($header as $headerLine) {
+        foreach ($response->getHeaders() as $header){
+            foreach ($header as $headerLine){
                 $chunk = explode(';', $headerLine);
-                if (!count($chunk) || mb_strpos($chunk[0], '=') === false) {
+                if (!count($chunk) || mb_strpos($chunk[0], '=') === false){
                     continue;
                 }
 

Braces +20 added lines, -10 removed lines

@@ -52,7 +52,8 @@ 
     {
         $core = $this->httpCore([CsrfMiddleware::class]);
         $core->setHandler(
-            static function ($r) {
+            static function ($r)
+            {
                 return $r->getAttribute(CsrfMiddleware::ATTRIBUTE);
             }
         );
@@ -82,7 +83,8 @@ 
 
         $core = $this->httpCore([CsrfMiddleware::class]);
         $core->setHandler(
-            static function () {
+            static function ()
+            {
                 return 'all good';
             }
         );
@@ -94,7 +96,8 @@ 
     {
         $core = $this->httpCore([CsrfMiddleware::class, CsrfFirewall::class]);
         $core->setHandler(
-            static function () {
+            static function ()
+            {
                 return 'all good';
             }
         );
@@ -108,7 +111,8 @@ 
         $this->expectException(\LogicException::class);
         $core = $this->httpCore([CsrfFirewall::class]);
         $core->setHandler(
-            static function () {
+            static function ()
+            {
                 return 'all good';
             }
         );
@@ -120,7 +124,8 @@ 
     {
         $core = $this->httpCore([CsrfMiddleware::class, CsrfFirewall::class]);
         $core->setHandler(
-            static function () {
+            static function ()
+            {
                 return 'all good';
             }
         );
@@ -153,7 +158,8 @@ 
     {
         $core = $this->httpCore([CsrfMiddleware::class, CsrfFirewall::class]);
         $core->setHandler(
-            static function () {
+            static function ()
+            {
                 return 'all good';
             }
         );
@@ -186,7 +192,8 @@ 
     {
         $core = $this->httpCore([CsrfMiddleware::class, StrictCsrfFirewall::class]);
         $core->setHandler(
-            static function () {
+            static function ()
+            {
                 return 'all good';
             }
         );
@@ -277,10 +284,13 @@ 
     {
         $result = [];
 
-        foreach ($response->getHeaders() as $header) {
-            foreach ($header as $headerLine) {
+        foreach ($response->getHeaders() as $header)
+        {
+            foreach ($header as $headerLine)
+            {
                 $chunk = explode(';', $headerLine);
-                if (!count($chunk) || mb_strpos($chunk[0], '=') === false) {
+                if (!count($chunk) || mb_strpos($chunk[0], '=') === false)
+                {
                     continue;
                 }
 

src/Csrf/src/Middleware/CsrfMiddleware.php

Spacing +6 added lines, -6 removed lines

@@ -46,9 +46,9 @@ 
      */
     public function process(Request $request, RequestHandlerInterface $handler): Response
     {
-        if (isset($request->getCookieParams()[$this->config->getCookie()])) {
+        if (isset($request->getCookieParams()[$this->config->getCookie()])){
             $token = $request->getCookieParams()[$this->config->getCookie()];
-        } else {
+        }else{
             //Making new token
             $token = $this->random($this->config->getTokenLength());
 
@@ -59,7 +59,7 @@ 
         //CSRF issues must be handled by Firewall middleware
         $response = $handler->handle($request->withAttribute(static::ATTRIBUTE, $token));
 
-        if (!empty($cookie)) {
+        if (!empty($cookie)){
             return $response->withAddedHeader('Set-Cookie', $cookie);
         }
 
@@ -94,11 +94,11 @@ 
      */
     private function random(int $length = 32): string
     {
-        try {
-            if (empty($string = random_bytes($length))) {
+        try{
+            if (empty($string = random_bytes($length))){
                 throw new \RuntimeException('Unable to generate random string');
             }
-        } catch (\Throwable $e) {
+        }catch (\Throwable $e){
             throw new \RuntimeException('Unable to generate random string', $e->getCode(), $e);
         }
 

Braces +14 added lines, -6 removed lines

@@ -46,9 +46,12 @@ 
      */
     public function process(Request $request, RequestHandlerInterface $handler): Response
     {
-        if (isset($request->getCookieParams()[$this->config->getCookie()])) {
+        if (isset($request->getCookieParams()[$this->config->getCookie()]))
+        {
             $token = $request->getCookieParams()[$this->config->getCookie()];
-        } else {
+        }
+        else
+        {
             //Making new token
             $token = $this->random($this->config->getTokenLength());
 
@@ -59,7 +62,8 @@ 
         //CSRF issues must be handled by Firewall middleware
         $response = $handler->handle($request->withAttribute(static::ATTRIBUTE, $token));
 
-        if (!empty($cookie)) {
+        if (!empty($cookie))
+        {
             return $response->withAddedHeader('Set-Cookie', $cookie);
         }
 
@@ -94,11 +98,15 @@ 
      */
     private function random(int $length = 32): string
     {
-        try {
-            if (empty($string = random_bytes($length))) {
+        try
+        {
+            if (empty($string = random_bytes($length)))
+            {
                 throw new \RuntimeException('Unable to generate random string');
             }
-        } catch (\Throwable $e) {
+        }
+        catch (\Throwable $e)
+        {
             throw new \RuntimeException('Unable to generate random string', $e->getCode(), $e);
         }
 

src/Csrf/src/Middleware/CsrfFirewall.php

Spacing +4 added lines, -4 removed lines

@@ -61,11 +61,11 @@ 
     {
         $token = $request->getAttribute(CsrfMiddleware::ATTRIBUTE);
 
-        if (empty($token)) {
+        if (empty($token)){
             throw new \LogicException('Unable to apply CSRF firewall, attribute is missing');
         }
 
-        if ($this->isRequired($request) && !hash_equals($token, $this->fetchToken($request))) {
+        if ($this->isRequired($request) && !hash_equals($token, $this->fetchToken($request))){
             return $this->responseFactory->createResponse(412, 'Bad CSRF Token');
         }
 
@@ -91,12 +91,12 @@ 
      */
     protected function fetchToken(Request $request): string
     {
-        if ($request->hasHeader(self::HEADER)) {
+        if ($request->hasHeader(self::HEADER)){
             return (string)$request->getHeaderLine(self::HEADER);
         }
 
         $data = $request->getParsedBody();
-        if (is_array($data) && isset($data[self::PARAMETER]) && is_string($data[self::PARAMETER])) {
+        if (is_array($data) && isset($data[self::PARAMETER]) && is_string($data[self::PARAMETER])){
             return $data[self::PARAMETER];
         }
 

Braces +8 added lines, -4 removed lines

@@ -61,11 +61,13 @@ 
     {
         $token = $request->getAttribute(CsrfMiddleware::ATTRIBUTE);
 
-        if (empty($token)) {
+        if (empty($token))
+        {
             throw new \LogicException('Unable to apply CSRF firewall, attribute is missing');
         }
 
-        if ($this->isRequired($request) && !hash_equals($token, $this->fetchToken($request))) {
+        if ($this->isRequired($request) && !hash_equals($token, $this->fetchToken($request)))
+        {
             return $this->responseFactory->createResponse(412, 'Bad CSRF Token');
         }
 
@@ -91,12 +93,14 @@ 
      */
     protected function fetchToken(Request $request): string
     {
-        if ($request->hasHeader(self::HEADER)) {
+        if ($request->hasHeader(self::HEADER))
+        {
             return (string)$request->getHeaderLine(self::HEADER);
         }
 
         $data = $request->getParsedBody();
-        if (is_array($data) && isset($data[self::PARAMETER]) && is_string($data[self::PARAMETER])) {
+        if (is_array($data) && isset($data[self::PARAMETER]) && is_string($data[self::PARAMETER]))
+        {
             return $data[self::PARAMETER];
         }