From 3b030db1737ab5276e62f24c28dfea979355ad7a Mon Sep 17 00:00:00 2001
From: Franz Liedke <franz@develophp.org>
Date: Wed, 3 Jan 2018 08:00:00 +0100
Subject: [PATCH] Use new extenders for bootstrapping

---
 extensions/bbcode/bootstrap.php               | 26 ++++++++--
 extensions/bbcode/composer.json               |  5 --
 .../bbcode/src/Listener/FormatBBCode.php      | 48 -------------------
 3 files changed, 21 insertions(+), 58 deletions(-)
 delete mode 100644 extensions/bbcode/src/Listener/FormatBBCode.php

diff --git a/extensions/bbcode/bootstrap.php b/extensions/bbcode/bootstrap.php
index c4e50e795..ef0368b98 100644
--- a/extensions/bbcode/bootstrap.php
+++ b/extensions/bbcode/bootstrap.php
@@ -9,9 +9,25 @@
  * file that was distributed with this source code.
  */
 
-use Flarum\BBCode\Listener;
-use Illuminate\Contracts\Events\Dispatcher;
+use Flarum\Extend;
+use s9e\TextFormatter\Configurator;
 
-return function (Dispatcher $events) {
-    $events->subscribe(Listener\FormatBBCode::class);
-};
+return [
+    new Extend\FormatterConfiguration(function (Configurator $config) {
+        $config->BBCodes->addFromRepository('B');
+        $config->BBCodes->addFromRepository('I');
+        $config->BBCodes->addFromRepository('U');
+        $config->BBCodes->addFromRepository('S');
+        $config->BBCodes->addFromRepository('URL');
+        $config->BBCodes->addFromRepository('IMG');
+        $config->BBCodes->addFromRepository('EMAIL');
+        $config->BBCodes->addFromRepository('CODE');
+        $config->BBCodes->addFromRepository('QUOTE');
+        $config->BBCodes->addFromRepository('LIST');
+        $config->BBCodes->addFromRepository('DEL');
+        $config->BBCodes->addFromRepository('COLOR');
+        $config->BBCodes->addFromRepository('CENTER');
+        $config->BBCodes->addFromRepository('SIZE');
+        $config->BBCodes->addFromRepository('*');
+    })
+];
diff --git a/extensions/bbcode/composer.json b/extensions/bbcode/composer.json
index a138c8afd..ebf3f65da 100644
--- a/extensions/bbcode/composer.json
+++ b/extensions/bbcode/composer.json
@@ -17,11 +17,6 @@
     "require": {
         "flarum/core": "^0.1.0-beta.6"
     },
-    "autoload": {
-        "psr-4": {
-            "Flarum\\BBCode\\": "src/"
-        }
-    },
     "extra": {
         "branch-alias": {
             "dev-master": "0.1.x-dev"
diff --git a/extensions/bbcode/src/Listener/FormatBBCode.php b/extensions/bbcode/src/Listener/FormatBBCode.php
deleted file mode 100644
index 58d39a41e..000000000
--- a/extensions/bbcode/src/Listener/FormatBBCode.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-
-/*
- * This file is part of Flarum.
- *
- * (c) Toby Zerner <toby.zerner@gmail.com>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-namespace Flarum\BBCode\Listener;
-
-use Flarum\Formatter\Event\Configuring;
-use Illuminate\Contracts\Events\Dispatcher;
-
-class FormatBBCode
-{
-    /**
-     * @param Dispatcher $events
-     */
-    public function subscribe(Dispatcher $events)
-    {
-        $events->listen(Configuring::class, [$this, 'addBBCodeFormatter']);
-    }
-
-    /**
-     * @param Configuring $event
-     */
-    public function addBBCodeFormatter(Configuring $event)
-    {
-        $event->configurator->BBCodes->addFromRepository('B');
-        $event->configurator->BBCodes->addFromRepository('I');
-        $event->configurator->BBCodes->addFromRepository('U');
-        $event->configurator->BBCodes->addFromRepository('S');
-        $event->configurator->BBCodes->addFromRepository('URL');
-        $event->configurator->BBCodes->addFromRepository('IMG');
-        $event->configurator->BBCodes->addFromRepository('EMAIL');
-        $event->configurator->BBCodes->addFromRepository('CODE');
-        $event->configurator->BBCodes->addFromRepository('QUOTE');
-        $event->configurator->BBCodes->addFromRepository('LIST');
-        $event->configurator->BBCodes->addFromRepository('DEL');
-        $event->configurator->BBCodes->addFromRepository('COLOR');
-        $event->configurator->BBCodes->addFromRepository('CENTER');
-        $event->configurator->BBCodes->addFromRepository('SIZE');
-        $event->configurator->BBCodes->addFromRepository('*');
-    }
-}