spiral / framework

src/Http/src/Middleware/ErrorHandlerMiddleware.php

Spacing +10 added lines, -10 removed lines

@@ -32,7 +32,7 @@ 
         private readonly ResponseFactoryInterface $responseFactory,
         private readonly ExceptionHandlerInterface $errorHandler,
         private readonly Verbosity $verbosity = Verbosity::VERBOSE,
-    ) {
+    ){
     }
 
     /**
@@ -41,17 +41,17 @@ 
      */
     public function process(Request $request, Handler $handler): Response
     {
-        try {
+        try{
             return $handler->handle($request);
-        } catch (ClientException|RouterException $e) {
+        }catch (ClientException | RouterException $e){
             $code = $e instanceof ClientException ? $e->getCode() : 404;
-        } catch (\Throwable $e) {
+        }catch (\Throwable $e){
             $code = 500;
         }
 
         $this->errorHandler->report($e);
 
-        if (!$this->suppressErrors->suppressed()) {
+        if (!$this->suppressErrors->suppressed()){
             return $this->renderError($request, $e, $code);
         }
 
@@ -69,8 +69,8 @@ 
 
         [$format, $renderer] = $this->getRenderer($this->errorHandler, $request);
 
-        if ($format !== null) {
-            $response = $response->withHeader('Content-Type', $format . '; charset=UTF-8');
+        if ($format !== null){
+            $response = $response->withHeader('Content-Type', $format.'; charset=UTF-8');
         }
 
         $response->getBody()->write(
@@ -89,12 +89,12 @@ 
      */
     private function getRenderer(ExceptionHandlerInterface $handler, Request $request): array
     {
-        if ($request->hasHeader('Accept')) {
+        if ($request->hasHeader('Accept')){
             $acceptItems = AcceptHeader::fromString($request->getHeaderLine('Accept'))->getAll();
-            foreach ($acceptItems as $item) {
+            foreach ($acceptItems as $item){
                 $format = $item->getValue();
                 $renderer = $handler->getRenderer($format);
-                if ($renderer instanceof \Spiral\Exceptions\ExceptionRendererInterface) {
+                if ($renderer instanceof \Spiral\Exceptions\ExceptionRendererInterface){
                     return [$format, $renderer];
                 }
             }

Braces +18 added lines, -8 removed lines

@@ -41,17 +41,23 @@ 
      */
     public function process(Request $request, Handler $handler): Response
     {
-        try {
+        try
+        {
             return $handler->handle($request);
-        } catch (ClientException|RouterException $e) {
+        }
+        catch (ClientException|RouterException $e)
+        {
             $code = $e instanceof ClientException ? $e->getCode() : 404;
-        } catch (\Throwable $e) {
+        }
+        catch (\Throwable $e)
+        {
             $code = 500;
         }
 
         $this->errorHandler->report($e);
 
-        if (!$this->suppressErrors->suppressed()) {
+        if (!$this->suppressErrors->suppressed())
+        {
             return $this->renderError($request, $e, $code);
         }
 
@@ -69,7 +75,8 @@ 
 
         [$format, $renderer] = $this->getRenderer($this->errorHandler, $request);
 
-        if ($format !== null) {
+        if ($format !== null)
+        {
             $response = $response->withHeader('Content-Type', $format . '; charset=UTF-8');
         }
 
@@ -89,12 +96,15 @@ 
      */
     private function getRenderer(ExceptionHandlerInterface $handler, Request $request): array
     {
-        if ($request->hasHeader('Accept')) {
+        if ($request->hasHeader('Accept'))
+        {
             $acceptItems = AcceptHeader::fromString($request->getHeaderLine('Accept'))->getAll();
-            foreach ($acceptItems as $item) {
+            foreach ($acceptItems as $item)
+            {
                 $format = $item->getValue();
                 $renderer = $handler->getRenderer($format);
-                if ($renderer instanceof \Spiral\Exceptions\ExceptionRendererInterface) {
+                if ($renderer instanceof \Spiral\Exceptions\ExceptionRendererInterface)
+                {
                     return [$format, $renderer];
                 }
             }

src/Http/src/LazyPipeline.php

Spacing +7 added lines, -7 removed lines

@@ -39,7 +39,7 @@ 
     public function __construct(
         #[Proxy] private readonly ContainerInterface $container,
         private readonly ?EventDispatcherInterface $dispatcher = null,
-    ) {
+    ){
     }
 
     /**
@@ -47,7 +47,7 @@ 
      *
      * @param MiddlewareInterface ...$middleware List of middleware or its definition.
      */
-    public function withAddedMiddleware(MiddlewareInterface|Autowire|string ...$middleware): self
+    public function withAddedMiddleware(MiddlewareInterface | Autowire | string ...$middleware): self
     {
         $pipeline = clone $this;
         $pipeline->middleware = \array_merge($pipeline->middleware, $middleware);
@@ -59,7 +59,7 @@ 
      *
      * @param MiddlewareInterface ...$middleware List of middleware or its definition.
      */
-    public function withMiddleware(MiddlewareInterface|Autowire|string ...$middleware): self
+    public function withMiddleware(MiddlewareInterface | Autowire | string ...$middleware): self
     {
         $pipeline = clone $this;
         $pipeline->middleware = $middleware;
@@ -92,9 +92,9 @@ 
 
         $previousRequest = $currentRequest->get();
         $currentRequest->set($request);
-        try {
+        try{
             // There is no middleware to process, let's pass the request to the handler
-            if (!\array_key_exists($this->position, $this->middleware)) {
+            if (!\array_key_exists($this->position, $this->middleware)){
                 return $this->handler->handle($request);
             }
 
@@ -108,7 +108,7 @@ 
                 ? \sprintf('%s=%s', $this->middleware[$this->position], $middleware::class)
                 : $middleware::class;
             // Init a tracing span when the pipeline starts
-            if (!$span instanceof \Spiral\Telemetry\SpanInterface) {
+            if (!$span instanceof \Spiral\Telemetry\SpanInterface){
                 /** @var TracerInterface $tracer */
                 $tracer = $this->container->get(TracerInterface::class);
                 return $tracer->trace(
@@ -126,7 +126,7 @@ 
             $span->setAttribute('http.middleware', $middlewares);
 
             return $middleware->process($request, $this->next($span));
-        } finally {
+        }finally{
             $currentRequest->set($previousRequest);
         }
     }

Braces +9 added lines, -4 removed lines

@@ -92,9 +92,11 @@ 
 
         $previousRequest = $currentRequest->get();
         $currentRequest->set($request);
-        try {
+        try
+        {
             // There is no middleware to process, let's pass the request to the handler
-            if (!\array_key_exists($this->position, $this->middleware)) {
+            if (!\array_key_exists($this->position, $this->middleware))
+            {
                 return $this->handler->handle($request);
             }
 
@@ -108,7 +110,8 @@ 
                 ? \sprintf('%s=%s', $this->middleware[$this->position], $middleware::class)
                 : $middleware::class;
             // Init a tracing span when the pipeline starts
-            if (!$span instanceof \Spiral\Telemetry\SpanInterface) {
+            if (!$span instanceof \Spiral\Telemetry\SpanInterface)
+            {
                 /** @var TracerInterface $tracer */
                 $tracer = $this->container->get(TracerInterface::class);
                 return $tracer->trace(
@@ -126,7 +129,9 @@ 
             $span->setAttribute('http.middleware', $middlewares);
 
             return $middleware->process($request, $this->next($span));
-        } finally {
+        }
+        finally
+        {
             $currentRequest->set($previousRequest);
         }
     }

src/Logger/src/Traits/LoggerTrait.php

Spacing +3 added lines, -3 removed lines

@@ -29,11 +29,11 @@ 
      */
     protected function getLogger(?string $channel = null): LoggerInterface
     {
-        if ($channel !== null) {
+        if ($channel !== null){
             return $this->allocateLogger($channel);
         }
 
-        if ($this->logger !== null) {
+        if ($this->logger !== null){
             return $this->logger;
         }
 
@@ -47,7 +47,7 @@ 
     private function allocateLogger(string $channel): LoggerInterface
     {
         $container = ContainerScope::getContainer();
-        if (!$container instanceof \Psr\Container\ContainerInterface || !$container->has(LogsInterface::class)) {
+        if (!$container instanceof \Psr\Container\ContainerInterface || !$container->has(LogsInterface::class)){
             return $this->logger ?? new NullLogger();
         }
 

Braces +6 added lines, -3 removed lines

@@ -29,11 +29,13 @@ 
      */
     protected function getLogger(?string $channel = null): LoggerInterface
     {
-        if ($channel !== null) {
+        if ($channel !== null)
+        {
             return $this->allocateLogger($channel);
         }
 
-        if ($this->logger !== null) {
+        if ($this->logger !== null)
+        {
             return $this->logger;
         }
 
@@ -47,7 +49,8 @@ 
     private function allocateLogger(string $channel): LoggerInterface
     {
         $container = ContainerScope::getContainer();
-        if (!$container instanceof \Psr\Container\ContainerInterface || !$container->has(LogsInterface::class)) {
+        if (!$container instanceof \Psr\Container\ContainerInterface || !$container->has(LogsInterface::class))
+        {
             return $this->logger ?? new NullLogger();
         }
 

src/Scaffolder/src/Declaration/ConfigDeclaration.php

Spacing +18 added lines, -18 removed lines

@@ -34,7 +34,7 @@ 
         protected ?string $comment = null,
         private readonly string $directory = '',
         ?string $namespace = null,
-    ) {
+    ){
         parent::__construct($config, $name, $comment, $namespace);
     }
 
@@ -43,8 +43,8 @@ 
         $this->class->addConstant('CONFIG', $configName)->setPublic();
 
         $filename = $this->makeConfigFilename($configName);
-        if ($reverse) {
-            if (!$this->files->exists($filename)) {
+        if ($reverse){
+            if (!$this->files->exists($filename)){
                 throw new ScaffolderException(\sprintf("Config filename %s doesn't exist", $filename));
             }
 
@@ -52,7 +52,7 @@ 
             $this->declareGetters($defaultsFromFile);
 
             $this->class->getProperty('config')->setValue($this->defaultValues->get($defaultsFromFile));
-        } elseif (!$this->files->exists($filename)) {
+        } elseif (!$this->files->exists($filename)){
             $this->touchConfigFile($filename);
         }
     }
@@ -108,7 +108,7 @@ 
 
         $this->files->write(
             $filename,
-            $file->render() . PHP_EOL . (new Dumper())->dump(new Literal('return [];')),
+            $file->render().PHP_EOL.(new Dumper())->dump(new Literal('return [];')),
             FilesInterface::READONLY,
             true,
         );
@@ -126,7 +126,7 @@ 
         $getters = [];
         $gettersByKey = [];
 
-        foreach ($defaults as $key => $value) {
+        foreach ($defaults as $key => $value){
             $key = (string)$key;
             $getter = $this->makeGetterName($key);
             $getters[] = $getter;
@@ -134,19 +134,19 @@ 
             $method = $this->class->addMethod($getter)->setPublic();
             $method->setBody(\sprintf('return $this->config[\'%s\'];', $key));
 
-            if (\is_array($value)) {
+            if (\is_array($value)){
                 $gettersByKey[] = ['key' => $key, 'value' => $value];
             }
 
             $returnTypeHint = $this->typeHints->getHint(\gettype($value));
-            if ($returnTypeHint !== null) {
+            if ($returnTypeHint !== null){
                 $method->setReturnType($returnTypeHint);
             }
         }
 
-        foreach ($gettersByKey as $item) {
+        foreach ($gettersByKey as $item){
             $method = $this->declareGettersByKey($getters, $item['key'], $item['value']);
-            if ($method instanceof \Spiral\Reactor\Partial\Method) {
+            if ($method instanceof \Spiral\Reactor\Partial\Method){
                 $getters[] = $method->getName();
             }
         }
@@ -155,30 +155,30 @@ 
     private function declareGettersByKey(array $methodNames, string $key, array $value): ?Method
     {
         //Won't create if there's less than 2 sub-items
-        if (\count($value) < 2) {
+        if (\count($value) < 2){
             return null;
         }
 
         $singularKey = $this->singularize($key);
         $name = $this->makeGetterName($singularKey);
-        if (\in_array($name, $methodNames, true)) {
+        if (\in_array($name, $methodNames, true)){
             $name = $this->makeGetterName($singularKey, 'get', 'by');
         }
 
         //Name conflict, won't merge
-        if (\in_array($name, $methodNames, true)) {
+        if (\in_array($name, $methodNames, true)){
             return null;
         }
 
         $keyType = defineArrayType(\array_keys($value), '-mixed-');
         $valueType = defineArrayType(\array_values($value), '-mixed-');
         //We need a fixed structure here
-        if ($keyType === '-mixed-' || $valueType === '-mixed-') {
+        if ($keyType === '-mixed-' || $valueType === '-mixed-'){
             return null;
         }
 
         //Won't create for associated arrays
-        if ($this->typeAnnotations->mapType($keyType) === 'int' && \array_is_list($value)) {
+        if ($this->typeAnnotations->mapType($keyType) === 'int' && \array_is_list($value)){
             return null;
         }
 
@@ -188,7 +188,7 @@ 
 
         $param = $method->addParameter($singularKey);
         $paramTypeHint = $this->typeHints->getHint($keyType);
-        if ($paramTypeHint !== null) {
+        if ($paramTypeHint !== null){
             $param->setType($paramTypeHint);
         }
 
@@ -198,13 +198,13 @@ 
     private function makeGetterName(string $name, string $prefix = 'get', string $postfix = ''): string
     {
         $chunks = [];
-        if (!empty($prefix)) {
+        if (!empty($prefix)){
             $chunks[] = $prefix;
         }
 
         $name = $this->slugify->slugify($name, ['lowercase' => false]);
         $chunks[] = \count($chunks) !== 0 ? $this->classify($name) : $name;
-        if (!empty($postfix)) {
+        if (!empty($postfix)){
             $chunks[] = \ucfirst($postfix);
         }
 

Braces +33 added lines, -16 removed lines

@@ -43,8 +43,10 @@ 
         $this->class->addConstant('CONFIG', $configName)->setPublic();
 
         $filename = $this->makeConfigFilename($configName);
-        if ($reverse) {
-            if (!$this->files->exists($filename)) {
+        if ($reverse)
+        {
+            if (!$this->files->exists($filename))
+            {
                 throw new ScaffolderException(\sprintf("Config filename %s doesn't exist", $filename));
             }
 
@@ -52,7 +54,9 @@ 
             $this->declareGetters($defaultsFromFile);
 
             $this->class->getProperty('config')->setValue($this->defaultValues->get($defaultsFromFile));
-        } elseif (!$this->files->exists($filename)) {
+        }
+        elseif (!$this->files->exists($filename))
+        {
             $this->touchConfigFile($filename);
         }
     }
@@ -126,7 +130,8 @@ 
         $getters = [];
         $gettersByKey = [];
 
-        foreach ($defaults as $key => $value) {
+        foreach ($defaults as $key => $value)
+        {
             $key = (string)$key;
             $getter = $this->makeGetterName($key);
             $getters[] = $getter;
@@ -134,19 +139,23 @@ 
             $method = $this->class->addMethod($getter)->setPublic();
             $method->setBody(\sprintf('return $this->config[\'%s\'];', $key));
 
-            if (\is_array($value)) {
+            if (\is_array($value))
+            {
                 $gettersByKey[] = ['key' => $key, 'value' => $value];
             }
 
             $returnTypeHint = $this->typeHints->getHint(\gettype($value));
-            if ($returnTypeHint !== null) {
+            if ($returnTypeHint !== null)
+            {
                 $method->setReturnType($returnTypeHint);
             }
         }
 
-        foreach ($gettersByKey as $item) {
+        foreach ($gettersByKey as $item)
+        {
             $method = $this->declareGettersByKey($getters, $item['key'], $item['value']);
-            if ($method instanceof \Spiral\Reactor\Partial\Method) {
+            if ($method instanceof \Spiral\Reactor\Partial\Method)
+            {
                 $getters[] = $method->getName();
             }
         }
@@ -155,30 +164,35 @@ 
     private function declareGettersByKey(array $methodNames, string $key, array $value): ?Method
     {
         //Won't create if there's less than 2 sub-items
-        if (\count($value) < 2) {
+        if (\count($value) < 2)
+        {
             return null;
         }
 
         $singularKey = $this->singularize($key);
         $name = $this->makeGetterName($singularKey);
-        if (\in_array($name, $methodNames, true)) {
+        if (\in_array($name, $methodNames, true))
+        {
             $name = $this->makeGetterName($singularKey, 'get', 'by');
         }
 
         //Name conflict, won't merge
-        if (\in_array($name, $methodNames, true)) {
+        if (\in_array($name, $methodNames, true))
+        {
             return null;
         }
 
         $keyType = defineArrayType(\array_keys($value), '-mixed-');
         $valueType = defineArrayType(\array_values($value), '-mixed-');
         //We need a fixed structure here
-        if ($keyType === '-mixed-' || $valueType === '-mixed-') {
+        if ($keyType === '-mixed-' || $valueType === '-mixed-')
+        {
             return null;
         }
 
         //Won't create for associated arrays
-        if ($this->typeAnnotations->mapType($keyType) === 'int' && \array_is_list($value)) {
+        if ($this->typeAnnotations->mapType($keyType) === 'int' && \array_is_list($value))
+        {
             return null;
         }
 
@@ -188,7 +202,8 @@ 
 
         $param = $method->addParameter($singularKey);
         $paramTypeHint = $this->typeHints->getHint($keyType);
-        if ($paramTypeHint !== null) {
+        if ($paramTypeHint !== null)
+        {
             $param->setType($paramTypeHint);
         }
 
@@ -198,13 +213,15 @@ 
     private function makeGetterName(string $name, string $prefix = 'get', string $postfix = ''): string
     {
         $chunks = [];
-        if (!empty($prefix)) {
+        if (!empty($prefix))
+        {
             $chunks[] = $prefix;
         }
 
         $name = $this->slugify->slugify($name, ['lowercase' => false]);
         $chunks[] = \count($chunks) !== 0 ? $this->classify($name) : $name;
-        if (!empty($postfix)) {
+        if (!empty($postfix))
+        {
             $chunks[] = \ucfirst($postfix);
         }
 

src/Tokenizer/src/InterfaceLocator.php

Spacing +9 added lines, -9 removed lines

@@ -13,18 +13,18 @@ 
 {
     public const INJECTOR = InterfaceLocatorInjector::class;
 
-    public function getInterfaces(string|null $target = null): array
+    public function getInterfaces(string | null $target = null): array
     {
-        if (!empty($target)) {
+        if (!empty($target)){
             $target = new \ReflectionClass($target);
         }
 
         $result = [];
-        foreach ($this->availableInterfaces() as $interface) {
-            try {
+        foreach ($this->availableInterfaces() as $interface){
+            try{
                 $reflection = $this->classReflection($interface);
-            } catch (LocatorException $e) {
-                if ($this->debug) {
+            }catch (LocatorException $e){
+                if ($this->debug){
                     throw $e;
                 }
 
@@ -32,7 +32,7 @@ 
                 continue;
             }
 
-            if (!$this->isTargeted($reflection, $target)) {
+            if (!$this->isTargeted($reflection, $target)){
                 continue;
             }
 
@@ -51,7 +51,7 @@ 
     {
         $interfaces = [];
 
-        foreach ($this->availableReflections() as $reflection) {
+        foreach ($this->availableReflections() as $reflection){
             $interfaces = \array_merge($interfaces, $reflection->getInterfaces());
         }
 
@@ -63,7 +63,7 @@ 
      */
     protected function isTargeted(\ReflectionClass $class, ?\ReflectionClass $target = null): bool
     {
-        if (!$target instanceof \ReflectionClass) {
+        if (!$target instanceof \ReflectionClass){
             return true;
         }
 

Braces +17 added lines, -8 removed lines

@@ -15,16 +15,22 @@ 
 
     public function getInterfaces(string|null $target = null): array
     {
-        if (!empty($target)) {
+        if (!empty($target))
+        {
             $target = new \ReflectionClass($target);
         }
 
         $result = [];
-        foreach ($this->availableInterfaces() as $interface) {
-            try {
+        foreach ($this->availableInterfaces() as $interface)
+        {
+            try
+            {
                 $reflection = $this->classReflection($interface);
-            } catch (LocatorException $e) {
-                if ($this->debug) {
+            }
+            catch (LocatorException $e)
+            {
+                if ($this->debug)
+                {
                     throw $e;
                 }
 
@@ -32,7 +38,8 @@ 
                 continue;
             }
 
-            if (!$this->isTargeted($reflection, $target)) {
+            if (!$this->isTargeted($reflection, $target))
+            {
                 continue;
             }
 
@@ -51,7 +58,8 @@ 
     {
         $interfaces = [];
 
-        foreach ($this->availableReflections() as $reflection) {
+        foreach ($this->availableReflections() as $reflection)
+        {
             $interfaces = \array_merge($interfaces, $reflection->getInterfaces());
         }
 
@@ -63,7 +71,8 @@ 
      */
     protected function isTargeted(\ReflectionClass $class, ?\ReflectionClass $target = null): bool
     {
-        if (!$target instanceof \ReflectionClass) {
+        if (!$target instanceof \ReflectionClass)
+        {
             return true;
         }
 

src/Tokenizer/src/EnumLocator.php

Spacing +10 added lines, -10 removed lines

@@ -13,18 +13,18 @@ 
 {
     public const INJECTOR = EnumLocatorInjector::class;
 
-    public function getEnums(object|string|null $target = null): array
+    public function getEnums(object | string | null $target = null): array
     {
-        if (!empty($target)) {
+        if (!empty($target)){
             $target = new \ReflectionClass($target);
         }
 
         $result = [];
-        foreach ($this->availableEnums() as $enum) {
-            try {
+        foreach ($this->availableEnums() as $enum){
+            try{
                 $reflection = $this->enumReflection($enum);
-            } catch (LocatorException $e) {
-                if ($this->debug) {
+            }catch (LocatorException $e){
+                if ($this->debug){
                     throw $e;
                 }
 
@@ -32,7 +32,7 @@ 
                 continue;
             }
 
-            if (!$this->isTargeted($reflection, $target) || $reflection->isInterface()) {
+            if (!$this->isTargeted($reflection, $target) || $reflection->isInterface()){
                 continue;
             }
 
@@ -51,7 +51,7 @@ 
     {
         $enums = [];
 
-        foreach ($this->availableReflections() as $reflection) {
+        foreach ($this->availableReflections() as $reflection){
             $enums = \array_merge($enums, $reflection->getEnums());
         }
 
@@ -63,11 +63,11 @@ 
      */
     protected function isTargeted(\ReflectionEnum $enum, ?\ReflectionClass $target = null): bool
     {
-        if (!$target instanceof \ReflectionClass) {
+        if (!$target instanceof \ReflectionClass){
             return true;
         }
 
-        if (!$target->isTrait()) {
+        if (!$target->isTrait()){
             //Target is interface or class
             /** @psalm-suppress RedundantCondition https://github.com/vimeo/psalm/issues/9489 */
             return $enum->isSubclassOf($target) || $enum->getName() === $target->getName();

Braces +19 added lines, -9 removed lines

@@ -15,16 +15,22 @@ 
 
     public function getEnums(object|string|null $target = null): array
     {
-        if (!empty($target)) {
+        if (!empty($target))
+        {
             $target = new \ReflectionClass($target);
         }
 
         $result = [];
-        foreach ($this->availableEnums() as $enum) {
-            try {
+        foreach ($this->availableEnums() as $enum)
+        {
+            try
+            {
                 $reflection = $this->enumReflection($enum);
-            } catch (LocatorException $e) {
-                if ($this->debug) {
+            }
+            catch (LocatorException $e)
+            {
+                if ($this->debug)
+                {
                     throw $e;
                 }
 
@@ -32,7 +38,8 @@ 
                 continue;
             }
 
-            if (!$this->isTargeted($reflection, $target) || $reflection->isInterface()) {
+            if (!$this->isTargeted($reflection, $target) || $reflection->isInterface())
+            {
                 continue;
             }
 
@@ -51,7 +58,8 @@ 
     {
         $enums = [];
 
-        foreach ($this->availableReflections() as $reflection) {
+        foreach ($this->availableReflections() as $reflection)
+        {
             $enums = \array_merge($enums, $reflection->getEnums());
         }
 
@@ -63,11 +71,13 @@ 
      */
     protected function isTargeted(\ReflectionEnum $enum, ?\ReflectionClass $target = null): bool
     {
-        if (!$target instanceof \ReflectionClass) {
+        if (!$target instanceof \ReflectionClass)
+        {
             return true;
         }
 
-        if (!$target->isTrait()) {
+        if (!$target->isTrait())
+        {
             //Target is interface or class
             /** @psalm-suppress RedundantCondition https://github.com/vimeo/psalm/issues/9489 */
             return $enum->isSubclassOf($target) || $enum->getName() === $target->getName();

src/Tokenizer/src/ClassLocator.php

Spacing +10 added lines, -10 removed lines

@@ -13,18 +13,18 @@ 
 {
     public const INJECTOR = ClassLocatorInjector::class;
 
-    public function getClasses(object|string|null $target = null): array
+    public function getClasses(object | string | null $target = null): array
     {
-        if (!empty($target)) {
+        if (!empty($target)){
             $target = new \ReflectionClass($target);
         }
 
         $result = [];
-        foreach ($this->availableClasses() as $class) {
-            try {
+        foreach ($this->availableClasses() as $class){
+            try{
                 $reflection = $this->classReflection($class);
-            } catch (LocatorException $e) {
-                if ($this->debug) {
+            }catch (LocatorException $e){
+                if ($this->debug){
                     throw $e;
                 }
 
@@ -32,7 +32,7 @@ 
                 continue;
             }
 
-            if (!$this->isTargeted($reflection, $target) || $reflection->isInterface()) {
+            if (!$this->isTargeted($reflection, $target) || $reflection->isInterface()){
                 continue;
             }
 
@@ -51,7 +51,7 @@ 
     {
         $classes = [];
 
-        foreach ($this->availableReflections() as $reflection) {
+        foreach ($this->availableReflections() as $reflection){
             $classes = \array_merge($classes, $reflection->getClasses());
         }
 
@@ -63,11 +63,11 @@ 
      */
     protected function isTargeted(\ReflectionClass $class, ?\ReflectionClass $target = null): bool
     {
-        if (!$target instanceof \ReflectionClass) {
+        if (!$target instanceof \ReflectionClass){
             return true;
         }
 
-        if (!$target->isTrait()) {
+        if (!$target->isTrait()){
             //Target is interface or class
             return $class->isSubclassOf($target) || $class->getName() === $target->getName();
         }

Braces +19 added lines, -9 removed lines

@@ -15,16 +15,22 @@ 
 
     public function getClasses(object|string|null $target = null): array
     {
-        if (!empty($target)) {
+        if (!empty($target))
+        {
             $target = new \ReflectionClass($target);
         }
 
         $result = [];
-        foreach ($this->availableClasses() as $class) {
-            try {
+        foreach ($this->availableClasses() as $class)
+        {
+            try
+            {
                 $reflection = $this->classReflection($class);
-            } catch (LocatorException $e) {
-                if ($this->debug) {
+            }
+            catch (LocatorException $e)
+            {
+                if ($this->debug)
+                {
                     throw $e;
                 }
 
@@ -32,7 +38,8 @@ 
                 continue;
             }
 
-            if (!$this->isTargeted($reflection, $target) || $reflection->isInterface()) {
+            if (!$this->isTargeted($reflection, $target) || $reflection->isInterface())
+            {
                 continue;
             }
 
@@ -51,7 +58,8 @@ 
     {
         $classes = [];
 
-        foreach ($this->availableReflections() as $reflection) {
+        foreach ($this->availableReflections() as $reflection)
+        {
             $classes = \array_merge($classes, $reflection->getClasses());
         }
 
@@ -63,11 +71,13 @@ 
      */
     protected function isTargeted(\ReflectionClass $class, ?\ReflectionClass $target = null): bool
     {
-        if (!$target instanceof \ReflectionClass) {
+        if (!$target instanceof \ReflectionClass)
+        {
             return true;
         }
 
-        if (!$target->isTrait()) {
+        if (!$target->isTrait())
+        {
             //Target is interface or class
             return $class->isSubclassOf($target) || $class->getName() === $target->getName();
         }

src/AuthHttp/src/Transport/CookieTransport.php

Spacing +5 added lines, -5 removed lines

@@ -22,7 +22,7 @@ 
         private readonly bool $secure = false,
         private readonly bool $httpOnly = true,
         private readonly ?string $sameSite = null
-    ) {
+    ){
     }
 
     public function fetchToken(Request $request): ?string
@@ -39,7 +39,7 @@ 
     ): Response {
         /** @var CookieQueue $cookieQueue */
         $cookieQueue = $request->getAttribute(CookieQueue::ATTRIBUTE);
-        if ($cookieQueue === null) {
+        if ($cookieQueue === null){
             return $response->withAddedHeader(
                 'Set-Cookie',
                 Cookie::create(
@@ -55,9 +55,9 @@ 
             );
         }
 
-        if ($tokenID === null) {
+        if ($tokenID === null){
             $cookieQueue->delete($this->cookie);
-        } else {
+        }else{
             $cookieQueue->set(
                 $this->cookie,
                 $tokenID,
@@ -84,7 +84,7 @@ 
      */
     private function getLifetime(?\DateTimeInterface $expiresAt = null): ?int
     {
-        if (!$expiresAt instanceof \DateTimeInterface) {
+        if (!$expiresAt instanceof \DateTimeInterface){
             return null;
         }
 

Braces +9 added lines, -4 removed lines

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

src/AuthHttp/src/Middleware/AuthMiddleware.php

Spacing +6 added lines, -6 removed lines

@@ -35,7 +35,7 @@ 
         private readonly TokenStorageInterface $tokenStorage,
         private readonly TransportRegistry $transportRegistry,
         private readonly ?EventDispatcherInterface $eventDispatcher = null,
-    ) {
+    ){
     }
 
     /**
@@ -56,14 +56,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 instanceof \Spiral\Auth\TokenInterface) {
+            if (!$token instanceof \Spiral\Auth\TokenInterface){
                 continue;
             }
 
@@ -77,13 +77,13 @@ 
 
     private function closeContext(Request $request, Response $response, AuthContextInterface $authContext): Response
     {
-        if (!$authContext->getToken() instanceof \Spiral\Auth\TokenInterface) {
+        if (!$authContext->getToken() instanceof \Spiral\Auth\TokenInterface){
             return $response;
         }
 
         $transport = $this->transportRegistry->getTransport($authContext->getTransport());
 
-        if ($authContext->isClosed()) {
+        if ($authContext->isClosed()){
             $this->tokenStorage->delete($authContext->getToken());
 
             return $transport->removeToken(

Braces +10 added lines, -5 removed lines

@@ -56,14 +56,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 instanceof \Spiral\Auth\TokenInterface) {
+            if (!$token instanceof \Spiral\Auth\TokenInterface)
+            {
                 continue;
             }
 
@@ -77,13 +80,15 @@ 
 
     private function closeContext(Request $request, Response $response, AuthContextInterface $authContext): Response
     {
-        if (!$authContext->getToken() instanceof \Spiral\Auth\TokenInterface) {
+        if (!$authContext->getToken() instanceof \Spiral\Auth\TokenInterface)
+        {
             return $response;
         }
 
         $transport = $this->transportRegistry->getTransport($authContext->getTransport());
 
-        if ($authContext->isClosed()) {
+        if ($authContext->isClosed())
+        {
             $this->tokenStorage->delete($authContext->getToken());
 
             return $transport->removeToken(