Use Extend\Event

extend.php

@@ -12,9 +12,11 @@
 
 namespace FoF\Split;
 
+use Flarum\Api\Event\Serializing;
 use Flarum\Discussion\Event\Renamed;
+use Flarum\Event\ConfigurePostTypes;
 use Flarum\Extend;
-use Illuminate\Contracts\Events\Dispatcher;
+use FoF\Split\Events\DiscussionWasSplit;
 
 return [
     (new Extend\Frontend('admin'))
@@ -29,10 +31,8 @@
         ->post('/split', 'fof.split.run', Api\Controllers\SplitController::class),
 
     (new Extend\Event())
-        ->listen(Renamed::class, Listeners\UpdateSplitTitleAfterDiscussionWasRenamed::class),
-
-    function (Dispatcher $events) {
-        $events->subscribe(Listeners\AddSplitApi::class);
-        $events->subscribe(Listeners\CreatePostWhenSplit::class);
-    },
+        ->listen(Renamed::class, Listeners\UpdateSplitTitleAfterDiscussionWasRenamed::class)
+        ->listen(Serializing::class, Listeners\AddSplitApi::class)
+        ->listen(ConfigurePostTypes::class, Listeners\AddPostType::class)
+        ->listen(DiscussionWasSplit::class, Listeners\CreatePostWhenSplit::class),
 ];

src/Listeners/AddPostType.php

@@ -0,0 +1,23 @@
+<?php
+
+/*
+ * This file is part of fof/split.
+ *
+ * Copyright (c) 2020 FriendsOfFlarum
+ *
+ * For the full copyright and license information, please view the LICENSE.md
+ * file that was distributed with this source code.
+ */
+
+namespace FoF\Split\Listeners;
+
+use Flarum\Event\ConfigurePostTypes;
+use FoF\Split\Posts\DiscussionSplitPost;
+
+class AddPostType
+{
+    public function handle(ConfigurePostTypes $event)
+    {
+        $event->add(DiscussionSplitPost::class);
+    }
+}

src/Listeners/AddSplitApi.php

@@ -14,36 +14,13 @@
 
 use Flarum\Api\Event\Serializing;
 use Flarum\Api\Serializer\DiscussionSerializer;
-use Flarum\Settings\SettingsRepositoryInterface;
-use Illuminate\Contracts\Events\Dispatcher;
 
 class AddSplitApi
 {
-    /**
-     * @var SettingsRepositoryInterface
-     */
-    protected $settings;
-
-    /**
-     * @param SettingsRepositoryInterface $settings
-     */
-    public function __construct(SettingsRepositoryInterface $settings)
-    {
-        $this->settings = $settings;
-    }
-
-    /**
-     * @param Dispatcher $events
-     */
-    public function subscribe(Dispatcher $events)
-    {
-        $events->listen(Serializing::class, [$this, 'prepareApiAttributes']);
-    }
-
     /**
      * @param Serializing $event
      */
-    public function prepareApiAttributes(Serializing $event)
+    public function handle(Serializing $event)
     {
         if ($event->isSerializer(DiscussionSerializer::class)) {
             $event->attributes['canSplit'] = $event->actor->can('split', $event->model);

src/Listeners/CreatePostWhenSplit.php

@@ -14,32 +14,13 @@
 
 use FoF\Split\Events\DiscussionWasSplit;
 use FoF\Split\Posts\DiscussionSplitPost;
-use Flarum\Event\ConfigurePostTypes;
-use Illuminate\Events\Dispatcher;
 
 class CreatePostWhenSplit
 {
-    /**
-     * @param Dispatcher $events
-     */
-    public function subscribe(Dispatcher $events)
-    {
-        $events->listen(ConfigurePostTypes::class, [$this, 'addPostType']);
-        $events->listen(DiscussionWasSplit::class, [$this, 'whenDiscussionWasSplit']);
-    }
-
-    /**
-     * @param ConfigurePostTypes $event
-     */
-    public function addPostType(ConfigurePostTypes $event)
-    {
-        $event->add(DiscussionSplitPost::class);
-    }
-
     /**
      * @param DiscussionWasSplit $event
      */
-    public function whenDiscussionWasSplit(DiscussionWasSplit $event)
+    public function handle(DiscussionWasSplit $event)
     {
         foreach (['to', 'from'] as $direction) {
             forward_static_call_array(