Merge branch 'hotfix/270'

Close #270
zendframework · Dec 20, 2018 · feb2cc9 · feb2cc9
2 parents a9745af + b657fcc
commit feb2cc9
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/src/Proxy/LazyServiceFactory.php b/src/Proxy/LazyServiceFactory.php
@@ -49,14 +49,14 @@ public function __construct(LazyLoadingValueHolderFactory $proxyFactory, array $
      */
     public function __invoke(ContainerInterface $container, $name, callable $callback, array $options = null)
     {
-        $initializer = function (&$wrappedInstance, LazyLoadingInterface $proxy) use ($callback) {
-            $proxy->setProxyInitializer(null);
-            $wrappedInstance = $callback();
+        if (isset($this->servicesMap[$name])) {
+            $initializer = function (&$wrappedInstance, LazyLoadingInterface $proxy) use ($callback) {
+                $proxy->setProxyInitializer(null);
+                $wrappedInstance = $callback();
 
-            return true;
-        };
+                return true;
+            };
 
-        if (isset($this->servicesMap[$name])) {
             return $this->proxyFactory->createProxy($this->servicesMap[$name], $initializer);
         }