Upgrade for symfony/event-dispatcher 5.0

Author: alexander-schranz

src/PHPCR/Shell/Console/Application/ShellApplication.php

@@ -28,6 +28,7 @@
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\DependencyInjection\ContainerAwareInterface;
 use Symfony\Component\EventDispatcher\EventDispatcher;
+use Symfony\Component\EventDispatcher\LegacyEventDispatcherProxy;
 
 /**
  * Main application for PHPCRSH.
@@ -56,6 +57,11 @@ class ShellApplication extends Application
      */
     protected $initialized = false;
 
+    /**
+     * @var EventDispatcher
+     */
+    private $dispatcher;
+
     /**
      * Constructor - name and version inherited from SessionApplication.
      *
@@ -94,7 +100,7 @@ public function init()
         $this->registerShellCommands();
 
         $event = new ApplicationInitEvent($this);
-        $this->dispatcher->dispatch(PhpcrShellEvents::APPLICATION_INIT, $event);
+        $this->dispatch(PhpcrShellEvents::APPLICATION_INIT, $event);
         $this->initialized = true;
     }
 
@@ -241,7 +247,7 @@ public function doRun(InputInterface $input, OutputInterface $output)
         $name = $this->getCommandName($input);
 
         $event = new Event\CommandPreRunEvent($name, $input);
-        $this->dispatcher->dispatch(PhpcrShellEvents::COMMAND_PRE_RUN, $event);
+        $this->dispatch(PhpcrShellEvents::COMMAND_PRE_RUN, $event);
         $input = $event->getInput();
 
         if (!$name) {
@@ -251,7 +257,7 @@ public function doRun(InputInterface $input, OutputInterface $output)
         try {
             $exitCode = parent::doRun($input, $output);
         } catch (\Exception $e) {
-            $this->dispatcher->dispatch(PhpcrShellEvents::COMMAND_EXCEPTION, new Event\CommandExceptionEvent($e, $this, $output));
+            $this->dispatch(PhpcrShellEvents::COMMAND_EXCEPTION, new Event\CommandExceptionEvent($e, $this, $output));
 
             return 1;
         }
@@ -291,7 +297,7 @@ public function add(Command $command)
     public function dispatchProfileInitEvent(InputInterface $sessionInput, OutputInterface $output)
     {
         $event = new Event\ProfileInitEvent($this->container->get('config.profile'), $sessionInput, $output);
-        $this->dispatcher->dispatch(PhpcrShellEvents::PROFILE_INIT, $event);
+        $this->dispatch(PhpcrShellEvents::PROFILE_INIT, $event);
     }
 
     /**
@@ -328,4 +334,14 @@ public function setDebug($debug)
     {
         $this->debug = $debug;
     }
+
+    private function dispatch(string $eventName, $event)
+    {
+        // LegacyEventDispatcherProxy exists in Symfony >= 4.3
+        if (class_exists(LegacyEventDispatcherProxy::class)) {
+            return $this->dispatcher->dispatch($event, $eventName);
+        }
+
+        return $this->dispatcher->dispatch($eventName, $event);
+    }
 }

src/PHPCR/Shell/Event/ApplicationInitEvent.php

@@ -13,7 +13,6 @@
 namespace PHPCR\Shell\Event;
 
 use Symfony\Component\Console\Application;
-use Symfony\Component\EventDispatcher\Event;
 
 /**
  * This event is fired when the main shell application

src/PHPCR/Shell/Event/CommandExceptionEvent.php

@@ -14,7 +14,6 @@
 
 use PHPCR\Shell\Console\Application\ShellApplication;
 use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\EventDispatcher\Event;
 
 class CommandExceptionEvent extends Event
 {

src/PHPCR/Shell/Event/CommandPreRunEvent.php

@@ -13,7 +13,6 @@
 namespace PHPCR\Shell\Event;
 
 use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\EventDispatcher\Event;
 
 class CommandPreRunEvent extends Event
 {

src/PHPCR/Shell/Event/Event.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace PHPCR\Shell\Event;
+
+use Symfony\Component\EventDispatcher\Event as OldEvent;
+use Symfony\Contracts\EventDispatcher\Event as ContractEvent;
+
+if (class_exists(ContractEvent::class)) {
+    class Event extends ContractEvent
+    {
+    }
+} else {
+    class Event extends OldEvent
+    {
+    }
+}

src/PHPCR/Shell/Event/ProfileInitEvent.php

@@ -15,7 +15,6 @@
 use PHPCR\Shell\Config\Profile;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\EventDispatcher\Event;
 
 /**
  * Event that is fired when the Profile needs to be initialized.