Rearrange ContainerInterface and AbstractFacade members for clarity

Author: lkrms

src/Toolkit/Core/AbstractFacade.php

@@ -29,6 +29,16 @@ abstract class AbstractFacade implements FacadeInterface
     /** @use ResolvesServiceLists<TService> */
     use ResolvesServiceLists;
 
+    /**
+     * @var array<class-string<static>,TService>
+     */
+    private static array $Instances = [];
+
+    /**
+     * @var array<class-string<static>,int>
+     */
+    private static array $ListenerIds = [];
+
     /**
      * Get the facade's underlying class, or an array that maps its underlying
      * class to compatible implementations
@@ -40,16 +50,6 @@ abstract class AbstractFacade implements FacadeInterface
      */
     abstract protected static function getService();
 
-    /**
-     * @var array<class-string<static>,TService>
-     */
-    private static array $Instances = [];
-
-    /**
-     * @var array<class-string<static>,int>
-     */
-    private static array $ListenerIds = [];
-
     /**
      * @inheritDoc
      */
@@ -75,7 +75,7 @@ final public static function load(?object $instance = null): void
      */
     final public static function swap(object $instance): void
     {
-        self::unload();
+        self::doUnload();
         self::$Instances[static::class] = self::doLoad($instance);
     }
 
@@ -89,60 +89,17 @@ final public static function unloadAll(): void
             if ($class === Event::class) {
                 continue;
             }
-            $class::unload();
+            $class::doUnload();
         }
-        Event::unload();
+        Event::doUnload();
     }
 
     /**
      * @inheritDoc
      */
     final public static function unload(): void
     {
-        // @phpstan-ignore-next-line
-        if (static::class === Event::class) {
-            $loaded = array_keys(self::$Instances);
-            if ($loaded && $loaded !== [Event::class]) {
-                throw new LogicException(sprintf(
-                    '%s cannot be unloaded before other facades',
-                    Event::class,
-                ));
-            }
-        }
-
-        $id = self::$ListenerIds[static::class] ?? null;
-        if ($id !== null) {
-            Event::removeListener($id);
-            unset(self::$ListenerIds[static::class]);
-        }
-
-        $instance = self::$Instances[static::class] ?? null;
-        if (!$instance) {
-            return;
-        }
-
-        if (static::class !== App::class) {
-            $container = Container::maybeGetGlobalContainer();
-            if ($container) {
-                $serviceName = self::getServiceName();
-                if (
-                    $container->hasInstance($serviceName) &&
-                    $container->get($serviceName) === $instance
-                ) {
-                    $container->unbindInstance($serviceName);
-                }
-            }
-        }
-
-        if ($instance instanceof FacadeAwareInterface) {
-            $instance = $instance->withoutFacade(static::class, true);
-        }
-
-        if ($instance instanceof Unloadable) {
-            $instance->unload();
-        }
-
-        unset(self::$Instances[static::class]);
+        self::doUnload();
     }
 
     /**
@@ -293,4 +250,52 @@ private static function createInstance(): object
             static::class,
         ));
     }
+
+    private static function doUnload(): void
+    {
+        // @phpstan-ignore-next-line
+        if (static::class === Event::class) {
+            $loaded = array_keys(self::$Instances);
+            if ($loaded && $loaded !== [Event::class]) {
+                throw new LogicException(sprintf(
+                    '%s cannot be unloaded before other facades',
+                    Event::class,
+                ));
+            }
+        }
+
+        $id = self::$ListenerIds[static::class] ?? null;
+        if ($id !== null) {
+            Event::removeListener($id);
+            unset(self::$ListenerIds[static::class]);
+        }
+
+        $instance = self::$Instances[static::class] ?? null;
+        if (!$instance) {
+            return;
+        }
+
+        if (static::class !== App::class) {
+            $container = Container::maybeGetGlobalContainer();
+            if ($container) {
+                $serviceName = self::getServiceName();
+                if (
+                    $container->hasInstance($serviceName) &&
+                    $container->get($serviceName) === $instance
+                ) {
+                    $container->unbindInstance($serviceName);
+                }
+            }
+        }
+
+        if ($instance instanceof FacadeAwareInterface) {
+            $instance = $instance->withoutFacade(static::class, true);
+        }
+
+        if ($instance instanceof Unloadable) {
+            $instance->unload();
+        }
+
+        unset(self::$Instances[static::class]);
+    }
 }

src/Util/Container/ContainerInterface.php

@@ -124,25 +124,25 @@ public function getName(string $id): string;
     public function has(string $id): bool;
 
     /**
-     * Check if a service provider is registered with the container
+     * Check if a shared service is bound to the container
      *
      * @param class-string $id
      */
-    public function hasProvider(string $id): bool;
+    public function hasSingleton(string $id): bool;
 
     /**
-     * Check if a shared service is bound to the container
+     * Check if a service resolves to a shared instance
      *
      * @param class-string $id
      */
-    public function hasSingleton(string $id): bool;
+    public function hasInstance(string $id): bool;
 
     /**
-     * Check if a service resolves to a shared instance
+     * Check if a service provider is registered with the container
      *
      * @param class-string $id
      */
-    public function hasInstance(string $id): bool;
+    public function hasProvider(string $id): bool;
 
     /**
      * Bind a service to the container
@@ -222,6 +222,30 @@ public function singletonIf(
         array $args = []
     ): self;
 
+    /**
+     * Bind a shared instance to the container
+     *
+     * @template TService of object
+     * @template T of TService
+     *
+     * @param class-string<TService> $id
+     * @param T $instance
+     * @return $this
+     */
+    public function instance(string $id, $instance): self;
+
+    /**
+     * Bind a shared instance to the container if it isn't already bound
+     *
+     * @template TService of object
+     * @template T of TService
+     *
+     * @param class-string<TService> $id
+     * @param T $instance
+     * @return $this
+     */
+    public function instanceIf(string $id, $instance): self;
+
     /**
      * Register a contextual binding with the container
      *
@@ -301,30 +325,6 @@ public function providers(
      */
     public function getProviders(): array;
 
-    /**
-     * Bind a shared instance to the container
-     *
-     * @template TService of object
-     * @template T of TService
-     *
-     * @param class-string<TService> $id
-     * @param T $instance
-     * @return $this
-     */
-    public function instance(string $id, $instance): self;
-
-    /**
-     * Bind a shared instance to the container if it isn't already bound
-     *
-     * @template TService of object
-     * @template T of TService
-     *
-     * @param class-string<TService> $id
-     * @param T $instance
-     * @return $this
-     */
-    public function instanceIf(string $id, $instance): self;
-
     /**
      * Remove a binding from the container
      *