Merge pull request #1056 from spiral/singleton-interface

spiral · Jan 11, 2024 · 93f8a5f · 93f8a5f
1 parent d9ab039
commit 93f8a5f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/Bootloader/ValidationBootloader.php b/src/Bootloader/ValidationBootloader.php
@@ -7,14 +7,15 @@
 use Spiral\Boot\Bootloader\Bootloader;
 use Spiral\Config\ConfiguratorInterface;
 use Spiral\Config\Patch\Set;
-use Spiral\Core\Container\SingletonInterface;
+use Spiral\Core\Attribute\Singleton;
 use Spiral\Validation\Config\ValidationConfig;
 use Spiral\Validation\Exception\ValidationException;
 use Spiral\Validation\ValidationInterface;
 use Spiral\Validation\ValidationProvider;
 use Spiral\Validation\ValidationProviderInterface;
 
-final class ValidationBootloader extends Bootloader implements SingletonInterface
+#[Singleton]
+final class ValidationBootloader extends Bootloader
 {
     protected const SINGLETONS = [
         ValidationProviderInterface::class => ValidationProvider::class,

diff --git a/src/ValidationProvider.php b/src/ValidationProvider.php
@@ -4,11 +4,12 @@
 
 namespace Spiral\Validation;
 
-use Spiral\Core\Container\SingletonInterface;
+use Spiral\Core\Attribute\Singleton;
 use Spiral\Core\InvokerInterface;
 use Spiral\Validation\Exception\ValidationException;
 
-final class ValidationProvider implements ValidationProviderInterface, SingletonInterface
+#[Singleton]
+final class ValidationProvider implements ValidationProviderInterface
 {
     /** @var array<non-empty-string, \Closure> */
     private array $resolvers = [];