Start container cleanup

- Rename `IContainer` to `ContainerInterface` and move to
  `Lkrms\Container\Contract`
- Rename `IApplication` to `ApplicationInterface` and move to
  `Lkrms\Container\Contract`

Author: lkrms

src/Cli/Contract/CliApplicationInterface.php

@@ -2,15 +2,15 @@
 
 namespace Lkrms\Cli\Contract;
 
-use Lkrms\Contract\IApplication;
+use Lkrms\Container\Contract\ApplicationInterface;
 use LogicException;
 
 /**
  * A service container for CLI applications
  *
  * @api
  */
-interface CliApplicationInterface extends IApplication
+interface CliApplicationInterface extends ApplicationInterface
 {
     /**
      * Get the command invoked by run()

src/Concept/Builder.php

@@ -2,8 +2,8 @@
 
 namespace Lkrms\Concept;
 
+use Lkrms\Container\Contract\ContainerInterface;
 use Lkrms\Container\Container;
-use Lkrms\Contract\IContainer;
 use Lkrms\Contract\IImmutable;
 use Lkrms\Support\Introspector;
 use Lkrms\Support\ProviderContext;
@@ -33,7 +33,7 @@ protected static function getTerminators(): array
         return [];
     }
 
-    protected IContainer $Container;
+    protected ContainerInterface $Container;
 
     /**
      * @var Introspector<object,Provider,Entity,ProviderContext>
@@ -53,7 +53,7 @@ protected static function getTerminators(): array
     /**
      * Creates a new Builder object
      */
-    final public function __construct(?IContainer $container = null)
+    final public function __construct(?ContainerInterface $container = null)
     {
         $this->Container = $container ?? Container::getGlobalContainer();
         $this->Introspector = Introspector::getService($this->Container, static::getService());
@@ -75,7 +75,7 @@ final public function __construct(?IContainer $container = null)
      *
      * @return static
      */
-    final public static function build(?IContainer $container = null)
+    final public static function build(?ContainerInterface $container = null)
     {
         return new static($container);
     }

src/Concept/Facade.php

@@ -3,11 +3,11 @@
 namespace Lkrms\Concept;
 
 use Lkrms\Concern\ResolvesServiceLists;
+use Lkrms\Container\Contract\ContainerInterface;
 use Lkrms\Container\Event\GlobalContainerSetEvent;
 use Lkrms\Container\Container;
 use Lkrms\Contract\FacadeAwareInterface;
 use Lkrms\Contract\FacadeInterface;
-use Lkrms\Contract\IContainer;
 use Lkrms\Contract\Unloadable;
 use Lkrms\Facade\Event;
 use Lkrms\Support\EventDispatcher;
@@ -224,7 +224,7 @@ static function (GlobalContainerSetEvent $event) use ($serviceName, $instance):
      * @return TService
      */
     private static function getInstanceFromContainer(
-        IContainer $container,
+        ContainerInterface $container,
         string $serviceName
     ) {
         // If one of the services returned by the facade has been bound to the

src/Concept/Provider.php

@@ -2,7 +2,7 @@
 
 namespace Lkrms\Concept;
 
-use Lkrms\Contract\IContainer;
+use Lkrms\Container\Contract\ContainerInterface;
 use Lkrms\Contract\IProvider;
 use Lkrms\Exception\MethodNotImplementedException;
 use Lkrms\Support\Date\DateFormatterInterface;
@@ -15,14 +15,14 @@
  */
 abstract class Provider implements IProvider
 {
-    protected IContainer $App;
+    protected ContainerInterface $App;
 
     private DateFormatterInterface $DateFormatter;
 
     /**
      * Creates a new Provider object
      */
-    public function __construct(IContainer $app)
+    public function __construct(ContainerInterface $app)
     {
         $this->App = $app;
     }
@@ -39,7 +39,7 @@ abstract protected function getDateFormatter(): DateFormatterInterface;
     /**
      * @inheritDoc
      */
-    public function getContext(?IContainer $container = null): ProviderContext
+    public function getContext(?ContainerInterface $container = null): ProviderContext
     {
         if (!$container) {
             $container = $this->App;
@@ -63,15 +63,15 @@ public function checkHeartbeat(int $ttl = 300)
     /**
      * @inheritDoc
      */
-    final public function app(): IContainer
+    final public function app(): ContainerInterface
     {
         return $this->App;
     }
 
     /**
      * @inheritDoc
      */
-    final public function container(): IContainer
+    final public function container(): ContainerInterface
     {
         return $this->App;
     }

src/Concern/HasBuilder.php

@@ -3,8 +3,8 @@
 namespace Lkrms\Concern;
 
 use Lkrms\Concept\Builder;
+use Lkrms\Container\Contract\ContainerInterface;
 use Lkrms\Contract\Buildable;
-use Lkrms\Contract\IContainer;
 
 /**
  * Implements Buildable
@@ -18,7 +18,7 @@ public static function getBuilder(): string
         return static::class . 'Builder';
     }
 
-    final public static function build(?IContainer $container = null): Builder
+    final public static function build(?ContainerInterface $container = null): Builder
     {
         return static::getBuilder()::build($container);
     }

src/Concern/RequiresContainer.php

@@ -2,12 +2,12 @@
 
 namespace Lkrms\Concern;
 
+use Lkrms\Container\Contract\ContainerInterface;
 use Lkrms\Container\Container;
-use Lkrms\Contract\IContainer;
 
 trait RequiresContainer
 {
-    final protected static function requireContainer(?IContainer $container = null): IContainer
+    final protected static function requireContainer(?ContainerInterface $container = null): ContainerInterface
     {
         return $container ?: Container::requireGlobalContainer();
     }

src/Concern/TConstructible.php

@@ -2,9 +2,9 @@
 
 namespace Lkrms\Concern;
 
+use Lkrms\Container\Contract\ContainerInterface;
 use Lkrms\Container\Container;
 use Lkrms\Contract\IConstructible;
-use Lkrms\Contract\IContainer;
 use Lkrms\Contract\IExtensible;
 use Lkrms\Contract\ITreeable;
 use Lkrms\Support\Catalog\ArrayKeyConformity;
@@ -30,13 +30,14 @@ trait TConstructible
      * normalised for comparison.
      *
      * @param mixed[] $data
-     * @param IContainer|null $container Used to create the instance if set.
+     * @param ContainerInterface|null $container Used to create the instance if
+     * set.
      * @param (ITreeable&static)|null $parent If the class implements
      * {@see ITreeable}, pass `$parent` to the instance via
      * {@see ITreeable::setParent()}.
      * @return static
      */
-    final public static function construct(array $data, ?IContainer $container = null, $parent = null)
+    final public static function construct(array $data, ?ContainerInterface $container = null, $parent = null)
     {
         if (!$container) {
             $container = Container::requireGlobalContainer();
@@ -54,7 +55,8 @@ final public static function construct(array $data, ?IContainer $container = nul
      * @param iterable<mixed[]> $list
      * @param ArrayKeyConformity::* $conformity Use `COMPLETE` or `PARTIAL`
      * wherever possible to improve performance.
-     * @param IContainer|null $container Used to create each instance if set.
+     * @param ContainerInterface|null $container Used to create each instance if
+     * set.
      * @param (ITreeable&static)|null $parent If the class implements
      * {@see ITreeable}, pass `$parent` to each instance via
      * {@see ITreeable::setParent()}.
@@ -63,7 +65,7 @@ final public static function construct(array $data, ?IContainer $container = nul
     final public static function constructList(
         iterable $list,
         $conformity = ArrayKeyConformity::NONE,
-        ?IContainer $container = null,
+        ?ContainerInterface $container = null,
         $parent = null
     ): Generator {
         if (!$container) {

src/Concern/TProvidable.php

@@ -2,7 +2,7 @@
 
 namespace Lkrms\Concern;
 
-use Lkrms\Contract\IContainer;
+use Lkrms\Container\Contract\ContainerInterface;
 use Lkrms\Contract\IExtensible;
 use Lkrms\Contract\IProvidable;
 use Lkrms\Contract\IProvider;
@@ -143,7 +143,7 @@ final public static function provide(
         IProvider $provider,
         ?IProviderContext $context = null
     ) {
-        /** @var IContainer */
+        /** @var ContainerInterface */
         $container = $context
             ? $context->container()
             : $provider->container();
@@ -195,7 +195,7 @@ private static function _provideList(
         $conformity,
         ?IProviderContext $context
     ): Generator {
-        /** @var IContainer */
+        /** @var ContainerInterface */
         $container = $context
             ? $context->container()
             : $provider->container();

src/Container/Application.php

@@ -6,7 +6,7 @@
 use Lkrms\Console\Catalog\ConsoleLevelGroup as LevelGroup;
 use Lkrms\Console\Catalog\ConsoleMessageType as MessageType;
 use Lkrms\Console\Target\StreamTarget;
-use Lkrms\Contract\IApplication;
+use Lkrms\Container\Contract\ApplicationInterface;
 use Lkrms\Exception\FilesystemErrorException;
 use Lkrms\Exception\InvalidEnvironmentException;
 use Lkrms\Facade\Cache;
@@ -33,7 +33,7 @@
 /**
  * A service container for applications
  */
-class Application extends Container implements IApplication
+class Application extends Container implements ApplicationInterface
 {
     private const DIR_CONFIG = 'CONFIG';
     private const DIR_DATA = 'DATA';

src/Container/Container.php

@@ -5,19 +5,19 @@
 use Dice\Dice;
 use Dice\DiceException;
 use Lkrms\Concept\FluentInterface;
+use Lkrms\Container\Contract\ContainerInterface;
 use Lkrms\Container\Event\GlobalContainerSetEvent;
 use Lkrms\Container\Exception\ContainerNotLocatedException;
 use Lkrms\Container\Exception\ContainerServiceNotFoundException;
 use Lkrms\Container\Exception\InvalidContainerBindingException;
-use Lkrms\Contract\IContainer;
 use Lkrms\Contract\IService;
 use Lkrms\Contract\IServiceShared;
 use Lkrms\Contract\IServiceSingleton;
 use Lkrms\Contract\ReceivesContainer;
 use Lkrms\Contract\ReceivesService;
 use Lkrms\Facade\DI;
 use Lkrms\Facade\Event;
-use Psr\Container\ContainerInterface;
+use Psr\Container\ContainerInterface as PsrContainerInterface;
 use Closure;
 use ReflectionClass;
 
@@ -26,9 +26,9 @@
  *
  * A static interface to the global service container is provided by {@see DI}.
  */
-class Container extends FluentInterface implements IContainer
+class Container extends FluentInterface implements ContainerInterface
 {
-    private static ?IContainer $GlobalContainer = null;
+    private static ?ContainerInterface $GlobalContainer = null;
 
     private Dice $Dice;
 
@@ -76,7 +76,7 @@ private function bindContainer(): void
 
         // Bind any interfaces that extend PSR-11's ContainerInterface
         foreach ($class->getInterfaces() as $name => $interface) {
-            if ($interface->implementsInterface(ContainerInterface::class)) {
+            if ($interface->implementsInterface(PsrContainerInterface::class)) {
                 $this->instance($name, $this);
             }
         }
@@ -118,7 +118,7 @@ final public static function hasGlobalContainer(): bool
     /**
      * @inheritDoc
      */
-    final public static function getGlobalContainer(): IContainer
+    final public static function getGlobalContainer(): ContainerInterface
     {
         if (self::$GlobalContainer !== null) {
             return self::$GlobalContainer;
@@ -130,7 +130,7 @@ final public static function getGlobalContainer(): IContainer
     /**
      * Get the global container if it exists
      */
-    final public static function maybeGetGlobalContainer(): ?IContainer
+    final public static function maybeGetGlobalContainer(): ?ContainerInterface
     {
         return self::$GlobalContainer;
     }
@@ -141,7 +141,7 @@ final public static function maybeGetGlobalContainer(): ?IContainer
      * @throws ContainerNotLocatedException if the global container does not
      * exist.
      */
-    final public static function requireGlobalContainer(): IContainer
+    final public static function requireGlobalContainer(): ContainerInterface
     {
         if (self::$GlobalContainer === null) {
             throw new ContainerNotLocatedException();
@@ -153,7 +153,7 @@ final public static function requireGlobalContainer(): IContainer
     /**
      * @inheritDoc
      */
-    final public static function setGlobalContainer(?IContainer $container): ?IContainer
+    final public static function setGlobalContainer(?ContainerInterface $container): ?ContainerInterface
     {
         Event::dispatch(new GlobalContainerSetEvent($container));