From 0a19ca5e19da81f20250678d1f66a88db4c04aca Mon Sep 17 00:00:00 2001
From: Toby Zerner <toby.zerner@gmail.com>
Date: Thu, 13 Aug 2015 12:55:48 +0930
Subject: [PATCH] New listen API
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Event subscriptions now take place before *any* boot method is called.
This ensures that all event listeners are registered before things
happen – e.g. locales are registered before the translator is
instantiated in the Tags extension's boot method.
---
 framework/core/src/Support/Extension.php        |  5 +++++
 .../src/Support/ExtensionsServiceProvider.php   |  6 ++++++
 .../core/stubs/extension/src/Extension.php      | 17 +----------------
 3 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/framework/core/src/Support/Extension.php b/framework/core/src/Support/Extension.php
index 2d065bf3f..4016cc09e 100644
--- a/framework/core/src/Support/Extension.php
+++ b/framework/core/src/Support/Extension.php
@@ -1,6 +1,7 @@
 <?php namespace Flarum\Support;
 
 use Flarum\Support\ServiceProvider;
+use Illuminate\Events\Dispatcher;
 
 class Extension extends ServiceProvider
 {
@@ -11,4 +12,8 @@ class Extension extends ServiceProvider
     public function uninstall()
     {
     }
+
+    public function listen(Dispatcher $events)
+    {
+    }
 }
diff --git a/framework/core/src/Support/ExtensionsServiceProvider.php b/framework/core/src/Support/ExtensionsServiceProvider.php
index b6ef54290..7834d9ab3 100644
--- a/framework/core/src/Support/ExtensionsServiceProvider.php
+++ b/framework/core/src/Support/ExtensionsServiceProvider.php
@@ -21,5 +21,11 @@ class ExtensionsServiceProvider extends ServiceProvider
                 $providers[$extension] = $this->app->register($providerName);
             }
         }
+
+        $events = $this->app->make('events');
+
+        foreach ($providers as $provider) {
+            $provider->listen($events);
+        }
     }
 }
diff --git a/framework/core/stubs/extension/src/Extension.php b/framework/core/stubs/extension/src/Extension.php
index 17c459e0f..83f95a156 100644
--- a/framework/core/stubs/extension/src/Extension.php
+++ b/framework/core/stubs/extension/src/Extension.php
@@ -5,23 +5,8 @@ use Illuminate\Events\Dispatcher;
 
 class Extension extends BaseExtension
 {
-    /**
-     * Bootstrap the application events.
-     *
-     * @return void
-     */
-    public function boot(Dispatcher $events)
+    public function listen(Dispatcher $events)
     {
         $events->subscribe('{{namespace}}\Listeners\AddClientAssets');
     }
-
-    /**
-     * Register the service provider.
-     *
-     * @return void
-     */
-    public function register()
-    {
-        //
-    }
 }