From ead3957c28a55849e706bfe77514d5ee0999f6d8 Mon Sep 17 00:00:00 2001
From: Franz Liedke <franz@develophp.org>
Date: Tue, 2 Jan 2018 22:37:28 +0100
Subject: [PATCH] Use new extenders for bootstrapping

---
 extensions/emoji/bootstrap.php                | 28 ++++++++---
 extensions/emoji/composer.json                |  5 --
 .../emoji/src/Listener/AddClientAssets.php    | 40 ----------------
 .../emoji/src/Listener/FormatEmoticons.php    | 46 -------------------
 4 files changed, 22 insertions(+), 97 deletions(-)
 delete mode 100644 extensions/emoji/src/Listener/AddClientAssets.php
 delete mode 100644 extensions/emoji/src/Listener/FormatEmoticons.php

diff --git a/extensions/emoji/bootstrap.php b/extensions/emoji/bootstrap.php
index b0ee184e2..bbfe37ba2 100644
--- a/extensions/emoji/bootstrap.php
+++ b/extensions/emoji/bootstrap.php
@@ -9,10 +9,26 @@
  * file that was distributed with this source code.
  */
 
-use Flarum\Emoji\Listener;
-use Illuminate\Contracts\Events\Dispatcher;
+use Flarum\Extend;
+use s9e\TextFormatter\Configurator;
 
-return function (Dispatcher $events) {
-    $events->subscribe(Listener\AddClientAssets::class);
-    $events->subscribe(Listener\FormatEmoticons::class);
-};
+return [
+    (new Extend\Assets('forum'))
+        ->defaultAssets(__DIR__)
+        ->bootstrapper('flarum/emoji/main'),
+    new Extend\FormatterConfiguration(function (Configurator $config) {
+        $config->Emoji->useEmojiOne();
+        $config->Emoji->omitImageSize();
+        $config->Emoji->useSVG();
+
+        $config->Emoji->addAlias(':)', '🙂');
+        $config->Emoji->addAlias(':D', '😃');
+        $config->Emoji->addAlias(':P', '😛');
+        $config->Emoji->addAlias(':(', '🙁');
+        $config->Emoji->addAlias(':|', '😐');
+        $config->Emoji->addAlias(';)', '😉');
+        $config->Emoji->addAlias(':\'(', '😢');
+        $config->Emoji->addAlias(':O', '😮');
+        $config->Emoji->addAlias('>:(', '😡');
+    })
+];
diff --git a/extensions/emoji/composer.json b/extensions/emoji/composer.json
index 64e67df10..f8e85db0b 100644
--- a/extensions/emoji/composer.json
+++ b/extensions/emoji/composer.json
@@ -17,11 +17,6 @@
     "require": {
         "flarum/core": "^0.1.0-beta.6"
     },
-    "autoload": {
-        "psr-4": {
-            "Flarum\\Emoji\\": "src/"
-        }
-    },
     "extra": {
         "branch-alias": {
             "dev-master": "0.1.x-dev"
diff --git a/extensions/emoji/src/Listener/AddClientAssets.php b/extensions/emoji/src/Listener/AddClientAssets.php
deleted file mode 100644
index 52aabd3ed..000000000
--- a/extensions/emoji/src/Listener/AddClientAssets.php
+++ /dev/null
@@ -1,40 +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\Emoji\Listener;
-
-use Flarum\Frontend\Event\Rendering;
-use Illuminate\Contracts\Events\Dispatcher;
-
-class AddClientAssets
-{
-    /**
-     * @param Dispatcher $events
-     */
-    public function subscribe(Dispatcher $events)
-    {
-        $events->listen(Rendering::class, [$this, 'addAssets']);
-    }
-
-    /**
-     * @param Rendering $event
-     */
-    public function addAssets(Rendering $event)
-    {
-        if ($event->isForum()) {
-            $event->addAssets([
-                __DIR__.'/../../js/forum/dist/extension.js',
-                __DIR__.'/../../less/forum/extension.less'
-            ]);
-            $event->addBootstrapper('flarum/emoji/main');
-        }
-    }
-}
diff --git a/extensions/emoji/src/Listener/FormatEmoticons.php b/extensions/emoji/src/Listener/FormatEmoticons.php
deleted file mode 100644
index 125831c55..000000000
--- a/extensions/emoji/src/Listener/FormatEmoticons.php
+++ /dev/null
@@ -1,46 +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\Emoji\Listener;
-
-use Flarum\Formatter\Event\Configuring;
-use Illuminate\Contracts\Events\Dispatcher;
-
-class FormatEmoticons
-{
-    /**
-     * @param Dispatcher $events
-     */
-    public function subscribe(Dispatcher $events)
-    {
-        $events->listen(Configuring::class, [$this, 'addEmoticons']);
-    }
-
-    /**
-     * @param Configuring $event
-     */
-    public function addEmoticons(Configuring $event)
-    {
-        $event->configurator->Emoji->useEmojiOne();
-        $event->configurator->Emoji->omitImageSize();
-        $event->configurator->Emoji->useSVG();
-
-        $event->configurator->Emoji->addAlias(':)', '🙂');
-        $event->configurator->Emoji->addAlias(':D', '😃');
-        $event->configurator->Emoji->addAlias(':P', '😛');
-        $event->configurator->Emoji->addAlias(':(', '🙁');
-        $event->configurator->Emoji->addAlias(':|', '😐');
-        $event->configurator->Emoji->addAlias(';)', '😉');
-        $event->configurator->Emoji->addAlias(':\'(', '😢');
-        $event->configurator->Emoji->addAlias(':O', '😮');
-        $event->configurator->Emoji->addAlias('>:(', '😡');
-    }
-}