isConsole check

hummer2k · Jun 20, 2015 · 5b79dee · 5b79dee
1 parent 2705ad9
commit 5b79dee
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/src/ConVarnish/Module.php b/src/ConVarnish/Module.php
@@ -1,6 +1,7 @@
 <?php
 namespace ConVarnish;
 
+use Zend\Console\Console;
 use Zend\Mvc\Application;
 use Zend\Mvc\MvcEvent;
 
@@ -34,6 +35,9 @@ public function getServiceConfig()
      */
     public function onBootstrap(MvcEvent $e)
     {
+        if (Console::isConsole()) {
+            return;
+        }
         /* @var $application Application */
         $application = $e->getApplication();
         $serviceManager = $application->getServiceManager();

diff --git a/tests/ConVarnishTest/ModuleTest.php b/tests/ConVarnishTest/ModuleTest.php
@@ -3,6 +3,7 @@
 namespace ConVarnishTest;
 
 use ConVarnish\Module;
+use Zend\Console\Console;
 use Zend\EventManager\EventManager;
 use Zend\Mvc\Application;
 use Zend\Mvc\MvcEvent;
@@ -34,7 +35,11 @@ public function testOnBootstrap()
         $em = new EventManager();
         $application->setEventManager($em);
         $event->setApplication($application);
+
+        $isConsole = Console::isConsole();
+        Console::overrideIsConsole(false);
         $this->module->onBootstrap($event);
+        Console::overrideIsConsole($isConsole);
 
         $this->assertCount(1, $em->getListeners(MvcEvent::EVENT_DISPATCH));
         $this->assertCount(1, $em->getListeners(MvcEvent::EVENT_RENDER));