spiral / framework

src/Validation/tests/ValidationProviderTest.php

Spacing +1 added lines, -1 removed lines

@@ -11,7 +11,7 @@
 
 final class ValidationProviderTest extends TestCase
 {
-    private m\MockInterface|InvokerInterface $invoker;
+    private m\MockInterface | InvokerInterface $invoker;
     private ValidationProvider $provider;
 
     protected function setUp(): void

src/Validation/src/ValidatorInterface.php

Spacing +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
     /**
      * Create validator copy with new data set.
      */
-    public function withData(array|object $data): ValidatorInterface;
+    public function withData(array | object $data): ValidatorInterface;
 
     /**
      * Receive field from context data or return default value.

src/Validation/src/ValidationInterface.php

Spacing +1 added lines, -1 removed lines

@@ -17,5 +17,5 @@
      * @param mixed         $context Validation context (available for checkers and validation
      *                               methods but is not validated).
      */
-    public function validate(array|object $data, array $rules, mixed $context = null): ValidatorInterface;
+    public function validate(array | object $data, array $rules, mixed $context = null): ValidatorInterface;
 }

src/Framework/Session/SectionScope.php

Spacing +1 added lines, -1 removed lines

@@ -9,7 +9,7 @@
     public function __construct(
         private readonly SessionScope $session,
         private readonly string $name
-    ) {
+    ){
     }
 
     /**

src/Framework/Session/Middleware/SessionMiddleware.php

Spacing +8 added lines, -8 removed lines

@@ -31,7 +31,7 @@ 
         private readonly CookiesConfig $cookiesConfig,
         private readonly SessionFactoryInterface $factory,
         private readonly ScopeInterface $scope
-    ) {
+    ){
     }
 
     /**
@@ -45,12 +45,12 @@ 
             $this->fetchID($request)
         );
 
-        try {
+        try{
             $response = $this->scope->runScope(
                 [SessionInterface::class => $session],
                 static fn () => $handler->handle($request->withAttribute(self::ATTRIBUTE, $session))
             );
-        } catch (\Throwable $e) {
+        }catch (\Throwable $e){
             $session->abort();
             throw $e;
         }
@@ -63,14 +63,14 @@ 
         Request $request,
         Response $response
     ): Response {
-        if (!$session->isStarted()) {
+        if (!$session->isStarted()){
             return $response;
         }
 
         $session->commit();
 
         //SID changed
-        if ($this->fetchID($request) !== $session->getID()) {
+        if ($this->fetchID($request) !== $session->getID()){
             return $this->withCookie($request, $response, $session->getID());
         }
 
@@ -84,7 +84,7 @@ 
     protected function fetchID(Request $request): ?string
     {
         $cookies = $request->getCookieParams();
-        if (empty($cookies[$this->config->getCookie()])) {
+        if (empty($cookies[$this->config->getCookie()])){
             return null;
         }
 
@@ -106,8 +106,8 @@ 
     protected function clientSignature(Request $request): string
     {
         $signature = '';
-        foreach (self::SIGNATURE_HEADERS as $header) {
-            $signature .= $request->getHeaderLine($header) . ';';
+        foreach (self::SIGNATURE_HEADERS as $header){
+            $signature .= $request->getHeaderLine($header).';';
         }
 
         return \hash('sha256', $signature);

Braces +13 added lines, -6 removed lines

@@ -45,12 +45,15 @@ 
             $this->fetchID($request)
         );
 
-        try {
+        try
+        {
             $response = $this->scope->runScope(
                 [SessionInterface::class => $session],
                 static fn () => $handler->handle($request->withAttribute(self::ATTRIBUTE, $session))
             );
-        } catch (\Throwable $e) {
+        }
+        catch (\Throwable $e)
+        {
             $session->abort();
             throw $e;
         }
@@ -63,14 +66,16 @@ 
         Request $request,
         Response $response
     ): Response {
-        if (!$session->isStarted()) {
+        if (!$session->isStarted())
+        {
             return $response;
         }
 
         $session->commit();
 
         //SID changed
-        if ($this->fetchID($request) !== $session->getID()) {
+        if ($this->fetchID($request) !== $session->getID())
+        {
             return $this->withCookie($request, $response, $session->getID());
         }
 
@@ -84,7 +89,8 @@ 
     protected function fetchID(Request $request): ?string
     {
         $cookies = $request->getCookieParams();
-        if (empty($cookies[$this->config->getCookie()])) {
+        if (empty($cookies[$this->config->getCookie()]))
+        {
             return null;
         }
 
@@ -106,7 +112,8 @@ 
     protected function clientSignature(Request $request): string
     {
         $signature = '';
-        foreach (self::SIGNATURE_HEADERS as $header) {
+        foreach (self::SIGNATURE_HEADERS as $header)
+        {
             $signature .= $request->getHeaderLine($header) . ';';
         }
 

src/Framework/Auth/Session/Token.php

Spacing +3 added lines, -3 removed lines

@@ -11,8 +11,8 @@ 
     public function __construct(
         private readonly string $id,
         private readonly array $payload,
-        private readonly ?\DateTimeInterface $expiresAt = null
-    ) {
+        private readonly ? \DateTimeInterface $expiresAt = null
+    ){
     }
 
     public function getID(): string
@@ -50,7 +50,7 @@ 
     public static function unpack(array $data): Token
     {
         $expiresAt = null;
-        if ($data['expiresAt'] !== null) {
+        if ($data['expiresAt'] !== null){
             $expiresAt = (new \DateTimeImmutable())->setTimestamp($data['expiresAt']);
         }
 

Braces +2 added lines, -1 removed lines

@@ -50,7 +50,8 @@
     public static function unpack(array $data): Token
     {
         $expiresAt = null;
-        if ($data['expiresAt'] !== null) {
+        if ($data['expiresAt'] !== null)
+        {
             $expiresAt = (new \DateTimeImmutable())->setTimestamp($data['expiresAt']);
         }
 

src/Framework/Auth/Session/TokenStorage.php

Spacing +10 added lines, -10 removed lines

@@ -19,28 +19,28 @@ 
 
     public function __construct(
         private readonly SessionScope $session
-    ) {
+    ){
     }
 
     public function load(string $id): ?TokenInterface
     {
-        try {
+        try{
             $tokenData = $this->session->getSection(self::SESSION_SECTION)->get('token');
-            if ($tokenData === null) {
+            if ($tokenData === null){
                 return null;
             }
 
             $token = Token::unpack($tokenData);
-        } catch (\Throwable $e) {
-            throw new TokenStorageException('Unable to load session token', (int) $e->getCode(), $e);
+        }catch (\Throwable $e){
+            throw new TokenStorageException('Unable to load session token', (int)$e->getCode(), $e);
         }
 
-        if (!\hash_equals($token->getID(), $id)) {
+        if (!\hash_equals($token->getID(), $id)){
             return null;
         }
 
         $expiresAt = $token->getExpiresAt();
-        if ($expiresAt !== null && $expiresAt < new \DateTimeImmutable()) {
+        if ($expiresAt !== null && $expiresAt < new \DateTimeImmutable()){
             $this->delete($token);
             return null;
         }
@@ -50,13 +50,13 @@ 
 
     public function create(array $payload, \DateTimeInterface $expiresAt = null): TokenInterface
     {
-        try {
+        try{
             $token = new Token($this->randomHash(128), $payload, $expiresAt);
             $this->session->getSection(self::SESSION_SECTION)->set('token', $token->pack());
 
             return $token;
-        } catch (\Throwable $e) {
-            throw new TokenStorageException('Unable to create session token', (int) $e->getCode(), $e);
+        }catch (\Throwable $e){
+            throw new TokenStorageException('Unable to create session token', (int)$e->getCode(), $e);
         }
     }
 

Braces +16 added lines, -7 removed lines

@@ -24,23 +24,29 @@ 
 
     public function load(string $id): ?TokenInterface
     {
-        try {
+        try
+        {
             $tokenData = $this->session->getSection(self::SESSION_SECTION)->get('token');
-            if ($tokenData === null) {
+            if ($tokenData === null)
+            {
                 return null;
             }
 
             $token = Token::unpack($tokenData);
-        } catch (\Throwable $e) {
+        }
+        catch (\Throwable $e)
+        {
             throw new TokenStorageException('Unable to load session token', (int) $e->getCode(), $e);
         }
 
-        if (!\hash_equals($token->getID(), $id)) {
+        if (!\hash_equals($token->getID(), $id))
+        {
             return null;
         }
 
         $expiresAt = $token->getExpiresAt();
-        if ($expiresAt !== null && $expiresAt < new \DateTimeImmutable()) {
+        if ($expiresAt !== null && $expiresAt < new \DateTimeImmutable())
+        {
             $this->delete($token);
             return null;
         }
@@ -50,12 +56,15 @@ 
 
     public function create(array $payload, \DateTimeInterface $expiresAt = null): TokenInterface
     {
-        try {
+        try
+        {
             $token = new Token($this->randomHash(128), $payload, $expiresAt);
             $this->session->getSection(self::SESSION_SECTION)->set('token', $token->pack());
 
             return $token;
-        } catch (\Throwable $e) {
+        }
+        catch (\Throwable $e)
+        {
             throw new TokenStorageException('Unable to create session token', (int) $e->getCode(), $e);
         }
     }

src/Framework/Auth/AuthScope.php

Spacing +3 added lines, -3 removed lines

@@ -15,7 +15,7 @@ 
 {
     public function __construct(
         private readonly ContainerInterface $container
-    ) {
+    ){
     }
 
     /**
@@ -68,9 +68,9 @@ 
 
     private function getAuthContext(): AuthContextInterface
     {
-        try {
+        try{
             return $this->container->get(AuthContextInterface::class);
-        } catch (NotFoundExceptionInterface $e) {
+        }catch (NotFoundExceptionInterface $e){
             throw new ScopeException('Unable to resolve auth context, invalid scope', $e->getCode(), $e);
         }
     }

Braces +5 added lines, -2 removed lines

@@ -68,9 +68,12 @@
 
     private function getAuthContext(): AuthContextInterface
     {
-        try {
+        try
+        {
             return $this->container->get(AuthContextInterface::class);
-        } catch (NotFoundExceptionInterface $e) {
+        }
+        catch (NotFoundExceptionInterface $e)
+        {
             throw new ScopeException('Unable to resolve auth context, invalid scope', $e->getCode(), $e);
         }
     }

src/Framework/Domain/PipelineInterceptor.php

Spacing +19 added lines, -19 removed lines

@@ -21,7 +21,7 @@ 
         private ReaderInterface $reader,
         private ContainerInterface $container,
         private ?EventDispatcherInterface $dispatcher = null
-    ) {
+    ){
     }
 
     /**
@@ -30,17 +30,17 @@ 
     public function process(string $controller, string $action, array $parameters, CoreInterface $core): mixed
     {
         $annotation = $this->readAnnotation($controller, $action);
-        if ($core instanceof InterceptorPipeline && $annotation->skipNext) {
+        if ($core instanceof InterceptorPipeline && $annotation->skipNext){
             $this->removeNextInterceptorsFromOriginalPipeline($core);
         }
 
         $pipeline = $this->getCachedPipeline($controller, $action, $annotation);
-        if (!empty($pipeline)) {
-            if ($core instanceof InterceptorPipeline) {
+        if (!empty($pipeline)){
+            if ($core instanceof InterceptorPipeline){
                 $this->injectInterceptorsIntoOriginalPipeline($core, $pipeline);
-            } else {
+            }else{
                 $core = new InterceptableCore($core, $this->dispatcher);
-                foreach ($pipeline as $interceptor) {
+                foreach ($pipeline as $interceptor){
                     $core->addInterceptor($interceptor);
                 }
             }
@@ -51,9 +51,9 @@ 
 
     private function readAnnotation(string $controller, string $action): Pipeline
     {
-        try {
+        try{
             $method = new \ReflectionMethod($controller, $action);
-        } catch (\ReflectionException) {
+        }catch (\ReflectionException){
             return new Pipeline();
         }
 
@@ -68,14 +68,14 @@ 
 
         $oldInterceptors = $pipelineReflection->getValue($pipeline);
         $newInterceptors = [];
-        foreach ($oldInterceptors as $interceptor) {
+        foreach ($oldInterceptors as $interceptor){
             $newInterceptors[] = $interceptor;
-            if ($interceptor instanceof self) {
+            if ($interceptor instanceof self){
                 break;
             }
         }
 
-        if (\count($newInterceptors) !== \count($oldInterceptors)) {
+        if (\count($newInterceptors) !== \count($oldInterceptors)){
             $pipelineReflection->setValue($pipeline, $newInterceptors);
         }
     }
@@ -86,16 +86,16 @@ 
 
         $oldInterceptors = $pipelineReflection->getValue($pipeline);
         $newInterceptors = [];
-        foreach ($oldInterceptors as $interceptor) {
+        foreach ($oldInterceptors as $interceptor){
             $newInterceptors[] = $interceptor;
-            if ($interceptor instanceof self) {
-                foreach ($interceptors as $newInterceptor) {
+            if ($interceptor instanceof self){
+                foreach ($interceptors as $newInterceptor){
                     $newInterceptors[] = $newInterceptor;
                 }
             }
         }
 
-        if (\count($newInterceptors) !== \count($oldInterceptors)) {
+        if (\count($newInterceptors) !== \count($oldInterceptors)){
             $pipelineReflection->setValue($pipeline, $newInterceptors);
         }
     }
@@ -103,7 +103,7 @@ 
     private function getCachedPipeline(string $controller, string $action, Pipeline $annotation): array
     {
         $key = "{$controller}:{$action}";
-        if (!\array_key_exists($key, $this->cache)) {
+        if (!\array_key_exists($key, $this->cache)){
             $this->cache[$key] = $this->extractAnnotationPipeline($annotation);
         }
 
@@ -113,10 +113,10 @@ 
     private function extractAnnotationPipeline(Pipeline $annotation): array
     {
         $interceptors = [];
-        foreach ($annotation->pipeline as $interceptor) {
-            try {
+        foreach ($annotation->pipeline as $interceptor){
+            try{
                 $interceptors[] = $this->container->get($interceptor);
-            } catch (\Throwable) {
+            }catch (\Throwable){
             }
         }
 

Braces +39 added lines, -18 removed lines

@@ -30,17 +30,23 @@ 
     public function process(string $controller, string $action, array $parameters, CoreInterface $core): mixed
     {
         $annotation = $this->readAnnotation($controller, $action);
-        if ($core instanceof InterceptorPipeline && $annotation->skipNext) {
+        if ($core instanceof InterceptorPipeline && $annotation->skipNext)
+        {
             $this->removeNextInterceptorsFromOriginalPipeline($core);
         }
 
         $pipeline = $this->getCachedPipeline($controller, $action, $annotation);
-        if (!empty($pipeline)) {
-            if ($core instanceof InterceptorPipeline) {
+        if (!empty($pipeline))
+        {
+            if ($core instanceof InterceptorPipeline)
+            {
                 $this->injectInterceptorsIntoOriginalPipeline($core, $pipeline);
-            } else {
+            }
+            else
+            {
                 $core = new InterceptableCore($core, $this->dispatcher);
-                foreach ($pipeline as $interceptor) {
+                foreach ($pipeline as $interceptor)
+                {
                     $core->addInterceptor($interceptor);
                 }
             }
@@ -51,9 +57,12 @@ 
 
     private function readAnnotation(string $controller, string $action): Pipeline
     {
-        try {
+        try
+        {
             $method = new \ReflectionMethod($controller, $action);
-        } catch (\ReflectionException) {
+        }
+        catch (\ReflectionException)
+        {
             return new Pipeline();
         }
 
@@ -68,14 +77,17 @@ 
 
         $oldInterceptors = $pipelineReflection->getValue($pipeline);
         $newInterceptors = [];
-        foreach ($oldInterceptors as $interceptor) {
+        foreach ($oldInterceptors as $interceptor)
+        {
             $newInterceptors[] = $interceptor;
-            if ($interceptor instanceof self) {
+            if ($interceptor instanceof self)
+            {
                 break;
             }
         }
 
-        if (\count($newInterceptors) !== \count($oldInterceptors)) {
+        if (\count($newInterceptors) !== \count($oldInterceptors))
+        {
             $pipelineReflection->setValue($pipeline, $newInterceptors);
         }
     }
@@ -86,16 +98,20 @@ 
 
         $oldInterceptors = $pipelineReflection->getValue($pipeline);
         $newInterceptors = [];
-        foreach ($oldInterceptors as $interceptor) {
+        foreach ($oldInterceptors as $interceptor)
+        {
             $newInterceptors[] = $interceptor;
-            if ($interceptor instanceof self) {
-                foreach ($interceptors as $newInterceptor) {
+            if ($interceptor instanceof self)
+            {
+                foreach ($interceptors as $newInterceptor)
+                {
                     $newInterceptors[] = $newInterceptor;
                 }
             }
         }
 
-        if (\count($newInterceptors) !== \count($oldInterceptors)) {
+        if (\count($newInterceptors) !== \count($oldInterceptors))
+        {
             $pipelineReflection->setValue($pipeline, $newInterceptors);
         }
     }
@@ -103,7 +119,8 @@ 
     private function getCachedPipeline(string $controller, string $action, Pipeline $annotation): array
     {
         $key = "{$controller}:{$action}";
-        if (!\array_key_exists($key, $this->cache)) {
+        if (!\array_key_exists($key, $this->cache))
+        {
             $this->cache[$key] = $this->extractAnnotationPipeline($annotation);
         }
 
@@ -113,10 +130,14 @@ 
     private function extractAnnotationPipeline(Pipeline $annotation): array
     {
         $interceptors = [];
-        foreach ($annotation->pipeline as $interceptor) {
-            try {
+        foreach ($annotation->pipeline as $interceptor)
+        {
+            try
+            {
                 $interceptors[] = $this->container->get($interceptor);
-            } catch (\Throwable) {
+            }
+            catch (\Throwable)
+            {
             }
         }