spiral / framework

src/Distribution/src/Config/DistributionConfig.php

Spacing +24 added lines, -24 removed lines

@@ -51,8 +51,8 @@ 
 
     private function bootResolvers(array $config): void
     {
-        foreach ($config['resolvers'] ?? [] as $name => $child) {
-            if (!\is_string($name)) {
+        foreach ($config['resolvers'] ?? [] as $name => $child){
+            if (!\is_string($name)){
                 throw new InvalidArgumentException(
                     \vsprintf('Distribution driver config key must be a string, but %s given', [
                         \get_debug_type($child),
@@ -60,7 +60,7 @@ 
                 );
             }
 
-            if (!\is_array($child)) {
+            if (!\is_array($child)){
                 throw new InvalidArgumentException(
                     \vsprintf('Distribution driver config `%s` must be an array, but %s given', [
                         $name,
@@ -77,9 +77,9 @@ 
     {
         $default = $config['default'] ?? null;
 
-        if ($default !== null) {
+        if ($default !== null){
             // Validate config
-            if (!\is_string($default)) {
+            if (!\is_string($default)){
                 throw new InvalidArgumentException(
                     \vsprintf('Distribution config default driver must be a string, but %s given', [
                         \get_debug_type($default),
@@ -93,7 +93,7 @@ 
 
     private function createResolver(string $name, array $config): UriResolverInterface
     {
-        if (!isset($config['type']) || !\is_string($config['type'])) {
+        if (!isset($config['type']) || !\is_string($config['type'])){
             throw $this->invalidConfigKey($name, 'type', 'string');
         }
 
@@ -107,17 +107,17 @@ 
 
     private function createCustomResolver(string $type, string $name, array $config): UriResolverInterface
     {
-        if (!\is_subclass_of($type, UriResolverInterface::class, true)) {
+        if (!\is_subclass_of($type, UriResolverInterface::class, true)){
             throw $this->invalidConfigKey($name, 'type', UriResolverInterface::class);
         }
 
-        if (isset($config['options']) && !\is_array($config['options'])) {
+        if (isset($config['options']) && !\is_array($config['options'])){
             throw $this->invalidConfigKey($name, 'options', 'array');
         }
 
-        try {
+        try{
             return new $type(...\array_values($config['options'] ?? []));
-        } catch (\Throwable $e) {
+        }catch (\Throwable $e){
             $message = 'An error occurred while resolver `%s` initializing: %s';
             throw new InvalidArgumentException(\sprintf($message, $name, $e->getMessage()), 0, $e);
         }
@@ -126,36 +126,36 @@ 
     private function createS3Resolver(string $name, array $config): UriResolverInterface
     {
         // Required config options
-        if (!isset($config['region']) || !\is_string($config['region'])) {
+        if (!isset($config['region']) || !\is_string($config['region'])){
             throw $this->invalidConfigKey($name, 'region', 'string');
         }
 
-        if (!isset($config['key']) || !\is_string($config['key'])) {
+        if (!isset($config['key']) || !\is_string($config['key'])){
             throw $this->invalidConfigKey($name, 'key', 'string');
         }
 
-        if (!isset($config['secret']) || !\is_string($config['secret'])) {
+        if (!isset($config['secret']) || !\is_string($config['secret'])){
             throw $this->invalidConfigKey($name, 'secret', 'string');
         }
 
-        if (!isset($config['bucket']) || !\is_string($config['bucket'])) {
+        if (!isset($config['bucket']) || !\is_string($config['bucket'])){
             throw $this->invalidConfigKey($name, 'bucket', 'string');
         }
 
         // Optional config options
-        if (!\is_string($config['prefix'] ?? '')) {
+        if (!\is_string($config['prefix'] ?? '')){
             throw $this->invalidConfigKey($name, 'prefix', 'string or null');
         }
 
-        if (!\is_string($config['version'] ?? '')) {
+        if (!\is_string($config['version'] ?? '')){
             throw $this->invalidConfigKey($name, 'version', 'string or null');
         }
 
-        if (!\is_string($config['token'] ?? '')) {
+        if (!\is_string($config['token'] ?? '')){
             throw $this->invalidConfigKey($name, 'token', 'string or null');
         }
 
-        if (!\is_int($config['expires'] ?? 0)) {
+        if (!\is_int($config['expires'] ?? 0)){
             throw $this->invalidConfigKey($name, 'expires', 'positive int (unix timestamp)');
         }
 
@@ -180,19 +180,19 @@ 
 
     private function createCloudFrontResolver(string $name, array $config): UriResolverInterface
     {
-        if (!isset($config['key']) || !\is_string($config['key'])) {
+        if (!isset($config['key']) || !\is_string($config['key'])){
             throw $this->invalidConfigKey($name, 'key', 'string');
         }
 
-        if (!isset($config['private']) || !\is_string($config['private'])) {
+        if (!isset($config['private']) || !\is_string($config['private'])){
             throw $this->invalidConfigKey($name, 'private', 'string value or path to key file');
         }
 
-        if (!isset($config['domain']) || !\is_string($config['domain'])) {
+        if (!isset($config['domain']) || !\is_string($config['domain'])){
             throw $this->invalidConfigKey($name, 'domain', 'string');
         }
 
-        if (!\is_string($config['prefix'] ?? '')) {
+        if (!\is_string($config['prefix'] ?? '')){
             throw $this->invalidConfigKey($name, 'prefix', 'string or null');
         }
 
@@ -206,7 +206,7 @@ 
 
     private function createStaticResolver(string $name, array $config): UriResolverInterface
     {
-        if (!isset($config['uri']) || !\is_string($config['uri'])) {
+        if (!isset($config['uri']) || !\is_string($config['uri'])){
             throw $this->invalidConfigKey($name, 'uri', 'string');
         }
 
@@ -215,7 +215,7 @@ 
 
     private function createUri(string $name, string $uri, array $config): UriInterface
     {
-        if (!\is_string($config['factory'] ?? '')) {
+        if (!\is_string($config['factory'] ?? '')){
             throw $this->invalidConfigKey($name, 'factory', 'string (PSR-7 uri factory implementation)');
         }
 

Braces +49 added lines, -24 removed lines

@@ -51,8 +51,10 @@ 
 
     private function bootResolvers(array $config): void
     {
-        foreach ($config['resolvers'] ?? [] as $name => $child) {
-            if (!\is_string($name)) {
+        foreach ($config['resolvers'] ?? [] as $name => $child)
+        {
+            if (!\is_string($name))
+            {
                 throw new InvalidArgumentException(
                     \vsprintf('Distribution driver config key must be a string, but %s given', [
                         \get_debug_type($child),
@@ -60,7 +62,8 @@ 
                 );
             }
 
-            if (!\is_array($child)) {
+            if (!\is_array($child))
+            {
                 throw new InvalidArgumentException(
                     \vsprintf('Distribution driver config `%s` must be an array, but %s given', [
                         $name,
@@ -77,9 +80,11 @@ 
     {
         $default = $config['default'] ?? null;
 
-        if ($default !== null) {
+        if ($default !== null)
+        {
             // Validate config
-            if (!\is_string($default)) {
+            if (!\is_string($default))
+            {
                 throw new InvalidArgumentException(
                     \vsprintf('Distribution config default driver must be a string, but %s given', [
                         \get_debug_type($default),
@@ -93,7 +98,8 @@ 
 
     private function createResolver(string $name, array $config): UriResolverInterface
     {
-        if (!isset($config['type']) || !\is_string($config['type'])) {
+        if (!isset($config['type']) || !\is_string($config['type']))
+        {
             throw $this->invalidConfigKey($name, 'type', 'string');
         }
 
@@ -107,17 +113,22 @@ 
 
     private function createCustomResolver(string $type, string $name, array $config): UriResolverInterface
     {
-        if (!\is_subclass_of($type, UriResolverInterface::class, true)) {
+        if (!\is_subclass_of($type, UriResolverInterface::class, true))
+        {
             throw $this->invalidConfigKey($name, 'type', UriResolverInterface::class);
         }
 
-        if (isset($config['options']) && !\is_array($config['options'])) {
+        if (isset($config['options']) && !\is_array($config['options']))
+        {
             throw $this->invalidConfigKey($name, 'options', 'array');
         }
 
-        try {
+        try
+        {
             return new $type(...\array_values($config['options'] ?? []));
-        } catch (\Throwable $e) {
+        }
+        catch (\Throwable $e)
+        {
             $message = 'An error occurred while resolver `%s` initializing: %s';
             throw new InvalidArgumentException(\sprintf($message, $name, $e->getMessage()), 0, $e);
         }
@@ -126,36 +137,44 @@ 
     private function createS3Resolver(string $name, array $config): UriResolverInterface
     {
         // Required config options
-        if (!isset($config['region']) || !\is_string($config['region'])) {
+        if (!isset($config['region']) || !\is_string($config['region']))
+        {
             throw $this->invalidConfigKey($name, 'region', 'string');
         }
 
-        if (!isset($config['key']) || !\is_string($config['key'])) {
+        if (!isset($config['key']) || !\is_string($config['key']))
+        {
             throw $this->invalidConfigKey($name, 'key', 'string');
         }
 
-        if (!isset($config['secret']) || !\is_string($config['secret'])) {
+        if (!isset($config['secret']) || !\is_string($config['secret']))
+        {
             throw $this->invalidConfigKey($name, 'secret', 'string');
         }
 
-        if (!isset($config['bucket']) || !\is_string($config['bucket'])) {
+        if (!isset($config['bucket']) || !\is_string($config['bucket']))
+        {
             throw $this->invalidConfigKey($name, 'bucket', 'string');
         }
 
         // Optional config options
-        if (!\is_string($config['prefix'] ?? '')) {
+        if (!\is_string($config['prefix'] ?? ''))
+        {
             throw $this->invalidConfigKey($name, 'prefix', 'string or null');
         }
 
-        if (!\is_string($config['version'] ?? '')) {
+        if (!\is_string($config['version'] ?? ''))
+        {
             throw $this->invalidConfigKey($name, 'version', 'string or null');
         }
 
-        if (!\is_string($config['token'] ?? '')) {
+        if (!\is_string($config['token'] ?? ''))
+        {
             throw $this->invalidConfigKey($name, 'token', 'string or null');
         }
 
-        if (!\is_int($config['expires'] ?? 0)) {
+        if (!\is_int($config['expires'] ?? 0))
+        {
             throw $this->invalidConfigKey($name, 'expires', 'positive int (unix timestamp)');
         }
 
@@ -180,19 +199,23 @@ 
 
     private function createCloudFrontResolver(string $name, array $config): UriResolverInterface
     {
-        if (!isset($config['key']) || !\is_string($config['key'])) {
+        if (!isset($config['key']) || !\is_string($config['key']))
+        {
             throw $this->invalidConfigKey($name, 'key', 'string');
         }
 
-        if (!isset($config['private']) || !\is_string($config['private'])) {
+        if (!isset($config['private']) || !\is_string($config['private']))
+        {
             throw $this->invalidConfigKey($name, 'private', 'string value or path to key file');
         }
 
-        if (!isset($config['domain']) || !\is_string($config['domain'])) {
+        if (!isset($config['domain']) || !\is_string($config['domain']))
+        {
             throw $this->invalidConfigKey($name, 'domain', 'string');
         }
 
-        if (!\is_string($config['prefix'] ?? '')) {
+        if (!\is_string($config['prefix'] ?? ''))
+        {
             throw $this->invalidConfigKey($name, 'prefix', 'string or null');
         }
 
@@ -206,7 +229,8 @@ 
 
     private function createStaticResolver(string $name, array $config): UriResolverInterface
     {
-        if (!isset($config['uri']) || !\is_string($config['uri'])) {
+        if (!isset($config['uri']) || !\is_string($config['uri']))
+        {
             throw $this->invalidConfigKey($name, 'uri', 'string');
         }
 
@@ -215,7 +239,8 @@ 
 
     private function createUri(string $name, string $uri, array $config): UriInterface
     {
-        if (!\is_string($config['factory'] ?? '')) {
+        if (!\is_string($config['factory'] ?? ''))
+        {
             throw $this->invalidConfigKey($name, 'factory', 'string (PSR-7 uri factory implementation)');
         }
 

src/Distribution/src/Resolver/ExpirationAwareResolver.php

Spacing +1 added lines, -1 removed lines

@@ -72,7 +72,7 @@
 
     private function resolveExpirationInterval(mixed $expiration): \DateInterval
     {
-        if ($expiration === null) {
+        if ($expiration === null){
             return $this->expiration;
         }
 

Braces +2 added lines, -1 removed lines

@@ -72,7 +72,8 @@
 
     private function resolveExpirationInterval(mixed $expiration): \DateInterval
     {
-        if ($expiration === null) {
+        if ($expiration === null)
+        {
             return $this->expiration;
         }
 

src/Distribution/src/Resolver/S3SignedResolver.php

Spacing +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
         private S3ClientInterface $client,
         private string $bucket,
         private ?string $prefix = null
-    ) {
+    ){
         parent::__construct();
     }
 

src/Distribution/src/Manager.php

Spacing +2 added lines, -2 removed lines

@@ -36,7 +36,7 @@ 
     {
         $name ??= $this->default;
 
-        if (!isset($this->resolvers[$name])) {
+        if (!isset($this->resolvers[$name])){
             throw new \InvalidArgumentException(\sprintf(self::ERROR_NOT_FOUND, $name));
         }
 
@@ -45,7 +45,7 @@ 
 
     public function add(string $name, UriResolverInterface $resolver, bool $overwrite = false): void
     {
-        if ($overwrite === false && isset($this->resolvers[$name])) {
+        if ($overwrite === false && isset($this->resolvers[$name])){
             throw new \InvalidArgumentException(\sprintf(self::ERROR_REDEFINITION, $name));
         }
 

Braces +4 added lines, -2 removed lines

@@ -36,7 +36,8 @@ 
     {
         $name ??= $this->default;
 
-        if (!isset($this->resolvers[$name])) {
+        if (!isset($this->resolvers[$name]))
+        {
             throw new \InvalidArgumentException(\sprintf(self::ERROR_NOT_FOUND, $name));
         }
 
@@ -45,7 +46,8 @@ 
 
     public function add(string $name, UriResolverInterface $resolver, bool $overwrite = false): void
     {
-        if ($overwrite === false && isset($this->resolvers[$name])) {
+        if ($overwrite === false && isset($this->resolvers[$name]))
+        {
             throw new \InvalidArgumentException(\sprintf(self::ERROR_REDEFINITION, $name));
         }
 

src/Distribution/src/Bootloader/DistributionBootloader.php

Spacing +2 added lines, -2 removed lines

@@ -43,10 +43,10 @@
 
     private function registerManager(BinderInterface $binder): void
     {
-        $binder->bindSingleton(DistributionInterface::class, static function (DistributionConfig $config) {
+        $binder->bindSingleton(DistributionInterface::class, static function (DistributionConfig $config){
             $manager = new Manager($config->getDefaultDriver());
 
-            foreach ($config->getResolvers() as $name => $resolver) {
+            foreach ($config->getResolvers() as $name => $resolver){
                 $manager->add($name, $resolver);
             }
 

Braces +4 added lines, -2 removed lines

@@ -43,10 +43,12 @@
 
     private function registerManager(BinderInterface $binder): void
     {
-        $binder->bindSingleton(DistributionInterface::class, static function (DistributionConfig $config) {
+        $binder->bindSingleton(DistributionInterface::class, static function (DistributionConfig $config)
+        {
             $manager = new Manager($config->getDefaultDriver());
 
-            foreach ($config->getResolvers() as $name => $resolver) {
+            foreach ($config->getResolvers() as $name => $resolver)
+            {
                 $manager->add($name, $resolver);
             }
 

src/Core/tests/Internal/Resolver/PositionArgumentTest.php

Spacing +1 added lines, -1 removed lines

@@ -106,7 +106,7 @@
                 new DateTimeImmutable(),
                 new EngineVAZ2101(),
             ],
-            validate: false
+            validate : false
         );
 
         $this->assertCount(2, $result);

src/Core/tests/Internal/Resolver/ReferenceParameterTest.php

Spacing +5 added lines, -5 removed lines

@@ -22,7 +22,7 @@ 
         $fiz = new DateTime();
 
         $result = $this->resolveClosure(
-            static fn(DateTimeInterface &...$dates) => $dates,
+            static fn(DateTimeInterface & ...$dates) => $dates,
             [[$foo, &$bar, &$baz, $fiz]]
         );
         $this->assertCount(4, $result);
@@ -51,7 +51,7 @@ 
         $fiz = new DateTime();
 
         $result = $this->resolveClosure(
-            static fn(DateTimeInterface &...$dates) => $dates,
+            static fn(DateTimeInterface & ...$dates) => $dates,
             ['dates' => [$foo, &$bar, &$baz, $fiz]]
         );
         $this->assertCount(4, $result);
@@ -89,9 +89,9 @@ 
                 int &$foo,
                 object &$bar,
                 &$baz,
-                ?ColorInterface &$nullable,
-                EngineInterface &$object, // from container
-                DateTimeInterface &...$dates // collect all unnamed DateTimeInterface objects
+                ?ColorInterface & $nullable,
+                EngineInterface & $object, // from container
+                DateTimeInterface & ...$dates // collect all unnamed DateTimeInterface objects
             ) => null,
             [
                 'dates' => [

src/Core/tests/Internal/Resolver/UnionTypeParameterTest.php

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
         $this->bindSingleton(DateTimeInterface::class, $time = new DateTimeImmutable());
 
         $result = $this->resolveClosure(
-            static fn(string|DateTimeInterface $time) => null,
+            static fn(string | DateTimeInterface $time) => null,
             []
         );
 

src/Core/tests/Internal/Resolver/TypeValidationTest.php

Spacing +8 added lines, -8 removed lines

@@ -125,7 +125,7 @@ 
     public function testUnionType(): void
     {
         $this->validateClosureArguments(
-            fn (array|Traversable $a, array|Traversable $b) => null,
+            fn (array | Traversable $a, array | Traversable $b) => null,
             [[1, 2, NAN], new EmptyIterator()]
         );
     }
@@ -133,7 +133,7 @@ 
     public function testNullableUnionType(): void
     {
         $this->validateClosureArguments(
-            fn (null|array|Traversable $a, null|array|Traversable $b) => null,
+            fn (null | array | Traversable $a, null | array | Traversable $b) => null,
             [null, new EmptyIterator()]
         );
     }
@@ -196,7 +196,7 @@ 
     public function testWrongUnionType(): void
     {
         $this->validateClosureArguments(
-            fn (array|Traversable $a) => null,
+            fn (array | Traversable $a) => null,
             ['foo'],
             'a'
         );
@@ -329,14 +329,14 @@ 
         ?string $invalidParameter = null,
         string $exceptionClass = InvalidArgumentException::class,
     ): void {
-        try {
+        try{
             $this->createResolver()->validateArguments(new ReflectionFunction($closure), $arguments);
-        } catch (ValidationException $e) {
+        }catch (ValidationException $e){
             $this->assertInstanceOf($exceptionClass, $e, 'Expected other exception.');
-            if ($invalidParameter === null) {
+            if ($invalidParameter === null){
                 throw $e;
             }
-            if ($e->getParameter() !== $invalidParameter) {
+            if ($e->getParameter() !== $invalidParameter){
                 $this->fail(
                     \sprintf(
                         'The other argument has been failed: `%s` instead of `%s`.',
@@ -348,7 +348,7 @@ 
             $this->assertTrue(true, 'Invalid value has been failed.');
             return;
         }
-        if ($invalidParameter === null) {
+        if ($invalidParameter === null){
             $this->assertTrue(true, 'Valid argument value has been failed.');
             return;
         }

Braces +11 added lines, -5 removed lines

@@ -329,14 +329,19 @@ 
         ?string $invalidParameter = null,
         string $exceptionClass = InvalidArgumentException::class,
     ): void {
-        try {
+        try
+        {
             $this->createResolver()->validateArguments(new ReflectionFunction($closure), $arguments);
-        } catch (ValidationException $e) {
+        }
+        catch (ValidationException $e)
+        {
             $this->assertInstanceOf($exceptionClass, $e, 'Expected other exception.');
-            if ($invalidParameter === null) {
+            if ($invalidParameter === null)
+            {
                 throw $e;
             }
-            if ($e->getParameter() !== $invalidParameter) {
+            if ($e->getParameter() !== $invalidParameter)
+            {
                 $this->fail(
                     \sprintf(
                         'The other argument has been failed: `%s` instead of `%s`.',
@@ -348,7 +353,8 @@ 
             $this->assertTrue(true, 'Invalid value has been failed.');
             return;
         }
-        if ($invalidParameter === null) {
+        if ($invalidParameter === null)
+        {
             $this->assertTrue(true, 'Valid argument value has been failed.');
             return;
         }