Remove legacy dispatcher compatibility

Author: alexander-schranz

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

@@ -100,7 +100,7 @@ public function init()
         $this->registerShellCommands();
 
         $event = new ApplicationInitEvent($this);
-        $this->dispatch(PhpcrShellEvents::APPLICATION_INIT, $event);
+        $this->dispatcher->dispatch($event, PhpcrShellEvents::APPLICATION_INIT);
         $this->initialized = true;
     }
 
@@ -247,7 +247,7 @@ public function doRun(InputInterface $input, OutputInterface $output)
         $name = $this->getCommandName($input);
 
         $event = new Event\CommandPreRunEvent($name, $input);
-        $this->dispatch(PhpcrShellEvents::COMMAND_PRE_RUN, $event);
+        $this->dispatcher->dispatch($event, PhpcrShellEvents::COMMAND_PRE_RUN);
         $input = $event->getInput();
 
         if (!$name) {
@@ -257,7 +257,7 @@ public function doRun(InputInterface $input, OutputInterface $output)
         try {
             $exitCode = parent::doRun($input, $output);
         } catch (\Exception $e) {
-            $this->dispatch(PhpcrShellEvents::COMMAND_EXCEPTION, new Event\CommandExceptionEvent($e, $this, $output));
+            $this->dispatcher->dispatch(new Event\CommandExceptionEvent($e, $this, $output), PhpcrShellEvents::COMMAND_EXCEPTION);
 
             return 1;
         }
@@ -297,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->dispatch(PhpcrShellEvents::PROFILE_INIT, $event);
+        $this->dispatch($event, PhpcrShellEvents::PROFILE_INIT);
     }
 
     /**
@@ -334,14 +334,4 @@ 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);
-    }
 }