Performance optimizations

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 ## 1.4.2 under development
 
+- Enh #400: Improve container performance and make `has()` cache limit configurable (@samdark)
 - Enh #397: Explicitly import functions in "use" section (@mspirkov)
 
 ## 1.4.1 December 01, 2025

README.md

@@ -617,6 +617,20 @@ $config = ContainerConfig::create()
 $container = new Container($config);
 ```
 
+The container caches `has()` results to speed up repeated lookups. The cache is limited to 1024 entries by default.
+If your application checks many dynamic service IDs in a long-running process, you can adjust the limit or disable the
+cache:
+
+```php
+use Yiisoft\Di\Container;
+use Yiisoft\Di\ContainerConfig;
+
+$config = ContainerConfig::create()
+    ->withHasCacheLimit(0); // Disable `has()` cache.
+
+$container = new Container($config);
+```
+
 ## Strict mode
 
 Container may work in a strict mode, that's when you should define everything in the container explicitly.

src/CompositeContainer.php

@@ -6,6 +6,7 @@
 
 use InvalidArgumentException;
 use Psr\Container\ContainerInterface;
+use Psr\Container\NotFoundExceptionInterface;
 use RuntimeException;
 use Throwable;
 use Yiisoft\Di\Reference\TagReference;
@@ -25,6 +26,13 @@
      */
     private array $containers = [];
 
+    /**
+     * Index of a container where a service ID was previously found.
+     *
+     * @psalm-var array<string, int>
+     */
+    private array $lookupCache = [];
+
     /**
      * @psalm-template T
      * @psalm-param string|class-string<T> $id
@@ -59,7 +67,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 */
@@ -71,8 +79,22 @@
             return array_merge(...$tags);
         }
 
-        foreach ($this->containers as $container) {
+        if (isset($this->lookupCache[$id], $this->containers[$this->lookupCache[$id]])) {
+            $index = $this->lookupCache[$id];
+            $container = $this->containers[$index];
             if ($container->has($id)) {
+                try {
+                    /** @psalm-suppress MixedReturnStatement */
+                    return $container->get($id);
+                } catch (NotFoundExceptionInterface) {
+                }
+            }
+            unset($this->lookupCache[$id]);
+        }
+
+        foreach ($this->containers as $index => $container) {
+            if ($container->has($id)) {
+                $this->lookupCache[$id] = (int) $index;
                 /** @psalm-suppress MixedReturnStatement */
                 return $container->get($id);
             }
@@ -82,7 +104,7 @@
         $exceptions = [];
         foreach ($this->containers as $container) {
             $hasException = false;
             try {
                 $container->get($id);
             } catch (Throwable $t) {
                 $hasException = true;
@@ -115,23 +137,32 @@
         }
 
         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 (isset($this->lookupCache[$id], $this->containers[$this->lookupCache[$id]])) {
+            $index = $this->lookupCache[$id];
+            if ($this->containers[$index]->has($id)) {
+                return true;
+            }
+            unset($this->lookupCache[$id]);
+        }
+
+        foreach ($this->containers as $index => $container) {
             if ($container->has($id)) {
+                $this->lookupCache[$id] = (int) $index;
                 return true;
             }
         }
@@ -155,6 +186,7 @@
         foreach ($this->containers as $i => $c) {
             if ($container === $c) {
                 unset($this->containers[$i]);
+                $this->lookupCache = [];
             }
         }
     }