spiral / framework

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];
         }
 

src/AuthHttp/src/Transport/CookieTransport.php

Spacing +5 added lines, -5 removed lines

@@ -56,7 +56,7 @@ 
         bool $secure = false,
         bool $httpOnly = true,
         ?string $sameSite = null
-    ) {
+    ){
         $this->cookie = $cookie;
         $this->basePath = $basePath;
         $this->domain = $domain;
@@ -85,7 +85,7 @@ 
     ): Response {
         /** @var CookieQueue $cookieQueue */
         $cookieQueue = $request->getAttribute(CookieQueue::ATTRIBUTE);
-        if ($cookieQueue === null) {
+        if ($cookieQueue === null){
             return $response->withAddedHeader(
                 'Set-Cookie',
                 Cookie::create(
@@ -101,9 +101,9 @@ 
             );
         }
 
-        if ($tokenID === null) {
+        if ($tokenID === null){
             $cookieQueue->delete($this->cookie);
-        } else {
+        }else{
             $cookieQueue->set(
                 $this->cookie,
                 $tokenID,
@@ -134,7 +134,7 @@ 
      */
     private function getLifetime(\DateTimeInterface $expiresAt = null): ?int
     {
-        if ($expiresAt === null) {
+        if ($expiresAt === null){
             return null;
         }
 

Braces +9 added lines, -4 removed lines

@@ -85,7 +85,8 @@ 
     ): Response {
         /** @var CookieQueue $cookieQueue */
         $cookieQueue = $request->getAttribute(CookieQueue::ATTRIBUTE);
-        if ($cookieQueue === null) {
+        if ($cookieQueue === null)
+        {
             return $response->withAddedHeader(
                 'Set-Cookie',
                 Cookie::create(
@@ -101,9 +102,12 @@ 
             );
         }
 
-        if ($tokenID === null) {
+        if ($tokenID === null)
+        {
             $cookieQueue->delete($this->cookie);
-        } else {
+        }
+        else
+        {
             $cookieQueue->set(
                 $this->cookie,
                 $tokenID,
@@ -134,7 +138,8 @@ 
      */
     private function getLifetime(\DateTimeInterface $expiresAt = null): ?int
     {
-        if ($expiresAt === null) {
+        if ($expiresAt === null)
+        {
             return null;
         }
 

src/AuthHttp/src/Transport/HeaderTransport.php

Spacing +2 added lines, -2 removed lines

@@ -36,7 +36,7 @@ 
      */
     public function fetchToken(Request $request): ?string
     {
-        if ($request->hasHeader($this->header)) {
+        if ($request->hasHeader($this->header)){
             return $request->getHeaderLine($this->header);
         }
 
@@ -52,7 +52,7 @@ 
         string $tokenID,
         \DateTimeInterface $expiresAt = null
     ): Response {
-        if ($request->hasHeader($this->header) && $request->getHeaderLine($this->header) === $tokenID) {
+        if ($request->hasHeader($this->header) && $request->getHeaderLine($this->header) === $tokenID){
             return $response;
         }
 

Braces +4 added lines, -2 removed lines

@@ -36,7 +36,8 @@ 
      */
     public function fetchToken(Request $request): ?string
     {
-        if ($request->hasHeader($this->header)) {
+        if ($request->hasHeader($this->header))
+        {
             return $request->getHeaderLine($this->header);
         }
 
@@ -52,7 +53,8 @@ 
         string $tokenID,
         \DateTimeInterface $expiresAt = null
     ): Response {
-        if ($request->hasHeader($this->header) && $request->getHeaderLine($this->header) === $tokenID) {
+        if ($request->hasHeader($this->header) && $request->getHeaderLine($this->header) === $tokenID)
+        {
             return $response;
         }
 

src/AuthHttp/src/Middleware/AuthMiddleware.php

Spacing +6 added lines, -6 removed lines

@@ -54,7 +54,7 @@ 
         ActorProviderInterface $actorProvider,
         TokenStorageInterface $tokenStorage,
         TransportRegistry $transportRegistry
-    ) {
+    ){
         $this->scope = $scope;
         $this->actorProvider = $actorProvider;
         $this->tokenStorage = $tokenStorage;
@@ -89,14 +89,14 @@ 
      */
     private function initContext(Request $request, AuthContextInterface $authContext): AuthContextInterface
     {
-        foreach ($this->transportRegistry->getTransports() as $name => $transport) {
+        foreach ($this->transportRegistry->getTransports() as $name => $transport){
             $tokenID = $transport->fetchToken($request);
-            if ($tokenID === null) {
+            if ($tokenID === null){
                 continue;
             }
 
             $token = $this->tokenStorage->load($tokenID);
-            if ($token === null) {
+            if ($token === null){
                 continue;
             }
 
@@ -116,13 +116,13 @@ 
      */
     private function closeContext(Request $request, Response $response, AuthContextInterface $authContext): Response
     {
-        if ($authContext->getToken() === null) {
+        if ($authContext->getToken() === null){
             return $response;
         }
 
         $transport = $this->transportRegistry->getTransport($authContext->getTransport());
 
-        if ($authContext->isClosed()) {
+        if ($authContext->isClosed()){
             $this->tokenStorage->delete($authContext->getToken());
 
             return $transport->removeToken(

Braces +12 added lines, -6 removed lines

@@ -74,7 +74,8 @@ 
 
         $response = $this->scope->runScope(
             [AuthContextInterface::class => $authContext],
-            static function () use ($request, $handler, $authContext) {
+            static function () use ($request, $handler, $authContext)
+            {
                 return $handler->handle($request->withAttribute(self::ATTRIBUTE, $authContext));
             }
         );
@@ -89,14 +90,17 @@ 
      */
     private function initContext(Request $request, AuthContextInterface $authContext): AuthContextInterface
     {
-        foreach ($this->transportRegistry->getTransports() as $name => $transport) {
+        foreach ($this->transportRegistry->getTransports() as $name => $transport)
+        {
             $tokenID = $transport->fetchToken($request);
-            if ($tokenID === null) {
+            if ($tokenID === null)
+            {
                 continue;
             }
 
             $token = $this->tokenStorage->load($tokenID);
-            if ($token === null) {
+            if ($token === null)
+            {
                 continue;
             }
 
@@ -116,13 +120,15 @@ 
      */
     private function closeContext(Request $request, Response $response, AuthContextInterface $authContext): Response
     {
-        if ($authContext->getToken() === null) {
+        if ($authContext->getToken() === null)
+        {
             return $response;
         }
 
         $transport = $this->transportRegistry->getTransport($authContext->getTransport());
 
-        if ($authContext->isClosed()) {
+        if ($authContext->isClosed())
+        {
             $this->tokenStorage->delete($authContext->getToken());
 
             return $transport->removeToken(

src/AuthHttp/src/Middleware/Firewall/AbstractFirewall.php

Spacing +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
         /** @var AuthContextInterface $context */
         $authContext = $request->getAttribute(AuthMiddleware::ATTRIBUTE);
 
-        if ($authContext === null || $authContext->getActor() === null) {
+        if ($authContext === null || $authContext->getActor() === null){
             return $this->denyAccess($request, $handler);
         }
 

Braces +2 added lines, -1 removed lines

@@ -33,7 +33,8 @@
         /** @var AuthContextInterface $context */
         $authContext = $request->getAttribute(AuthMiddleware::ATTRIBUTE);
 
-        if ($authContext === null || $authContext->getActor() === null) {
+        if ($authContext === null || $authContext->getActor() === null)
+        {
             return $this->denyAccess($request, $handler);
         }
 

src/AuthHttp/src/TransportRegistry.php

Spacing +1 added lines, -1 removed lines

@@ -49,7 +49,7 @@
     {
         $name = $name ?? $this->default;
 
-        if (!isset($this->transports[$name])) {
+        if (!isset($this->transports[$name])){
             throw new TransportException("Undefined auth transport {$name}");
         }
 

Braces +2 added lines, -1 removed lines

@@ -49,7 +49,8 @@
     {
         $name = $name ?? $this->default;
 
-        if (!isset($this->transports[$name])) {
+        if (!isset($this->transports[$name]))
+        {
             throw new TransportException("Undefined auth transport {$name}");
         }
 

src/AuthHttp/tests/AuthMiddlewareTest.php

Spacing +1 added lines, -1 removed lines

@@ -75,7 +75,7 @@
 
         $http->setHandler(
             static function (ServerRequestInterface $request, ResponseInterface $response): void {
-                if ($request->getAttribute('authContext')->getToken() === null) {
+                if ($request->getAttribute('authContext')->getToken() === null){
                     echo 'no token';
                 }
             }

Braces +2 added lines, -1 removed lines

@@ -75,7 +75,8 @@
 
         $http->setHandler(
             static function (ServerRequestInterface $request, ResponseInterface $response): void {
-                if ($request->getAttribute('authContext')->getToken() === null) {
+                if ($request->getAttribute('authContext')->getToken() === null)
+                {
                     echo 'no token';
                 }
             }

src/AuthHttp/tests/HeaderTransportTest.php

Spacing +4 added lines, -4 removed lines

@@ -43,9 +43,9 @@ 
 
         $http->setHandler(
             static function (ServerRequestInterface $request, ResponseInterface $response): void {
-                if ($request->getAttribute('authContext')->getToken() === null) {
+                if ($request->getAttribute('authContext')->getToken() === null){
                     echo 'no token';
-                } else {
+                }else{
                     echo $request->getAttribute('authContext')->getToken()->getID();
                     echo ':';
                     echo json_encode($request->getAttribute('authContext')->getToken()->getPayload());
@@ -67,9 +67,9 @@ 
 
         $http->setHandler(
             static function (ServerRequestInterface $request, ResponseInterface $response): void {
-                if ($request->getAttribute('authContext')->getToken() === null) {
+                if ($request->getAttribute('authContext')->getToken() === null){
                     echo 'no token';
-                } else {
+                }else{
                     echo $request->getAttribute('authContext')->getToken()->getID();
                     echo ':';
                     echo json_encode($request->getAttribute('authContext')->getToken()->getPayload());

Braces +10 added lines, -4 removed lines

@@ -43,9 +43,12 @@ 
 
         $http->setHandler(
             static function (ServerRequestInterface $request, ResponseInterface $response): void {
-                if ($request->getAttribute('authContext')->getToken() === null) {
+                if ($request->getAttribute('authContext')->getToken() === null)
+                {
                     echo 'no token';
-                } else {
+                }
+                else
+                {
                     echo $request->getAttribute('authContext')->getToken()->getID();
                     echo ':';
                     echo json_encode($request->getAttribute('authContext')->getToken()->getPayload());
@@ -67,9 +70,12 @@ 
 
         $http->setHandler(
             static function (ServerRequestInterface $request, ResponseInterface $response): void {
-                if ($request->getAttribute('authContext')->getToken() === null) {
+                if ($request->getAttribute('authContext')->getToken() === null)
+                {
                     echo 'no token';
-                } else {
+                }
+                else
+                {
                     echo $request->getAttribute('authContext')->getToken()->getID();
                     echo ':';
                     echo json_encode($request->getAttribute('authContext')->getToken()->getPayload());