Merge pull request #1056 from spiral/singleton-interface

spiral · Jan 11, 2024 · 1b448b7 · 1b448b7
1 parent a33113d
commit 1b448b7
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/src/BootloadManager/AbstractBootloadManager.php b/src/BootloadManager/AbstractBootloadManager.php
@@ -5,13 +5,14 @@
 namespace Spiral\Boot\BootloadManager;
 
 use Spiral\Boot\BootloadManagerInterface;
-use Spiral\Core\Container;
+use Spiral\Core\Attribute\Singleton;
 use Spiral\Core\ScopeInterface;
 
 /**
  * Provides ability to bootload service providers.
  */
-abstract class AbstractBootloadManager implements BootloadManagerInterface, Container\SingletonInterface
+#[Singleton]
+abstract class AbstractBootloadManager implements BootloadManagerInterface
 {
     public function __construct(
         private readonly ScopeInterface $scope,

diff --git a/src/BootloadManager/ClassesRegistry.php b/src/BootloadManager/ClassesRegistry.php
@@ -6,13 +6,14 @@
 
 use Spiral\Boot\BootloadManagerInterface;
 use Spiral\Boot\Exception\BootloaderAlreadyBootedException;
-use Spiral\Core\Container;
+use Spiral\Core\Attribute\Singleton;
 
 /**
  * @internal
  * @psalm-import-type TClass from BootloadManagerInterface
  */
-final class ClassesRegistry implements Container\SingletonInterface
+#[Singleton]
+final class ClassesRegistry
 {
     /** @var TClass[] */
     private array $classes = [];

diff --git a/src/BootloadManager/Initializer.php b/src/BootloadManager/Initializer.php
@@ -15,16 +15,17 @@
 use Spiral\Boot\BootloadManager\Checker\ClassExistsChecker;
 use Spiral\Boot\BootloadManager\Checker\ConfigChecker;
 use Spiral\Boot\BootloadManagerInterface;
+use Spiral\Core\Attribute\Singleton;
 use Spiral\Core\BinderInterface;
-use Spiral\Core\Container;
 use Spiral\Core\ResolverInterface;
 
 /**
  * @internal
  * @psalm-import-type TClass from BootloadManagerInterface
  * @psalm-import-type TFullBinding from BootloaderInterface
  */
-class Initializer implements InitializerInterface, Container\SingletonInterface
+#[Singleton]
+class Initializer implements InitializerInterface
 {
     protected ?BootloaderCheckerInterface $checker = null;