spiral / framework

src/Config/tests/BaseTestCase.php

Spacing +2 added lines, -2 removed lines

@@ -25,8 +25,8 @@
 
     protected function getFactory(?string $directory = null, bool $strict = true): ConfigManager
     {
-        if (is_null($directory)) {
-            $directory = __DIR__ . '/fixtures';
+        if (is_null($directory)){
+            $directory = __DIR__.'/fixtures';
         }
 
         return new ConfigManager(

Braces +2 added lines, -1 removed lines

@@ -25,7 +25,8 @@
 
     protected function getFactory(?string $directory = null, bool $strict = true): ConfigManager
     {
-        if (is_null($directory)) {
+        if (is_null($directory))
+        {
             $directory = __DIR__ . '/fixtures';
         }
 

src/Config/src/ConfigManager.php

Spacing +12 added lines, -12 removed lines

@@ -25,7 +25,7 @@ 
     public function __construct(
         private readonly LoaderInterface $loader,
         private readonly bool $strict = true
-    ) {
+    ){
     }
 
     /**
@@ -45,11 +45,11 @@ 
 
     public function setDefaults(string $section, array $data): void
     {
-        if (isset($this->defaults[$section])) {
+        if (isset($this->defaults[$section])){
             throw new ConfiguratorException(\sprintf('Unable to set default config `%s` more than once.', $section));
         }
 
-        if (isset($this->data[$section])) {
+        if (isset($this->data[$section])){
             throw new ConfigDeliveredException(
                 \sprintf('Unable to set default config `%s`, config has been loaded.', $section)
             );
@@ -60,8 +60,8 @@ 
 
     public function modify(string $section, PatchInterface $patch): array
     {
-        if (isset($this->instances[$section])) {
-            if ($this->strict) {
+        if (isset($this->instances[$section])){
+            if ($this->strict){
                 throw new ConfigDeliveredException(
                     \sprintf('Unable to patch config `%s`, config object has already been delivered.', $section)
                 );
@@ -72,27 +72,27 @@ 
 
         $data = $this->getConfig($section);
 
-        try {
+        try{
             return $this->data[$section] = $patch->patch($data);
-        } catch (PatchException $e) {
+        }catch (PatchException $e){
             throw new PatchException(\sprintf('Unable to modify config `%s`.', $section), $e->getCode(), $e);
         }
     }
 
     public function getConfig(?string $section = null): array
     {
-        if (isset($this->data[$section])) {
+        if (isset($this->data[$section])){
             return $this->data[$section];
         }
 
-        if (isset($this->defaults[$section])) {
+        if (isset($this->defaults[$section])){
             $data = [];
-            if ($this->loader->has($section)) {
+            if ($this->loader->has($section)){
                 $data = $this->loader->load($section);
             }
 
             $data = \array_merge($this->defaults[$section], $data);
-        } else {
+        }else{
             $data = $this->loader->load($section);
         }
 
@@ -102,7 +102,7 @@ 
     public function createInjection(\ReflectionClass $class, ?string $context = null): object
     {
         $config = $class->getConstant('CONFIG');
-        if (isset($this->instances[$config])) {
+        if (isset($this->instances[$config])){
             return $this->instances[$config];
         }
 

Braces +24 added lines, -11 removed lines

@@ -45,11 +45,13 @@ 
 
     public function setDefaults(string $section, array $data): void
     {
-        if (isset($this->defaults[$section])) {
+        if (isset($this->defaults[$section]))
+        {
             throw new ConfiguratorException(\sprintf('Unable to set default config `%s` more than once.', $section));
         }
 
-        if (isset($this->data[$section])) {
+        if (isset($this->data[$section]))
+        {
             throw new ConfigDeliveredException(
                 \sprintf('Unable to set default config `%s`, config has been loaded.', $section)
             );
@@ -60,8 +62,10 @@ 
 
     public function modify(string $section, PatchInterface $patch): array
     {
-        if (isset($this->instances[$section])) {
-            if ($this->strict) {
+        if (isset($this->instances[$section]))
+        {
+            if ($this->strict)
+            {
                 throw new ConfigDeliveredException(
                     \sprintf('Unable to patch config `%s`, config object has already been delivered.', $section)
                 );
@@ -72,27 +76,35 @@ 
 
         $data = $this->getConfig($section);
 
-        try {
+        try
+        {
             return $this->data[$section] = $patch->patch($data);
-        } catch (PatchException $e) {
+        }
+        catch (PatchException $e)
+        {
             throw new PatchException(\sprintf('Unable to modify config `%s`.', $section), $e->getCode(), $e);
         }
     }
 
     public function getConfig(?string $section = null): array
     {
-        if (isset($this->data[$section])) {
+        if (isset($this->data[$section]))
+        {
             return $this->data[$section];
         }
 
-        if (isset($this->defaults[$section])) {
+        if (isset($this->defaults[$section]))
+        {
             $data = [];
-            if ($this->loader->has($section)) {
+            if ($this->loader->has($section))
+            {
                 $data = $this->loader->load($section);
             }
 
             $data = \array_merge($this->defaults[$section], $data);
-        } else {
+        }
+        else
+        {
             $data = $this->loader->load($section);
         }
 
@@ -102,7 +114,8 @@ 
     public function createInjection(\ReflectionClass $class, ?string $context = null): object
     {
         $config = $class->getConstant('CONFIG');
-        if (isset($this->instances[$config])) {
+        if (isset($this->instances[$config]))
+        {
             return $this->instances[$config];
         }
 

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 === null || !$container->has(LogsInterface::class)) {
+        if ($container === null || !$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 === null || !$container->has(LogsInterface::class)) {
+        if ($container === null || !$container->has(LogsInterface::class))
+        {
             return $this->logger ?? new NullLogger();
         }
 

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 (empty($target)) {
+        if (empty($target)){
             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 (empty($target)) {
+        if (empty($target))
+        {
             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 === null) {
+        if ($target === null){
             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 === null) {
+        if ($target === null)
+        {
             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 (empty($target)) {
+        if (empty($target)){
             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 (empty($target)) {
+        if (empty($target))
+        {
             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 === null) {
+        if ($expiresAt === null){
             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 === null) {
+        if ($expiresAt === null)
+        {
             return null;
         }
 

src/AuthHttp/src/Transport/HeaderTransport.php

Spacing +5 added lines, -5 removed lines

@@ -16,12 +16,12 @@ 
     public function __construct(
         private readonly string $header = 'X-Auth-Token',
         private readonly string $valueFormat = '%s'
-    ) {
+    ){
     }
 
     public function fetchToken(Request $request): ?string
     {
-        if ($request->hasHeader($this->header)) {
+        if ($request->hasHeader($this->header)){
             return $this->extractToken($request);
         }
 
@@ -34,7 +34,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;
         }
 
@@ -50,10 +50,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

@@ -21,7 +21,8 @@ 
 
     public function fetchToken(Request $request): ?string
     {
-        if ($request->hasHeader($this->header)) {
+        if ($request->hasHeader($this->header))
+        {
             return $this->extractToken($request);
         }
 
@@ -34,7 +35,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;
         }
 
@@ -50,7 +52,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/Filters/src/Exception/SetterException.php

Spacing +2 added lines, -2 removed lines

@@ -9,8 +9,8 @@
     public function __construct(?\Throwable $previous = null, ?string $message = null)
     {
         parent::__construct(
-            message: $message ?? 'Unable to set value. The given data was invalid.',
-            previous: $previous,
+            message : $message ?? 'Unable to set value. The given data was invalid.',
+            previous : $previous,
         );
     }
 }