From f96ef339735addef45e170b5c2a71aa2c293fcee Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Fri, 2 Oct 2015 17:54:53 +0930 Subject: [PATCH] Remove ability for extensions to register a service provider The concept of returning a bootstrapper function is simpler and the use of service providers had no advantage over it. --- .../core/src/Support/ExtensionsServiceProvider.php | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/framework/core/src/Support/ExtensionsServiceProvider.php b/framework/core/src/Support/ExtensionsServiceProvider.php index 9b89b4eb6..eee00e028 100644 --- a/framework/core/src/Support/ExtensionsServiceProvider.php +++ b/framework/core/src/Support/ExtensionsServiceProvider.php @@ -24,17 +24,11 @@ class ExtensionsServiceProvider extends ServiceProvider $config = $this->app->make('Flarum\Core\Settings\SettingsRepository')->get('extensions_enabled'); $extensions = json_decode($config, true); - $events = $this->app->make('events'); - foreach ($extensions as $extension) { if (file_exists($file = public_path().'/extensions/'.$extension.'/bootstrap.php')) { - $provider = require $file; + $bootstrapper = require $file; - if (is_string($provider)) { - $this->app->register($provider)->listen($events); - } elseif (is_callable($provider)) { - $provider($events); - } + $bootstrapper($this->app); } } }