Fixing compatibility issue caused by zendframework/zendframework#1976

doctrine · Jul 24, 2012 · f9f87c5 · f9f87c5
1 parent 3b613db
commit f9f87c5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 18 deletions.
diff --git a/bin/doctrine-module.php b/bin/doctrine-module.php
@@ -18,7 +18,7 @@
  */
 
 use Zend\ServiceManager\ServiceManager;
-use Zend\Mvc\Service\ServiceManagerConfig;
+use Zend\Mvc\Application;
 
 ini_set('display_errors', true);
 chdir(__DIR__);
@@ -43,23 +43,8 @@
     throw new RuntimeException('Error: vendor/autoload.php could not be found. Did you run php composer.phar install?');
 }
 
-// get application stack configuration
+$application = Application::init(include 'config/application.config.php');
-$configuration = include 'config/application.config.php';
-
-// setup service manager
-$serviceManager = new ServiceManager(new ServiceManagerConfig(
-    isset($configuration['service_manager']) ? $configuration['service_manager'] : array()
-));
-$serviceManager->setService('ApplicationConfig', $configuration);
-
-/* @var $moduleManager \Zend\ModuleManager\ModuleManagerInterface */
-$moduleManager = $serviceManager->get('ModuleManager');
-$moduleManager->loadModules();
-
-/* @var $application \Zend\Mvc\Application */
-$application = $serviceManager->get('Application');
-$application->bootstrap();
 
 /* @var $cli \Symfony\Component\Console\Application */
-$cli = $serviceManager->get('doctrine.cli');
+$cli = $application->getServiceManager()->get('doctrine.cli');
 $cli->run();
diff --git a/tests/DoctrineModuleTest/ServiceManagerTestCase.php b/tests/DoctrineModuleTest/ServiceManagerTestCase.php
@@ -62,6 +62,7 @@ public function getServiceManager(array $configuration = null)
         $configuration = $configuration ?: static::getServiceManagerConfiguration();
         $serviceManager = new ServiceManager(new ServiceManagerConfig($configuration));
         $serviceManager->setService('ApplicationConfiguration', $configuration);
+        $serviceManager->setFactory('ServiceListener', 'Zend\Mvc\Service\ServiceListenerFactory');
         /* @var $moduleManager \Zend\ModuleManager\ModuleManagerInterface */
         $moduleManager = $serviceManager->get('ModuleManager');
         $moduleManager->loadModules();