spiral / framework

src/AuthHttp/src/Transport/CookieTransport.php

Spacing +5 added lines, -5 removed lines

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

Braces +9 added lines, -4 removed lines

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

src/AuthHttp/src/Transport/HeaderTransport.php

Spacing +4 added lines, -4 removed lines

@@ -36,7 +36,7 @@ 
      */
     public function fetchToken(Request $request): ?string
     {
-        if ($request->hasHeader($this->header)) {
+        if ($request->hasHeader($this->header)){
             return $this->extractToken($request);
         }
 
@@ -52,7 +52,7 @@ 
         string $tokenID,
         DateTimeInterface $expiresAt = null
     ): Response {
-        if ($request->hasHeader($this->header) && $this->extractToken($request) === $tokenID) {
+        if ($request->hasHeader($this->header) && $this->extractToken($request) === $tokenID){
             return $response;
         }
 
@@ -71,10 +71,10 @@ 
     {
         $headerLine = $request->getHeaderLine($this->header);
 
-        if ($this->valueFormat !== '%s') {
+        if ($this->valueFormat !== '%s'){
             [$token] = sscanf($headerLine, $this->valueFormat);
 
-            return $token !== null ? (string) $token : null;
+            return $token !== null ? (string)$token : null;
         }
 
         return $headerLine;

Braces +6 added lines, -3 removed lines

@@ -36,7 +36,8 @@ 
      */
     public function fetchToken(Request $request): ?string
     {
-        if ($request->hasHeader($this->header)) {
+        if ($request->hasHeader($this->header))
+        {
             return $this->extractToken($request);
         }
 
@@ -52,7 +53,8 @@ 
         string $tokenID,
         DateTimeInterface $expiresAt = null
     ): Response {
-        if ($request->hasHeader($this->header) && $this->extractToken($request) === $tokenID) {
+        if ($request->hasHeader($this->header) && $this->extractToken($request) === $tokenID)
+        {
             return $response;
         }
 
@@ -71,7 +73,8 @@ 
     {
         $headerLine = $request->getHeaderLine($this->header);
 
-        if ($this->valueFormat !== '%s') {
+        if ($this->valueFormat !== '%s')
+        {
             [$token] = sscanf($headerLine, $this->valueFormat);
 
             return $token !== null ? (string) $token : null;

src/AuthHttp/src/Middleware/AuthMiddleware.php

Braces +10 added lines, -5 removed lines

@@ -70,14 +70,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;
             }
 
@@ -91,13 +94,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/Csrf/src/Middleware/CsrfMiddleware.php

Spacing +6 added lines, -6 removed lines

@@ -45,9 +45,9 @@ 
     public function process(Request $request, RequestHandlerInterface $handler): Response
     {
         $cookie = null;
-        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());
 
@@ -58,7 +58,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);
         }
 
@@ -89,11 +89,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

@@ -45,9 +45,12 @@ 
     public function process(Request $request, RequestHandlerInterface $handler): Response
     {
         $cookie = null;
-        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());
 
@@ -58,7 +61,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);
         }
 
@@ -89,11 +93,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

@@ -56,11 +56,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');
         }
 
@@ -80,12 +80,12 @@ 
      */
     protected function fetchToken(Request $request): string
     {
-        if ($request->hasHeader(self::HEADER)) {
+        if ($request->hasHeader(self::HEADER)){
             return $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

@@ -56,11 +56,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');
         }
 
@@ -80,12 +82,14 @@ 
      */
     protected function fetchToken(Request $request): string
     {
-        if ($request->hasHeader(self::HEADER)) {
+        if ($request->hasHeader(self::HEADER))
+        {
             return $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/Scaffolder/src/helpers.php

Spacing +7 added lines, -7 removed lines

@@ -11,7 +11,7 @@ 
 
 namespace Spiral\Scaffolder;
 
-if (!function_exists('trimPostfix')) {
+if (!function_exists('trimPostfix')){
     /**
      * @param string $name
      * @param string $postfix
@@ -26,7 +26,7 @@ 
     }
 }
 
-if (!function_exists('isAssociativeArray')) {
+if (!function_exists('isAssociativeArray')){
     /**
      * @param array $array
      * @return bool
@@ -35,12 +35,12 @@ 
     function isAssociativeArray(array $array): bool
     {
         $keys = [];
-        foreach ($array as $key => $_) {
-            if (!is_int($key)) {
+        foreach ($array as $key => $_){
+            if (!is_int($key)){
                 return true;
             }
 
-            if ($key !== count($keys)) {
+            if ($key !== count($keys)){
                 return true;
             }
 
@@ -51,7 +51,7 @@ 
     }
 }
 
-if (!function_exists('defineArrayType')) {
+if (!function_exists('defineArrayType')){
     /**
      * @param array  $array
      * @param string|null $failureType
@@ -60,7 +60,7 @@ 
      */
     function defineArrayType(array $array, string $failureType = null): ?string
     {
-        $types = array_map(static fn ($value): string => gettype($value), $array);
+        $types = array_map(static fn ($value) : string => gettype($value), $array);
 
         $types = array_unique($types);
 

src/SendIt/src/Bootloader/MailerBootloader.php

Spacing +5 added lines, -5 removed lines

@@ -69,7 +69,7 @@ 
 
     public function start(Container $container): void
     {
-        if ($container->has(JobRegistry::class)) {
+        if ($container->has(JobRegistry::class)){
             // Will be removed since v3.0
             $registry = $container->get(JobRegistry::class);
             $registry->setHandler(MailQueue::JOB_NAME, MailJob::class);
@@ -77,16 +77,16 @@ 
             $container->bindSingleton(
                 MailerInterface::class,
                 static function (MailerConfig $config) use ($container) {
-                    if ($config->getQueueConnection() === 'sync') {
+                    if ($config->getQueueConnection() === 'sync'){
                         $queue = $container->get(ShortCircuit::class);
-                    } else {
+                    }else{
                         $queue = $container->get(QueueInterface::class);
                     }
 
                     return new MailQueue($config, $queue);
                 }
             );
-        } else {
+        }else{
             $container->bindSingleton(
                 MailerInterface::class,
                 static fn (MailerConfig $config, QueueConnectionProviderInterface $provider) => new MailQueue(
@@ -96,7 +96,7 @@ 
             );
         }
 
-        if ($container->has(HandlerRegistryInterface::class)) {
+        if ($container->has(HandlerRegistryInterface::class)){
             $registry = $container->get(HandlerRegistryInterface::class);
             $registry->setHandler(MailQueue::JOB_NAME, MailJob::class);
         }

Braces +14 added lines, -6 removed lines

@@ -69,24 +69,31 @@ 
 
     public function start(Container $container): void
     {
-        if ($container->has(JobRegistry::class)) {
+        if ($container->has(JobRegistry::class))
+        {
             // Will be removed since v3.0
             $registry = $container->get(JobRegistry::class);
             $registry->setHandler(MailQueue::JOB_NAME, MailJob::class);
             $registry->setSerializer(MailQueue::JOB_NAME, MessageSerializer::class);
             $container->bindSingleton(
                 MailerInterface::class,
-                static function (MailerConfig $config) use ($container) {
-                    if ($config->getQueueConnection() === 'sync') {
+                static function (MailerConfig $config) use ($container)
+                {
+                    if ($config->getQueueConnection() === 'sync')
+                    {
                         $queue = $container->get(ShortCircuit::class);
-                    } else {
+                    }
+                    else
+                    {
                         $queue = $container->get(QueueInterface::class);
                     }
 
                     return new MailQueue($config, $queue);
                 }
             );
-        } else {
+        }
+        else
+        {
             $container->bindSingleton(
                 MailerInterface::class,
                 static fn (MailerConfig $config, QueueConnectionProviderInterface $provider) => new MailQueue(
@@ -96,7 +103,8 @@ 
             );
         }
 
-        if ($container->has(HandlerRegistryInterface::class)) {
+        if ($container->has(HandlerRegistryInterface::class))
+        {
             $registry = $container->get(HandlerRegistryInterface::class);
             $registry->setHandler(MailQueue::JOB_NAME, MailJob::class);
         }

src/Cache/src/Bootloader/CacheBootloader.php

Spacing +2 added lines, -2 removed lines

@@ -54,7 +54,7 @@ 
     {
         $manager = new CacheManager($config, $container);
 
-        foreach ($config->getAliases() as $alias => $storageName) {
+        foreach ($config->getAliases() as $alias => $storageName){
             $container->bind($alias, static fn (CacheManager $manager) => $manager->storage($storageName));
         }
 
@@ -74,7 +74,7 @@ 
                     ],
                     'file' => [
                         'type' => 'file',
-                        'path' => $dirs->get('runtime') . 'cache',
+                        'path' => $dirs->get('runtime').'cache',
                     ],
                 ],
                 'typeAliases' => [

Braces +2 added lines, -1 removed lines

@@ -54,7 +54,8 @@
     {
         $manager = new CacheManager($config, $container);
 
-        foreach ($config->getAliases() as $alias => $storageName) {
+        foreach ($config->getAliases() as $alias => $storageName)
+        {
             $container->bind($alias, static fn (CacheManager $manager) => $manager->storage($storageName));
         }
 

src/Config/src/Loader/PhpLoader.php

Spacing +2 added lines, -2 removed lines

@@ -33,9 +33,9 @@
      */
     public function loadFile(string $section, string $filename): array
     {
-        try {
+        try{
             return ContainerScope::runScope($this->container, fn () => require $filename);
-        } catch (Throwable $e) {
+        }catch (Throwable $e){
             throw new LoaderException($e->getMessage(), $e->getCode(), $e);
         }
     }

Braces +5 added lines, -2 removed lines

@@ -33,9 +33,12 @@
      */
     public function loadFile(string $section, string $filename): array
     {
-        try {
+        try
+        {
             return ContainerScope::runScope($this->container, fn () => require $filename);
-        } catch (Throwable $e) {
+        }
+        catch (Throwable $e)
+        {
             throw new LoaderException($e->getMessage(), $e->getCode(), $e);
         }
     }