Defer injection of default service configuration

weierophinney · weierophinney · commit 8b49e87214bb · 2016-02-26T11:02:07.000-06:00
- Defer until after testing the instance, to allow injection in
  retrieved instances (vs lazy-instantiated ones).
diff --git a/src/Service/ServiceListenerFactory.php b/src/Service/ServiceListenerFactory.php
@@ -148,7 +148,7 @@ public function __invoke(ContainerInterface $container, $requestedName, array $o
 
         $serviceListener = $container->has('ServiceListenerInterface')
             ? $container->get('ServiceListenerInterface')
-            : new ServiceListener($container, $this->defaultServiceConfig);
+            : new ServiceListener($container);
 
         if (! $serviceListener instanceof ServiceListenerInterface) {
             throw new ServiceNotCreatedException(
@@ -157,6 +157,8 @@ public function __invoke(ContainerInterface $container, $requestedName, array $o
             );
         }
 
+        $serviceListener->setDefaultServiceConfig($this->defaultServiceConfig);
+
         if (isset($configuration['service_listener_options'])) {
             $this->injectServiceListenerOptions($configuration['service_listener_options'], $serviceListener);
         }

Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,7 @@ public function __invoke(ContainerInterface $container, $requestedName, array $o`
`148`	`148`
`149`	`149`	`$serviceListener = $container->has('ServiceListenerInterface')`
`150`	`150`	`? $container->get('ServiceListenerInterface')`
`151`		`- : new ServiceListener($container, $this->defaultServiceConfig);`
	`151`	`+ : new ServiceListener($container);`
`152`	`152`
`153`	`153`	`if (! $serviceListener instanceof ServiceListenerInterface) {`
`154`	`154`	`throw new ServiceNotCreatedException(`
`@@ -157,6 +157,8 @@ public function __invoke(ContainerInterface $container, $requestedName, array $o`
`157`	`157`	`);`
`158`	`158`	`}`
`159`	`159`
	`160`	`+ $serviceListener->setDefaultServiceConfig($this->defaultServiceConfig);`
	`161`	`+`
`160`	`162`	`if (isset($configuration['service_listener_options'])) {`
`161`	`163`	`$this->injectServiceListenerOptions($configuration['service_listener_options'], $serviceListener);`
`162`	`164`	`}`