From 918ca2201df9419d6af632f9f0090bc75207064d Mon Sep 17 00:00:00 2001
From: Franz Liedke <franz@develophp.org>
Date: Tue, 16 Jan 2018 23:18:41 +0100
Subject: [PATCH] Adapt new bootstrap format, use Asset extender

---
 extensions/lock/bootstrap.php                 | 26 ++++++----
 .../lock/src/Listener/AddClientAssets.php     | 47 -------------------
 2 files changed, 17 insertions(+), 56 deletions(-)
 delete mode 100755 extensions/lock/src/Listener/AddClientAssets.php

diff --git a/extensions/lock/bootstrap.php b/extensions/lock/bootstrap.php
index 6544ae40b..bb5c2c3a9 100644
--- a/extensions/lock/bootstrap.php
+++ b/extensions/lock/bootstrap.php
@@ -9,17 +9,25 @@
  * file that was distributed with this source code.
  */
 
+use Flarum\Extend;
 use Flarum\Lock\Access;
 use Flarum\Lock\Listener;
 use Illuminate\Contracts\Events\Dispatcher;
 
-return function (Dispatcher $events) {
-    $events->subscribe(Listener\AddClientAssets::class);
-    $events->subscribe(Listener\AddDiscussionLockedAttributes::class);
-    $events->subscribe(Listener\AddLockedGambit::class);
-    $events->subscribe(Listener\CreatePostWhenDiscussionIsLocked::class);
-    $events->subscribe(Listener\SaveLockedToDatabase::class);
+return [
+    (new Extend\Assets('forum'))
+        ->defaultAssets(__DIR__)
+        ->bootstrapper('flarum/lock/main'),
+    (new Extend\Assets('admin'))
+        ->asset(__DIR__.'/js/admin/dist/extension.js')
+        ->bootstrapper('flarum/lock/main'),
+    function (Dispatcher $events) {
+        $events->subscribe(Listener\AddDiscussionLockedAttributes::class);
+        $events->subscribe(Listener\AddLockedGambit::class);
+        $events->subscribe(Listener\CreatePostWhenDiscussionIsLocked::class);
+        $events->subscribe(Listener\SaveLockedToDatabase::class);
 
-    $events->subscribe(Access\DiscussionPolicy::class);
-    $events->subscribe(Access\PostPolicy::class);
-};
+        $events->subscribe(Access\DiscussionPolicy::class);
+        $events->subscribe(Access\PostPolicy::class);
+    },
+];
diff --git a/extensions/lock/src/Listener/AddClientAssets.php b/extensions/lock/src/Listener/AddClientAssets.php
deleted file mode 100755
index ee27641cd..000000000
--- a/extensions/lock/src/Listener/AddClientAssets.php
+++ /dev/null
@@ -1,47 +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\Lock\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/lock/main');
-        }
-
-        if ($event->isAdmin()) {
-            $event->addAssets([
-                __DIR__.'/../../js/admin/dist/extension.js'
-            ]);
-            $event->addBootstrapper('flarum/lock/main');
-        }
-    }
-}