From a8c43097d7fb7a46b33db751011221d420dcb523 Mon Sep 17 00:00:00 2001 From: Franz Liedke Date: Sun, 1 Oct 2017 19:55:07 +0200 Subject: [PATCH] Update namespaces for beta 8 Refs flarum/core#1235. --- ...2017_07_22_000000_add_default_permissions.php | 2 +- .../sticky/src/Event/DiscussionWasStickied.php | 4 ++-- .../sticky/src/Event/DiscussionWasUnstickied.php | 4 ++-- .../sticky/src/Listener/AddApiAttributes.php | 16 ++++++++-------- .../sticky/src/Listener/AddClientAssets.php | 8 ++++---- .../CreatePostWhenDiscussionIsStickied.php | 4 ++-- .../src/Listener/PinStickiedDiscussionsToTop.php | 8 ++++---- .../sticky/src/Listener/SaveStickyToDatabase.php | 10 +++++----- .../sticky/src/Post/DiscussionStickiedPost.php | 6 +++--- 9 files changed, 31 insertions(+), 31 deletions(-) diff --git a/extensions/sticky/migrations/2017_07_22_000000_add_default_permissions.php b/extensions/sticky/migrations/2017_07_22_000000_add_default_permissions.php index 870b06da5..98ffb1ecd 100644 --- a/extensions/sticky/migrations/2017_07_22_000000_add_default_permissions.php +++ b/extensions/sticky/migrations/2017_07_22_000000_add_default_permissions.php @@ -9,8 +9,8 @@ * file that was distributed with this source code. */ -use Flarum\Core\Group; use Flarum\Database\Migration; +use Flarum\Group\Group; return Migration::addPermissions([ 'discussion.sticky' => Group::MODERATOR_ID diff --git a/extensions/sticky/src/Event/DiscussionWasStickied.php b/extensions/sticky/src/Event/DiscussionWasStickied.php index 0eeb7cca2..e7b178685 100644 --- a/extensions/sticky/src/Event/DiscussionWasStickied.php +++ b/extensions/sticky/src/Event/DiscussionWasStickied.php @@ -11,8 +11,8 @@ namespace Flarum\Sticky\Event; -use Flarum\Core\Discussion; -use Flarum\Core\User; +use Flarum\Discussion\Discussion; +use Flarum\User\User; class DiscussionWasStickied { diff --git a/extensions/sticky/src/Event/DiscussionWasUnstickied.php b/extensions/sticky/src/Event/DiscussionWasUnstickied.php index eab4d2fcd..80be3b324 100644 --- a/extensions/sticky/src/Event/DiscussionWasUnstickied.php +++ b/extensions/sticky/src/Event/DiscussionWasUnstickied.php @@ -11,8 +11,8 @@ namespace Flarum\Sticky\Event; -use Flarum\Core\Discussion; -use Flarum\Core\User; +use Flarum\Discussion\Discussion; +use Flarum\User\User; class DiscussionWasUnstickied { diff --git a/extensions/sticky/src/Listener/AddApiAttributes.php b/extensions/sticky/src/Listener/AddApiAttributes.php index ba559f655..76c1b26b0 100755 --- a/extensions/sticky/src/Listener/AddApiAttributes.php +++ b/extensions/sticky/src/Listener/AddApiAttributes.php @@ -12,9 +12,9 @@ namespace Flarum\Sticky\Listener; use Flarum\Api\Controller\ListDiscussionsController; +use Flarum\Api\Event\Serializing; +use Flarum\Api\Event\WillGetData; use Flarum\Api\Serializer\DiscussionSerializer; -use Flarum\Event\ConfigureApiController; -use Flarum\Event\PrepareApiAttributes; use Illuminate\Contracts\Events\Dispatcher; class AddApiAttributes @@ -24,14 +24,14 @@ class AddApiAttributes */ public function subscribe(Dispatcher $events) { - $events->listen(PrepareApiAttributes::class, [$this, 'prepareApiAttributes']); - $events->listen(ConfigureApiController::class, [$this, 'includeStartPost']); + $events->listen(Serializing::class, [$this, 'prepareApiAttributes']); + $events->listen(WillGetData::class, [$this, 'includeStartPost']); } /** - * @param PrepareApiAttributes $event + * @param Serializing $event */ - public function prepareApiAttributes(PrepareApiAttributes $event) + public function prepareApiAttributes(Serializing $event) { if ($event->isSerializer(DiscussionSerializer::class)) { $event->attributes['isSticky'] = (bool) $event->model->is_sticky; @@ -40,9 +40,9 @@ class AddApiAttributes } /** - * @param ConfigureApiController $event + * @param WillGetData $event */ - public function includeStartPost(ConfigureApiController $event) + public function includeStartPost(WillGetData $event) { if ($event->isController(ListDiscussionsController::class)) { $event->addInclude('startPost'); diff --git a/extensions/sticky/src/Listener/AddClientAssets.php b/extensions/sticky/src/Listener/AddClientAssets.php index 40a3d0812..2fd1f3981 100755 --- a/extensions/sticky/src/Listener/AddClientAssets.php +++ b/extensions/sticky/src/Listener/AddClientAssets.php @@ -11,7 +11,7 @@ namespace Flarum\Sticky\Listener; -use Flarum\Event\ConfigureWebApp; +use Flarum\Frontend\Event\Rendering; use Illuminate\Contracts\Events\Dispatcher; class AddClientAssets @@ -21,13 +21,13 @@ class AddClientAssets */ public function subscribe(Dispatcher $events) { - $events->listen(ConfigureWebApp::class, [$this, 'addAssets']); + $events->listen(Rendering::class, [$this, 'addAssets']); } /** - * @param ConfigureClientView $event + * @param Rendering $event */ - public function addAssets(ConfigureWebApp $event) + public function addAssets(Rendering $event) { if ($event->isForum()) { $event->addAssets([ diff --git a/extensions/sticky/src/Listener/CreatePostWhenDiscussionIsStickied.php b/extensions/sticky/src/Listener/CreatePostWhenDiscussionIsStickied.php index 91485d45c..ae2c06548 100755 --- a/extensions/sticky/src/Listener/CreatePostWhenDiscussionIsStickied.php +++ b/extensions/sticky/src/Listener/CreatePostWhenDiscussionIsStickied.php @@ -11,12 +11,12 @@ namespace Flarum\Sticky\Listener; -use Flarum\Core\Discussion; -use Flarum\Core\User; +use Flarum\Discussion\Discussion; use Flarum\Event\ConfigurePostTypes; use Flarum\Sticky\Event\DiscussionWasStickied; use Flarum\Sticky\Event\DiscussionWasUnstickied; use Flarum\Sticky\Post\DiscussionStickiedPost; +use Flarum\User\User; use Illuminate\Contracts\Events\Dispatcher; class CreatePostWhenDiscussionIsStickied diff --git a/extensions/sticky/src/Listener/PinStickiedDiscussionsToTop.php b/extensions/sticky/src/Listener/PinStickiedDiscussionsToTop.php index 74352c79e..e7b4da985 100755 --- a/extensions/sticky/src/Listener/PinStickiedDiscussionsToTop.php +++ b/extensions/sticky/src/Listener/PinStickiedDiscussionsToTop.php @@ -11,8 +11,8 @@ namespace Flarum\Sticky\Listener; +use Flarum\Discussion\Event\Searching; use Flarum\Event\ConfigureDiscussionGambits; -use Flarum\Event\ConfigureDiscussionSearch; use Flarum\Sticky\Gambit\StickyGambit; use Flarum\Tags\Gambit\TagGambit; use Illuminate\Contracts\Events\Dispatcher; @@ -25,7 +25,7 @@ class PinStickiedDiscussionsToTop public function subscribe(Dispatcher $events) { $events->listen(ConfigureDiscussionGambits::class, [$this, 'addStickyGambit']); - $events->listen(ConfigureDiscussionSearch::class, [$this, 'reorderSearch']); + $events->listen(Searching::class, [$this, 'reorderSearch']); } /** @@ -37,9 +37,9 @@ class PinStickiedDiscussionsToTop } /** - * @param ConfigureDiscussionSearch $event + * @param Searching $event */ - public function reorderSearch(ConfigureDiscussionSearch $event) + public function reorderSearch(Searching $event) { if ($event->criteria->sort === null) { $search = $event->search; diff --git a/extensions/sticky/src/Listener/SaveStickyToDatabase.php b/extensions/sticky/src/Listener/SaveStickyToDatabase.php index 836a00a0c..19b37673c 100755 --- a/extensions/sticky/src/Listener/SaveStickyToDatabase.php +++ b/extensions/sticky/src/Listener/SaveStickyToDatabase.php @@ -11,10 +11,10 @@ namespace Flarum\Sticky\Listener; -use Flarum\Core\Access\AssertPermissionTrait; -use Flarum\Event\DiscussionWillBeSaved; +use Flarum\Discussion\Event\Saving; use Flarum\Sticky\Event\DiscussionWasStickied; use Flarum\Sticky\Event\DiscussionWasUnstickied; +use Flarum\User\AssertPermissionTrait; use Illuminate\Contracts\Events\Dispatcher; class SaveStickyToDatabase @@ -26,13 +26,13 @@ class SaveStickyToDatabase */ public function subscribe(Dispatcher $events) { - $events->listen(DiscussionWillBeSaved::class, [$this, 'whenDiscussionWillBeSaved']); + $events->listen(Saving::class, [$this, 'whenSaving']); } /** - * @param DiscussionWillBeSaved $event + * @param Saving $event */ - public function whenDiscussionWillBeSaved(DiscussionWillBeSaved $event) + public function whenSaving(Saving $event) { if (isset($event->data['attributes']['isSticky'])) { $isSticky = (bool) $event->data['attributes']['isSticky']; diff --git a/extensions/sticky/src/Post/DiscussionStickiedPost.php b/extensions/sticky/src/Post/DiscussionStickiedPost.php index 0ad5cabb5..22be30851 100755 --- a/extensions/sticky/src/Post/DiscussionStickiedPost.php +++ b/extensions/sticky/src/Post/DiscussionStickiedPost.php @@ -11,9 +11,9 @@ namespace Flarum\Sticky\Post; -use Flarum\Core\Post; -use Flarum\Core\Post\AbstractEventPost; -use Flarum\Core\Post\MergeableInterface; +use Flarum\Post\Post; +use Flarum\Post\Post\AbstractEventPost; +use Flarum\Post\Post\MergeableInterface; class DiscussionStickiedPost extends AbstractEventPost implements MergeableInterface {