Remove useless override factories

zendframework · Feb 20, 2013 · 336611f · 336611f
1 parent f07fafa
commit 336611f
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 78 deletions.
diff --git a/library/Zend/Test/PHPUnit/Controller/AbstractControllerTestCase.php b/library/Zend/Test/PHPUnit/Controller/AbstractControllerTestCase.php
@@ -10,6 +10,7 @@
 
 use PHPUnit_Framework_TestCase;
 use PHPUnit_Framework_ExpectationFailedException;
+use Zend\Console\Console;
 use Zend\EventManager\StaticEventManager;
 use Zend\Http\Request as HttpRequest;
 use Zend\Mvc\Application;
@@ -133,16 +134,7 @@ public function getApplication()
             return $this->application;
         }
         $appConfig = $this->applicationConfig;
-        if (!$this->useConsoleRequest) {
-            $consoleServiceConfig = array(
-                'service_manager' => array(
-                    'factories' => array(
-                        'ServiceListener' => 'Zend\Test\PHPUnit\Mvc\Service\ServiceListenerFactory',
-                    ),
-                ),
-            );
-            $appConfig = array_replace_recursive($appConfig, $consoleServiceConfig);
-        }
+        Console::overrideIsConsole($this->getUseConsoleRequest());
         $this->application = Application::init($appConfig);
 
         $events = $this->application->getEventManager();

diff --git a/library/Zend/Test/PHPUnit/Mvc/Service/RouterFactory.php b/library/Zend/Test/PHPUnit/Mvc/Service/RouterFactory.php
diff --git a/library/Zend/Test/PHPUnit/Mvc/Service/ServiceListenerFactory.php b/library/Zend/Test/PHPUnit/Mvc/Service/ServiceListenerFactory.php