Implement Plugin Classes

src/Console/CommandRunner.php

@@ -22,18 +22,27 @@
 use Cake\Console\Exception\StopException;
 use Cake\Console\Shell;
 use Cake\Core\ConsoleApplicationInterface;
-use Cake\Event\EventApplicationInterface;
+use Cake\Core\PluginApplicationInterface;
 use Cake\Event\EventDispatcherInterface;
 use Cake\Event\EventDispatcherTrait;
+use Cake\Event\EventManager;
 use Cake\Utility\Inflector;
+use InvalidArgumentException;
 use RuntimeException;
 
 /**
  * Run CLI commands for the provided application.
  */
 class CommandRunner implements EventDispatcherInterface
 {
-    use EventDispatcherTrait;
+    /**
+     * Alias methods away so we can implement proxying methods.
+     */
+    use EventDispatcherTrait {
+        eventManager as private _eventManager;
+        getEventManager as private _getEventManager;
+        setEventManager as private _setEventManager;
+    }
 
     /**
      * The application console commands are being run for.
@@ -64,7 +73,7 @@ class CommandRunner implements EventDispatcherInterface
      */
     public function __construct(ConsoleApplicationInterface $app, $root = 'cake')
     {
-        $this->setApp($app);
+        $this->app = $app;
         $this->root = $root;
         $this->aliases = [
             '--version' => 'version',
@@ -96,23 +105,6 @@ public function setAliases(array $aliases)
         return $this;
     }
 
-    /**
-     * Set the application.
-     *
-     * @param \Cake\Core\ConsoleApplicationInterface $app The application to run CLI commands for.
-     * @return $this
-     */
-    public function setApp(ConsoleApplicationInterface $app)
-    {
-        $this->app = $app;
-
-        if ($app instanceof EventDispatcherInterface) {
-            $this->setEventManager($app->getEventManager());
-        }
-
-        return $this;
-    }
-
     /**
      * Run the command contained in $argv.
      *
@@ -137,6 +129,10 @@ public function run(array $argv, ConsoleIo $io = null)
             'help' => HelpCommand::class,
         ]);
         $commands = $this->app->console($commands);
+        if ($this->app instanceof PluginApplicationInterface) {
+            $commands = $this->app->pluginConsole($commands);
+        }
+
         if (!($commands instanceof CommandCollection)) {
             $type = getTypeName($commands);
             throw new RuntimeException(
@@ -178,18 +174,75 @@ public function run(array $argv, ConsoleIo $io = null)
      * Application bootstrap wrapper.
      *
      * Calls `bootstrap()` and `events()` if application implements `EventApplicationInterface`.
+     * After the application is bootstrapped and events are attached, plugins are bootstrapped
+     * and have their events attached.
      *
      * @return void
      */
     protected function bootstrap()
     {
         $this->app->bootstrap();
-        if ($this->app instanceof EventApplicationInterface) {
-            $eventManager = $this->app->events($this->getEventManager());
-            $this->setEventManager($eventManager);
+        if ($this->app instanceof PluginApplicationInterface) {
+            $this->app->pluginBootstrap();
+
+            $events = $this->app->getEventManager();
+            $events = $this->app->events($events);
+            $events = $this->app->pluginEvents($events);
+            $this->app->setEventManager($events);
         }
     }
 
+    /**
+     * Get the application's event manager or the global one.
+     *
+     * @return \Cake\Event\EventManagerInterface
+     */
+    public function getEventManager()
+    {
+        if ($this->app instanceof PluginApplicationInterface) {
+            return $this->app->getEventManager();
+        }
+
+        return EventManager::instance();
+    }
+
+    /**
+     * Get/set the application's event manager.
+     *
+     * If the application does not support events and this method is used as
+     * a setter, an exception will be raised.
+     *
+     * @param \Cake\Event\EventManagerInterface $events The event manager to set.
+     * @return \Cake\Event\EventManagerInterface|$this
+     * @deprecated Will be removed in 4.0
+     */
+    public function eventManager(EventManager $events = null)
+    {
+        if ($eventManager === null) {
+            return $this->getEventManager();
+        }
+
+        return $this->setEventManager($events);
+    }
+
+    /**
+     * Get/set the application's event manager.
+     *
+     * If the application does not support events and this method is used as
+     * a setter, an exception will be raised.
+     *
+     * @param \Cake\Event\EventManagerInterface $events The event manager to set.
+     * @return $this
+     */
+    public function setEventManager(EventManager $events)
+    {
+        if ($this->app instanceof PluginApplicationInterface) {
+            return $this->app->setEventManager($events);
+        }
+
+        throw new InvalidArgumentException('Cannot set the event manager, the application does not support events.');
+    }
+
     /**
      * Get the shell instance for a given command name
      *