Merge pull request #1207: Apply Spiral Code Style

composer.json

@@ -34,10 +34,10 @@
     ],
     "require": {
         "php": ">=8.1",
-        "spiral/core": "^3.14.10"
+        "spiral/core": "^3.15"
     },
     "require-dev": {
-        "spiral/boot": "^3.14.10",
+        "spiral/boot": "^3.15",
         "phpunit/phpunit": "^10.1",
         "mockery/mockery": "^1.5",
         "vimeo/psalm": "^5.9"

src/Bootloader/ValidationBootloader.php

@@ -23,9 +23,8 @@ final class ValidationBootloader extends Bootloader
     ];
 
     public function __construct(
-        private readonly ConfiguratorInterface $config
-    ) {
-    }
+        private readonly ConfiguratorInterface $config,
+    ) {}
 
     public function init(): void
     {
@@ -46,7 +45,7 @@ public function setDefaultValidator(string $name): void
 
     private function initDefaultValidator(
         ValidationConfig $config,
-        ValidationProviderInterface $provider
+        ValidationProviderInterface $provider,
     ): ValidationInterface {
         if ($config->getDefaultValidator() === null) {
             throw new ValidationException('Default Validator is not configured.');

src/Exception/ValidationException.php

@@ -4,6 +4,4 @@
 
 namespace Spiral\Validation\Exception;
 
-class ValidationException extends \RuntimeException
-{
-}
+class ValidationException extends \RuntimeException {}

src/ValidationProvider.php

@@ -15,9 +15,8 @@ final class ValidationProvider implements ValidationProviderInterface
     private array $resolvers = [];
 
     public function __construct(
-        private readonly InvokerInterface $invoker
-    ) {
-    }
+        private readonly InvokerInterface $invoker,
+    ) {}
 
     /**
      * @param non-empty-string $name
@@ -38,7 +37,7 @@ public function getValidation(string $name, array $params = []): ValidationInter
 
         return $this->invoker->invoke(
             $this->resolvers[$name],
-            $params
+            $params,
         );
     }
 }

tests/Config/ValidationConfigTest.php

@@ -13,13 +13,13 @@ public function testDefaultValidatorIsNotSet(): void
     {
         $config = new ValidationConfig();
 
-        $this->assertNull($config->getDefaultValidator());
+        self::assertNull($config->getDefaultValidator());
     }
 
     public function testDefaultValidator(): void
     {
         $config = new ValidationConfig(['defaultValidator' => 'some']);
 
-        $this->assertSame('some', $config->getDefaultValidator());
+        self::assertSame('some', $config->getDefaultValidator());
     }
 }

tests/ValidationProviderTest.php

@@ -14,14 +14,6 @@ final class ValidationProviderTest extends TestCase
     private m\MockInterface|InvokerInterface $invoker;
     private ValidationProvider $provider;
 
-    protected function setUp(): void
-    {
-        parent::setUp();
-
-        $this->invoker = m::mock(InvokerInterface::class);
-        $this->provider = new ValidationProvider($this->invoker);
-    }
-
     public function testRegisterValidator(): void
     {
         $validation = m::mock(ValidationInterface::class);
@@ -35,9 +27,14 @@ public function testRegisterValidator(): void
             ->with($resolver, $params)
             ->andReturn($validation);
 
-        $this->assertSame(
-            $validation,
-            $this->provider->getValidation('foo', $params)
-        );
+        self::assertSame($validation, $this->provider->getValidation('foo', $params));
+    }
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->invoker = m::mock(InvokerInterface::class);
+        $this->provider = new ValidationProvider($this->invoker);
     }
 }