fix: bind multiple instances (singletons) to interface classes

Author: danielRConsid

composer.json

@@ -1,7 +1,7 @@
 {
   "name": "maplephp/container",
   "type": "library",
-  "version": "v1.1.4",
+  "version": "v2.0.0",
   "description": "Container, Factories and dependency injectors with full PSR-11 support.",
   "keywords": [
     "container",
@@ -27,11 +27,7 @@
     "maplephp/dto": "^3.0"
   },
   "autoload": {
-    "files": [
-      "src/Setup/aliases.php"
-    ],
     "psr-4": {
-      "Psr\\Container\\": "src/Interfaces/",
       "MaplePHP\\Container\\": "src"
     }
   },

src/Autowire.php

@@ -1,12 +1,13 @@
 <?php
 
+declare(strict_types=1);
+
 namespace MaplePHP\Container;
 
 use MaplePHP\Container\Interfaces\AutowireInterface;
 
 class Autowire implements AutowireInterface
 {
-
     private Reflection $reflect;
     /**
      * @var mixed|object|null
@@ -52,7 +53,7 @@ public function disableDI(): self
      */
     public function addArgs(array $args): self
     {
-        if(count($args) <= 0) {
+        if (count($args) <= 0) {
             throw new \InvalidArgumentException("You must provide at least one argument.");
         }
         $inst = $this->disableDI();
@@ -73,4 +74,4 @@ public function run(): mixed
         }
         return $this->class;
     }
-}
+}

src/Container.php

@@ -6,7 +6,7 @@
 
 use Closure;
 use MaplePHP\Container\Interfaces\AutowireInterface;
-use Psr\Container\ContainerInterface;
+use MaplePHP\Container\Interfaces\ContainerInterface;
 use MaplePHP\Container\Interfaces\FactoryInterface;
 use MaplePHP\DTO\Format\Arr;
 //use MaplePHP\Container\Reflection;

src/Interfaces/AutowireInterface.php

@@ -31,4 +31,4 @@ public function addArgs(array $args): self;
      * @throws \ReflectionException
      */
     public function run(): mixed;
-}
+}

src/Interfaces/ContainerInterface.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Psr\Container;
+namespace MaplePHP\Container\Interfaces;
 
 /**
  * Describes the interface of a container that exposes methods to read its entries.

src/Reflection.php

@@ -241,9 +241,13 @@ private function insertInterfaceClasses(ReflectionClass $inst, string $className
         if ($this->allowInterfaces) {
             if (self::$interfaceFactory !== null) {
                 foreach (self::$interfaceFactory as $call) {
-                    self::$class[$classNameA] = $call($inst->getShortName(), $classNameA, $inst);
+                    $getter = $call($inst->getShortName(), $classNameA, $inst);
+                    if($getter !== null) {
+                        self::$class[$classNameA] = $call($inst->getShortName(), $classNameA, $inst);
+                    }
                 }
             }
+
         } else {
             self::$class[$classNameA] = null;
         }