From a0e9548d51cfe6bfc6983555e40135855fb992d5 Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Thu, 14 Sep 2017 09:06:29 +0930 Subject: [PATCH] =?UTF-8?q?Revert=20"run=20the=20convert.sh=20script=20by?= =?UTF-8?q?=20CDK2020=20to=20replace=20namespaces=20to=20be=20comp?= =?UTF-8?q?=E2=80=A6=20(#8)"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 80f08dcf195f902b12720efe491100bf0e12fc26. --- .../2017_07_22_000000_add_default_permissions.php | 2 +- src/Access/TagPolicy.php | 4 ++-- src/Event/PostWasApproved.php | 4 ++-- src/Listener/AddClientAssets.php | 8 ++++---- src/Listener/AddPostApprovalAttributes.php | 14 +++++++------- src/Listener/ApproveContent.php | 10 +++++----- src/Listener/HideUnapprovedContent.php | 2 +- src/Listener/UnapproveNewContent.php | 10 +++++----- 8 files changed, 27 insertions(+), 27 deletions(-) diff --git a/migrations/2017_07_22_000000_add_default_permissions.php b/migrations/2017_07_22_000000_add_default_permissions.php index 7cee62e..9e364d8 100644 --- a/migrations/2017_07_22_000000_add_default_permissions.php +++ b/migrations/2017_07_22_000000_add_default_permissions.php @@ -9,7 +9,7 @@ * file that was distributed with this source code. */ -use Flarum\Group\Group; +use Flarum\Core\Group; use Flarum\Database\Migration; return Migration::addPermissions([ diff --git a/src/Access/TagPolicy.php b/src/Access/TagPolicy.php index a796c0b..30e85a4 100755 --- a/src/Access/TagPolicy.php +++ b/src/Access/TagPolicy.php @@ -11,8 +11,8 @@ namespace Flarum\Approval\Access; -use Flarum\User\AbstractPolicy; -use Flarum\User\User; +use Flarum\Core\Access\AbstractPolicy; +use Flarum\Core\User; use Flarum\Tags\Tag; class TagPolicy extends AbstractPolicy diff --git a/src/Event/PostWasApproved.php b/src/Event/PostWasApproved.php index a726b24..0d42e82 100644 --- a/src/Event/PostWasApproved.php +++ b/src/Event/PostWasApproved.php @@ -11,8 +11,8 @@ namespace Flarum\Approval\Event; -use Flarum\Post\Post; -use Flarum\User\User; +use Flarum\Core\Post; +use Flarum\Core\User; class PostWasApproved { diff --git a/src/Listener/AddClientAssets.php b/src/Listener/AddClientAssets.php index 96243d6..aa96af1 100644 --- a/src/Listener/AddClientAssets.php +++ b/src/Listener/AddClientAssets.php @@ -11,7 +11,7 @@ namespace Flarum\Approval\Listener; -use Flarum\Frontend\Event\Rendering; +use Flarum\Event\ConfigureWebApp; use Illuminate\Contracts\Events\Dispatcher; class AddClientAssets @@ -21,13 +21,13 @@ class AddClientAssets */ public function subscribe(Dispatcher $events) { - $events->listen(Rendering::class, [$this, 'addAssets']); + $events->listen(ConfigureWebApp::class, [$this, 'addAssets']); } /** - * @param Rendering $event + * @param ConfigureClientView $event */ - public function addAssets(Rendering $event) + public function addAssets(ConfigureWebApp $event) { if ($event->isForum()) { $event->addAssets([ diff --git a/src/Listener/AddPostApprovalAttributes.php b/src/Listener/AddPostApprovalAttributes.php index fbb3ecd..62908fd 100644 --- a/src/Listener/AddPostApprovalAttributes.php +++ b/src/Listener/AddPostApprovalAttributes.php @@ -11,10 +11,10 @@ namespace Flarum\Approval\Listener; -use Flarum\Api\Serializer\BasicDiscussionSerializer; -use Flarum\Api\Serializer\BasicPostSerializer; +use Flarum\Api\Serializer\DiscussionBasicSerializer; +use Flarum\Api\Serializer\PostBasicSerializer; use Flarum\Api\Serializer\PostSerializer; -use Flarum\Api\Event\Serializing; +use Flarum\Event\PrepareApiAttributes; use Illuminate\Contracts\Events\Dispatcher; class AddPostApprovalAttributes @@ -24,15 +24,15 @@ class AddPostApprovalAttributes */ public function subscribe(Dispatcher $events) { - $events->listen(Serializing::class, [$this, 'addApiAttributes']); + $events->listen(PrepareApiAttributes::class, [$this, 'addApiAttributes']); } /** - * @param Serializing $event + * @param PrepareApiAttributes $event */ - public function addApiAttributes(Serializing $event) + public function addApiAttributes(PrepareApiAttributes $event) { - if ($event->isSerializer(BasicDiscussionSerializer::class) + if ($event->isSerializer(DiscussionBasicSerializer::class) || $event->isSerializer(PostBasicSerializer::class)) { $event->attributes['isApproved'] = (bool) $event->model->is_approved; } diff --git a/src/Listener/ApproveContent.php b/src/Listener/ApproveContent.php index cd0bf6b..29a78bd 100644 --- a/src/Listener/ApproveContent.php +++ b/src/Listener/ApproveContent.php @@ -12,8 +12,8 @@ namespace Flarum\Approval\Listener; use Flarum\Approval\Event\PostWasApproved; -use Flarum\User\AssertPermissionTrait; -use Flarum\Post\Event\Saving; +use Flarum\Core\Access\AssertPermissionTrait; +use Flarum\Event\PostWillBeSaved; use Illuminate\Contracts\Events\Dispatcher; class ApproveContent @@ -25,14 +25,14 @@ class ApproveContent */ public function subscribe(Dispatcher $events) { - $events->listen(Saving::class, [$this, 'approvePost']); + $events->listen(PostWillBeSaved::class, [$this, 'approvePost']); $events->listen(PostWasApproved::class, [$this, 'approveDiscussion']); } /** - * @param Saving $event + * @param PostWillBeSaved $event */ - public function approvePost(Saving $event) + public function approvePost(PostWillBeSaved $event) { $attributes = $event->data['attributes']; $post = $event->post; diff --git a/src/Listener/HideUnapprovedContent.php b/src/Listener/HideUnapprovedContent.php index 2a34916..71e44c4 100644 --- a/src/Listener/HideUnapprovedContent.php +++ b/src/Listener/HideUnapprovedContent.php @@ -11,7 +11,7 @@ namespace Flarum\Approval\Listener; -use Flarum\Discussion\Discussion; +use Flarum\Core\Discussion; use Flarum\Event\ScopeHiddenDiscussionVisibility; use Flarum\Event\ScopeModelVisibility; use Flarum\Event\ScopePostVisibility; diff --git a/src/Listener/UnapproveNewContent.php b/src/Listener/UnapproveNewContent.php index dcbcc10..6a08d69 100644 --- a/src/Listener/UnapproveNewContent.php +++ b/src/Listener/UnapproveNewContent.php @@ -11,9 +11,9 @@ namespace Flarum\Approval\Listener; -use Flarum\Post\Post; +use Flarum\Core\Post; use Flarum\Event\ConfigureModelDefaultAttributes; -use Flarum\Post\Event\Saving; +use Flarum\Event\PostWillBeSaved; use Flarum\Flags\Flag; use Illuminate\Contracts\Events\Dispatcher; @@ -25,7 +25,7 @@ class UnapproveNewContent public function subscribe(Dispatcher $events) { $events->listen(ConfigureModelDefaultAttributes::class, [$this, 'approveByDefault']); - $events->listen(Saving::class, [$this, 'unapproveNewPosts']); + $events->listen(PostWillBeSaved::class, [$this, 'unapproveNewPosts']); } /** @@ -39,9 +39,9 @@ public function approveByDefault(ConfigureModelDefaultAttributes $event) } /** - * @param Saving $event + * @param PostWillBeSaved $event */ - public function unapproveNewPosts(Saving $event) + public function unapproveNewPosts(PostWillBeSaved $event) { $post = $event->post;