📦 Container compilation and delegators #52

CHANGELOG.md

@@ -2,6 +2,28 @@
 
 All notable changes to this project will be documented in this file, in reverse chronological order by release.
 
+## V8.1.1 - TBD
+
+### Added
+
+- Nothing
+
+### Changed
+
+- [#52](https://github.com/elie29/zend-di-config/issues/52) Container compilation and delegators
+
+### Deprecated
+
+- Nothing.
+
+### Removed
+
+- Nothing.
+
+### Fixed
+
+- Nothing.
+
 ## V8.1.0 - 2021-12-16
 
 ### Added

src/Config.php

@@ -5,6 +5,7 @@
 namespace Elie\PHPDI\Config;
 
 use DI\ContainerBuilder;
+use DI\Definition\Helper\DefinitionHelper;
 use Psr\Container\ContainerInterface;
 
 use function DI\autowire;
@@ -137,19 +138,29 @@ private function addDelegators(): void
             foreach ($delegators as $delegator) {
                 $previous                     = $name . '-' . ++$this->delegatorCounter;
                 $this->definitions[$previous] = $this->definitions[$name];
-                $current                      =
-                    function (ContainerInterface $container) use ($delegator, $previous, $name) {
-                        $factory  = new $delegator();
-                        $callable = function () use ($previous, $container) {
-                            return $container->get($previous);
-                        };
-                        return $factory($container, $name, $callable);
-                    };
-                $this->definitions[$name]     = $current;
+                $this->definitions[$name]     = $this->createDelegatorFactory($delegator, $previous, $name);
             }
         }
     }
 
+    private function createDelegatorFactory(string $delegator, string $previous, string $name): DefinitionHelper
+    {
+        return factory(function (
+            ContainerInterface $container,
+            string $delegator,
+            string $previous,
+            string $name
+        ) {
+            $factory  = new $delegator();
+            $callable = function () use ($previous, $container) {
+                return $container->get($previous);
+            };
+            return $factory($container, $name, $callable);
+        })->parameter('delegator', $delegator)
+          ->parameter('previous', $previous)
+          ->parameter('name', $name);
+    }
+
     private function useAutowire(ContainerBuilder $builder): void
     {
         // default autowire is true