Fix EZP-23865: Fix legacy kernel manual reset in core console applica…

…tion > https://jira.ez.no/browse/EZP-23865
ezpublishlegacy · Jan 9, 2015 · e0148e5 · e0148e5
1 parent 1058c21
commit e0148e5
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 11 deletions.
diff --git a/eZ/Bundle/EzPublishCoreBundle/Console/Application.php b/eZ/Bundle/EzPublishCoreBundle/Console/Application.php
@@ -49,13 +49,6 @@ protected function registerCommands()
         $this->siteAccessName = $this->siteAccessName ?: $container->getParameter( 'ezpublish.siteaccess.default' );
         $siteAccess = new SiteAccess( $this->siteAccessName, 'cli' );
         $container->set( 'ezpublish.siteaccess', $siteAccess );
-
-        // Replacing legacy kernel handler web by the CLI one
-        // @todo: this should be somewhat done in the legacy bundle
-        $legacyHandlerCLI = $container->get( 'ezpublish_legacy.kernel_handler.cli' );
-        $container->set( 'ezpublish_legacy.kernel.lazy', null );
-        $container->set( 'ezpublish_legacy.kernel_handler', $legacyHandlerCLI );
-        $container->set( 'ezpublish_legacy.kernel_handler.web', $legacyHandlerCLI );
     }
 
 }
diff --git a/eZ/Bundle/EzPublishLegacyBundle/EventListener/LegacyKernelListener.php b/eZ/Bundle/EzPublishLegacyBundle/EventListener/LegacyKernelListener.php
@@ -12,18 +12,22 @@
 use eZ\Publish\Core\MVC\Legacy\LegacyEvents;
 use eZ\Publish\Core\MVC\Legacy\Event\PreResetLegacyKernelEvent;
 use eZINI;
+use Symfony\Component\Console\ConsoleEvents;
+use Symfony\Component\Console\Event\ConsoleCommandEvent;
+use Symfony\Component\DependencyInjection\ContainerAware;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
 /**
  * Resets eZINI when the Legacy Kernel is reset.
  */
-class LegacyKernelListener implements EventSubscriberInterface
+class LegacyKernelListener extends ContainerAware implements EventSubscriberInterface
 {
     public static function getSubscribedEvents()
     {
-        return array(
-            LegacyEvents::PRE_RESET_LEGACY_KERNEL => 'onKernelReset'
-        );
+        return [
+            LegacyEvents::PRE_RESET_LEGACY_KERNEL => 'onKernelReset',
+            ConsoleEvents::COMMAND => 'onConsoleCommand'
+        ];
     }
 
     public function onKernelReset( PreResetLegacyKernelEvent $event )
@@ -36,4 +40,12 @@ function() {
             false
         );
     }
+
+    public function onConsoleCommand( ConsoleCommandEvent $event )
+    {
+        $legacyHandlerCLI = $this->container->get( 'ezpublish_legacy.kernel_handler.cli' );
+        $this->container->set( 'ezpublish_legacy.kernel.lazy', null );
+        $this->container->set( 'ezpublish_legacy.kernel_handler', $legacyHandlerCLI );
+        $this->container->set( 'ezpublish_legacy.kernel_handler.web', $legacyHandlerCLI );
+    }
 }
diff --git a/eZ/Bundle/EzPublishLegacyBundle/Resources/config/services.yml b/eZ/Bundle/EzPublishLegacyBundle/Resources/config/services.yml
@@ -297,6 +297,8 @@ services:
 
     ezpublish_legacy.legacy_kernel_listener:
         class: %ezpublish_legacy.legacy_kernel_listener.class%
+        calls:
+            - [setContainer, [@service_container]]
         tags:
             - { name: kernel.event_subscriber }