Run events hook after bootstrap both in CLI and web.

cakephp · Feb 12, 2018 · d465251 · d465251
1 parent 970ea1e
commit d465251
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 81 deletions.
diff --git a/src/Console/CommandRunner.php b/src/Console/CommandRunner.php
@@ -117,11 +117,7 @@ public function setAliases(array $aliases)
      */
     public function run(array $argv, ConsoleIo $io = null)
     {
-        $this->app->bootstrap();
-        if ($this->app instanceof EventApplicationInterface) {
-            $eventManager = $this->app->events($this->getEventManager());
-            $this->setEventManager($eventManager);
-        }
+        $this->bootstrap();
 
         $commands = new CommandCollection([
             'version' => VersionCommand::class,
@@ -165,6 +161,22 @@ public function run(array $argv, ConsoleIo $io = null)
         return Shell::CODE_ERROR;
     }
 
+    /**
+     * Application bootstrap wrapper.
+     *
+     * Calls `bootstrap()` and `events()` if application implements `EventApplicationInterface`.
+     *
+     * @return void
+     */
+    protected function bootstrap()
+    {
+        $this->app->bootstrap();
+        if ($this->app instanceof EventApplicationInterface) {
+            $eventManager = $this->app->events($this->getEventManager());
+            $this->setEventManager($eventManager);
+        }
+    }
+
     /**
      * Get the shell instance for a given command name
      *

diff --git a/src/Event/Middleware/EventMiddleware.php b/src/Event/Middleware/EventMiddleware.php
diff --git a/src/Http/Server.php b/src/Http/Server.php
@@ -15,6 +15,8 @@
 namespace Cake\Http;
 
 use Cake\Core\HttpApplicationInterface;
+use Cake\Event\EventApplicationInterface;
+use Cake\Event\EventDispatcherInterface;
 use Cake\Event\EventDispatcherTrait;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
@@ -24,7 +26,7 @@
 /**
  * Runs an application invoking all the PSR7 middleware and the registered application.
  */
-class Server
+class Server implements EventDispatcherInterface
 {
 
     use EventDispatcherTrait;
@@ -68,7 +70,8 @@ public function __construct(HttpApplicationInterface $app)
      */
     public function run(ServerRequestInterface $request = null, ResponseInterface $response = null)
     {
-        $this->app->bootstrap();
+        $this->bootstrap();
+
         $response = $response ?: new Response();
         $request = $request ?: ServerRequestFactory::fromGlobals();
 
@@ -90,6 +93,22 @@ public function run(ServerRequestInterface $request = null, ResponseInterface $r
         return $response;
     }
 
+    /**
+     * Application bootstrap wrapper.
+     *
+     * Calls `bootstrap()` and `events()` if application implements `EventApplicationInterface`.
+     *
+     * @return void
+     */
+    protected function bootstrap()
+    {
+        $this->app->bootstrap();
+        if ($this->app instanceof EventApplicationInterface) {
+            $eventManager = $this->app->events($this->getEventManager());
+            $this->setEventManager($eventManager);
+        }
+    }
+
     /**
      * Emit the response using the PHP SAPI.
      *