Performance optimization

CHANGELOG.md

@@ -5,6 +5,7 @@
 - New #380: Add `TagReference::id()` method (@vjik)
 - Enh #384: Make `$config` parameter in `Container` constructor optional (@np25071984)
 - Enh #324: Make `BuildingException` and `NotFoundException` friendly (@np25071984)
+- Enh #387: Improve container performance (@samdark)
 
 ## 1.3.0 October 14, 2024
 

composer.json

@@ -46,7 +46,7 @@
         "rector/rector": "^2.0",
         "roave/infection-static-analysis-plugin": "^1.25",
         "spatie/phpunit-watcher": "^1.23",
-        "vimeo/psalm": "^5.26",
+        "vimeo/psalm": "^5.26.1",
         "yiisoft/injector": "^1.0",
         "yiisoft/test-support": "^3.0"
     },

psalm.xml

@@ -15,10 +15,5 @@
     </projectFiles>
     <issueHandlers>
         <MixedAssignment errorLevel="suppress" />
-        <InvalidCatch>
-            <errorLevel type="suppress">
-                <referencedClass name="Psr\Container\NotFoundExceptionInterface" />
-            </errorLevel>
-        </InvalidCatch>
     </issueHandlers>
 </psalm>

src/CompositeContainer.php

@@ -58,7 +58,7 @@
             $tags = [];
             foreach ($this->containers as $container) {
                 if (!$container instanceof Container) {
                     continue;
                 }
                 if ($container->has($id)) {
                     /** @psalm-suppress MixedArgument `Container::get()` always return array for tag */
@@ -81,7 +81,7 @@
         $exceptions = [];
         foreach ($this->containers as $container) {
             $hasException = false;
             try {
                 $container->get($id);
             } catch (Throwable $t) {
                 $hasException = true;
@@ -103,11 +103,38 @@
 
     public function has($id): bool
     {
+        /** @psalm-suppress TypeDoesNotContainType */
+        if (!is_string($id)) {
+            throw new InvalidArgumentException(
+                sprintf(
+                    'ID must be a string, %s given.',
+                    get_debug_type($id)
+                )
+            );
+        }
+
+        if ($id === StateResetter::class) {
+            return true;
+        }
+
+        if (TagReference::isTagAlias($id)) {
+            foreach ($this->containers as $container) {
+                if (!$container instanceof Container) {
+                    continue;
+                }
+                if ($container->has($id)) {
+                    return true;
+                }
+            }
+            return false;
+        }
+
         foreach ($this->containers as $container) {
             if ($container->has($id)) {
                 return true;
             }
         }
+
         return false;
     }