From 909870c381303dc956ce9c78511c466dd2b47f99 Mon Sep 17 00:00:00 2001 From: Franz Liedke Date: Sun, 1 Oct 2017 19:56:14 +0200 Subject: [PATCH] Update namespaces for beta 8 Refs flarum/core#1235. --- .../2017_07_22_000000_add_default_permissions.php | 2 +- extensions/lock/src/Access/DiscussionPolicy.php | 6 +++--- extensions/lock/src/Access/PostPolicy.php | 6 +++--- extensions/lock/src/Event/DiscussionWasLocked.php | 4 ++-- extensions/lock/src/Event/DiscussionWasUnlocked.php | 4 ++-- extensions/lock/src/Listener/AddClientAssets.php | 8 ++++---- .../src/Listener/AddDiscussionLockedAttributes.php | 8 ++++---- .../src/Listener/CreatePostWhenDiscussionIsLocked.php | 8 ++++---- extensions/lock/src/Listener/SaveLockedToDatabase.php | 10 +++++----- .../src/Notification/DiscussionLockedBlueprint.php | 4 ++-- extensions/lock/src/Post/DiscussionLockedPost.php | 6 +++--- 11 files changed, 33 insertions(+), 33 deletions(-) diff --git a/extensions/lock/migrations/2017_07_22_000000_add_default_permissions.php b/extensions/lock/migrations/2017_07_22_000000_add_default_permissions.php index 0ca499ee1..38b5f52ee 100644 --- a/extensions/lock/migrations/2017_07_22_000000_add_default_permissions.php +++ b/extensions/lock/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.lock' => Group::MODERATOR_ID diff --git a/extensions/lock/src/Access/DiscussionPolicy.php b/extensions/lock/src/Access/DiscussionPolicy.php index 560ca0704..6360aee41 100755 --- a/extensions/lock/src/Access/DiscussionPolicy.php +++ b/extensions/lock/src/Access/DiscussionPolicy.php @@ -11,9 +11,9 @@ namespace Flarum\Lock\Access; -use Flarum\Core\Access\AbstractPolicy; -use Flarum\Core\Discussion; -use Flarum\Core\User; +use Flarum\Discussion\Discussion; +use Flarum\User\AbstractPolicy; +use Flarum\User\User; class DiscussionPolicy extends AbstractPolicy { diff --git a/extensions/lock/src/Access/PostPolicy.php b/extensions/lock/src/Access/PostPolicy.php index 47e99ac7d..a73a55dfa 100755 --- a/extensions/lock/src/Access/PostPolicy.php +++ b/extensions/lock/src/Access/PostPolicy.php @@ -11,9 +11,9 @@ namespace Flarum\Lock\Access; -use Flarum\Core\Access\AbstractPolicy; -use Flarum\Core\Post; -use Flarum\Core\User; +use Flarum\Post\Post; +use Flarum\User\AbstractPolicy; +use Flarum\User\User; class PostPolicy extends AbstractPolicy { diff --git a/extensions/lock/src/Event/DiscussionWasLocked.php b/extensions/lock/src/Event/DiscussionWasLocked.php index f49c46d66..a9c0b5687 100644 --- a/extensions/lock/src/Event/DiscussionWasLocked.php +++ b/extensions/lock/src/Event/DiscussionWasLocked.php @@ -11,8 +11,8 @@ namespace Flarum\Lock\Event; -use Flarum\Core\Discussion; -use Flarum\Core\User; +use Flarum\Discussion\Discussion; +use Flarum\User\User; class DiscussionWasLocked { diff --git a/extensions/lock/src/Event/DiscussionWasUnlocked.php b/extensions/lock/src/Event/DiscussionWasUnlocked.php index 9940090c7..d439b6bfe 100644 --- a/extensions/lock/src/Event/DiscussionWasUnlocked.php +++ b/extensions/lock/src/Event/DiscussionWasUnlocked.php @@ -11,8 +11,8 @@ namespace Flarum\Lock\Event; -use Flarum\Core\Discussion; -use Flarum\Core\User; +use Flarum\Discussion\Discussion; +use Flarum\User\User; class DiscussionWasUnlocked { diff --git a/extensions/lock/src/Listener/AddClientAssets.php b/extensions/lock/src/Listener/AddClientAssets.php index 81e6fbda8..ee27641cd 100755 --- a/extensions/lock/src/Listener/AddClientAssets.php +++ b/extensions/lock/src/Listener/AddClientAssets.php @@ -11,7 +11,7 @@ namespace Flarum\Lock\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/lock/src/Listener/AddDiscussionLockedAttributes.php b/extensions/lock/src/Listener/AddDiscussionLockedAttributes.php index e0406b885..fbd189f5b 100755 --- a/extensions/lock/src/Listener/AddDiscussionLockedAttributes.php +++ b/extensions/lock/src/Listener/AddDiscussionLockedAttributes.php @@ -11,8 +11,8 @@ namespace Flarum\Lock\Listener; +use Flarum\Api\Event\Serializing; use Flarum\Api\Serializer\DiscussionSerializer; -use Flarum\Event\PrepareApiAttributes; use Illuminate\Contracts\Events\Dispatcher; class AddDiscussionLockedAttributes @@ -22,13 +22,13 @@ class AddDiscussionLockedAttributes */ public function subscribe(Dispatcher $events) { - $events->listen(PrepareApiAttributes::class, [$this, 'prepareApiAttributes']); + $events->listen(Serializing::class, [$this, 'prepareApiAttributes']); } /** - * @param PrepareApiAttributes $event + * @param Serializing $event */ - public function prepareApiAttributes(PrepareApiAttributes $event) + public function prepareApiAttributes(Serializing $event) { if ($event->isSerializer(DiscussionSerializer::class)) { $event->attributes['isLocked'] = (bool) $event->model->is_locked; diff --git a/extensions/lock/src/Listener/CreatePostWhenDiscussionIsLocked.php b/extensions/lock/src/Listener/CreatePostWhenDiscussionIsLocked.php index 82f186782..f2e13c617 100755 --- a/extensions/lock/src/Listener/CreatePostWhenDiscussionIsLocked.php +++ b/extensions/lock/src/Listener/CreatePostWhenDiscussionIsLocked.php @@ -11,16 +11,16 @@ namespace Flarum\Lock\Listener; -use Flarum\Api\Serializer\DiscussionBasicSerializer; -use Flarum\Core\Discussion; +use Flarum\Api\Serializer\BasicDiscussionSerializer; use Flarum\Core\Notification\NotificationSyncer; -use Flarum\Core\User; +use Flarum\Discussion\Discussion; use Flarum\Event\ConfigureNotificationTypes; use Flarum\Event\ConfigurePostTypes; use Flarum\Lock\Event\DiscussionWasLocked; use Flarum\Lock\Event\DiscussionWasUnlocked; use Flarum\Lock\Notification\DiscussionLockedBlueprint; use Flarum\Lock\Post\DiscussionLockedPost; +use Flarum\User\User; use Illuminate\Contracts\Events\Dispatcher; class CreatePostWhenDiscussionIsLocked @@ -62,7 +62,7 @@ class CreatePostWhenDiscussionIsLocked */ public function addNotificationType(ConfigureNotificationTypes $event) { - $event->add(DiscussionLockedBlueprint::class, DiscussionBasicSerializer::class, ['alert']); + $event->add(DiscussionLockedBlueprint::class, BasicDiscussionSerializer::class, ['alert']); } /** diff --git a/extensions/lock/src/Listener/SaveLockedToDatabase.php b/extensions/lock/src/Listener/SaveLockedToDatabase.php index 543ffc634..04bb90aa7 100755 --- a/extensions/lock/src/Listener/SaveLockedToDatabase.php +++ b/extensions/lock/src/Listener/SaveLockedToDatabase.php @@ -11,10 +11,10 @@ namespace Flarum\Lock\Listener; -use Flarum\Core\Access\AssertPermissionTrait; -use Flarum\Event\DiscussionWillBeSaved; +use Flarum\Discussion\Event\Saving; use Flarum\Lock\Event\DiscussionWasLocked; use Flarum\Lock\Event\DiscussionWasUnlocked; +use Flarum\User\AssertPermissionTrait; use Illuminate\Contracts\Events\Dispatcher; class SaveLockedToDatabase @@ -26,13 +26,13 @@ class SaveLockedToDatabase */ 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']['isLocked'])) { $isLocked = (bool) $event->data['attributes']['isLocked']; diff --git a/extensions/lock/src/Notification/DiscussionLockedBlueprint.php b/extensions/lock/src/Notification/DiscussionLockedBlueprint.php index 5808bd92c..ccbc3bcda 100644 --- a/extensions/lock/src/Notification/DiscussionLockedBlueprint.php +++ b/extensions/lock/src/Notification/DiscussionLockedBlueprint.php @@ -11,9 +11,9 @@ namespace Flarum\Lock\Notification; -use Flarum\Core\Discussion; -use Flarum\Core\Notification\BlueprintInterface; +use Flarum\Discussion\Discussion; use Flarum\Lock\Post\DiscussionLockedPost; +use Flarum\Notification\Blueprint\BlueprintInterface; class DiscussionLockedBlueprint implements BlueprintInterface { diff --git a/extensions/lock/src/Post/DiscussionLockedPost.php b/extensions/lock/src/Post/DiscussionLockedPost.php index 9ec84caf2..20ad4aec9 100755 --- a/extensions/lock/src/Post/DiscussionLockedPost.php +++ b/extensions/lock/src/Post/DiscussionLockedPost.php @@ -11,9 +11,9 @@ namespace Flarum\Lock\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 DiscussionLockedPost extends AbstractEventPost implements MergeableInterface {