Permalink
Browse files

Merge branch 'hotfix/issue-#3537-di-service-initializer-removal' of g…

…it://github.com/Ocramius/zf2 into hotfix/3545
  • Loading branch information...
2 parents 72d0461 + c62a95a commit 53207e19954771f3c29f46901c60c401a85fa418 @weierophinney weierophinney committed Jan 25, 2013
@@ -36,7 +36,6 @@ public function createService(ServiceLocatorInterface $serviceLocator)
if (isset($configuration['di']) && $serviceLocator->has('Di')) {
$plugins->addAbstractFactory($serviceLocator->get('DiAbstractServiceFactory'));
- $plugins->addInitializer($serviceLocator->get('DiServiceInitializer'));
}
return $plugins;
@@ -24,13 +24,6 @@ class DiServiceInitializerFactory implements FactoryInterface
*/
public function createService(ServiceLocatorInterface $serviceLocator)
{
- $initializer = new DiServiceInitializer($serviceLocator->get('Di'), $serviceLocator);
-
- if ($serviceLocator instanceof ServiceManager) {
- /* @var $serviceLocator ServiceManager */
- $serviceLocator->addInitializer($initializer);
- }
-
- return $initializer;
+ return new DiServiceInitializer($serviceLocator->get('Di'), $serviceLocator);
}
}
@@ -15,7 +15,7 @@
class DiFactoryTest extends \PHPUnit_Framework_TestCase
{
- public function testWillInitializeDiAndDiAbstractFactoryAndDiInitializer()
+ public function testWillInitializeDiAndDiAbstractFactory()
{
$serviceManager = new ServiceManager();
$serviceManager->setService('Config', array('di' => array('')));

0 comments on commit 53207e1

Please sign in to comment.