Merge pull request #280 from MartinKrizan/4.5.x

Do not remove delegators on service creation

Author: froschdesign

src/ServiceManager.php

@@ -601,9 +601,9 @@ private function createDelegatorFromName(string $name, ?array $options = null):
         $resolvedDelegators = [];
         foreach ($this->delegators[$name] as $index => $delegatorFactory) {
             /** @psalm-suppress ArgumentTypeCoercion https://github.com/vimeo/psalm/issues/9680 */
-            $delegatorFactory                = $this->resolveDelegatorFactory($delegatorFactory);
-            $this->delegators[$name][$index] = $delegatorFactory;
-            $creationCallback                =
+            $delegatorFactory           = $this->resolveDelegatorFactory($delegatorFactory);
+            $resolvedDelegators[$index] = $delegatorFactory;
+            $creationCallback           =
                 static fn(): mixed => $delegatorFactory($initialCreationContext, $name, $creationCallback, $options);
         }
 

test/ServiceManagerTest.php

@@ -5,6 +5,7 @@
 namespace LaminasTest\ServiceManager;
 
 use DateTime;
+use Laminas\ContainerConfigTest\TestAsset\Delegator;
 use Laminas\ContainerConfigTest\TestAsset\DelegatorFactory;
 use Laminas\ServiceManager\Factory\AbstractFactoryInterface;
 use Laminas\ServiceManager\Factory\FactoryInterface;
@@ -396,6 +397,30 @@ public function testDuplicateDelegatorsAreRemoved(): void
         );
     }
 
+    public function testDelegatorsAreUsedOnRepeatedCreate(): void
+    {
+        $dependencies   = [
+            'delegators' => [
+                DateTime::class => [
+                    DelegatorFactory::class,
+                    DelegatorFactory::class,
+                ],
+            ],
+            'invokables' => [
+                DateTime::class => DateTime::class,
+            ],
+        ];
+        $serviceManager = new ServiceManager($dependencies);
+
+        $first  = $serviceManager->build(DateTime::class);
+        $second = $serviceManager->build(DateTime::class);
+
+        /** @psalm-suppress DocblockTypeContradiction*/
+        self::assertInstanceOf(Delegator::class, $first);
+        /** @psalm-suppress DocblockTypeContradiction*/
+        self::assertInstanceOf(Delegator::class, $second);
+    }
+
     public function testResolvedAliasFromAbstractFactory(): void
     {
         $abstractFactory = $this->createMock(AbstractFactoryInterface::class);