From 5c032cdd3a5c4f2ae192ce0c8d0c3d850930621f Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Thu, 14 Sep 2017 09:06:15 +0930 Subject: [PATCH] Revert "Apply fixes from StyleCI" This reverts commit 5ff45a8ea55819d2527a51d1f82394a6b3f687b4. --- .../2017_07_22_000000_add_default_permissions.php | 2 +- extensions/approval/src/Access/TagPolicy.php | 2 +- .../approval/src/Listener/AddPostApprovalAttributes.php | 3 ++- extensions/approval/src/Listener/ApproveContent.php | 2 +- extensions/approval/src/Listener/UnapproveNewContent.php | 6 +++--- 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/extensions/approval/migrations/2017_07_22_000000_add_default_permissions.php b/extensions/approval/migrations/2017_07_22_000000_add_default_permissions.php index aed5c090f..7cee62e41 100644 --- a/extensions/approval/migrations/2017_07_22_000000_add_default_permissions.php +++ b/extensions/approval/migrations/2017_07_22_000000_add_default_permissions.php @@ -9,8 +9,8 @@ * file that was distributed with this source code. */ -use Flarum\Database\Migration; use Flarum\Group\Group; +use Flarum\Database\Migration; return Migration::addPermissions([ 'discussion.startWithoutApproval' => Group::MEMBER_ID, diff --git a/extensions/approval/src/Access/TagPolicy.php b/extensions/approval/src/Access/TagPolicy.php index 01768b432..a796c0bef 100755 --- a/extensions/approval/src/Access/TagPolicy.php +++ b/extensions/approval/src/Access/TagPolicy.php @@ -11,9 +11,9 @@ namespace Flarum\Approval\Access; -use Flarum\Tags\Tag; use Flarum\User\AbstractPolicy; use Flarum\User\User; +use Flarum\Tags\Tag; class TagPolicy extends AbstractPolicy { diff --git a/extensions/approval/src/Listener/AddPostApprovalAttributes.php b/extensions/approval/src/Listener/AddPostApprovalAttributes.php index 18d4e0c81..fbb3ecd9d 100644 --- a/extensions/approval/src/Listener/AddPostApprovalAttributes.php +++ b/extensions/approval/src/Listener/AddPostApprovalAttributes.php @@ -11,9 +11,10 @@ namespace Flarum\Approval\Listener; -use Flarum\Api\Event\Serializing; use Flarum\Api\Serializer\BasicDiscussionSerializer; +use Flarum\Api\Serializer\BasicPostSerializer; use Flarum\Api\Serializer\PostSerializer; +use Flarum\Api\Event\Serializing; use Illuminate\Contracts\Events\Dispatcher; class AddPostApprovalAttributes diff --git a/extensions/approval/src/Listener/ApproveContent.php b/extensions/approval/src/Listener/ApproveContent.php index e6289e2a8..cd0bf6b16 100644 --- a/extensions/approval/src/Listener/ApproveContent.php +++ b/extensions/approval/src/Listener/ApproveContent.php @@ -12,8 +12,8 @@ namespace Flarum\Approval\Listener; use Flarum\Approval\Event\PostWasApproved; -use Flarum\Post\Event\Saving; use Flarum\User\AssertPermissionTrait; +use Flarum\Post\Event\Saving; use Illuminate\Contracts\Events\Dispatcher; class ApproveContent diff --git a/extensions/approval/src/Listener/UnapproveNewContent.php b/extensions/approval/src/Listener/UnapproveNewContent.php index b3a02b238..dcbcc10ea 100644 --- a/extensions/approval/src/Listener/UnapproveNewContent.php +++ b/extensions/approval/src/Listener/UnapproveNewContent.php @@ -11,10 +11,10 @@ namespace Flarum\Approval\Listener; -use Flarum\Event\ConfigureModelDefaultAttributes; -use Flarum\Flags\Flag; -use Flarum\Post\Event\Saving; use Flarum\Post\Post; +use Flarum\Event\ConfigureModelDefaultAttributes; +use Flarum\Post\Event\Saving; +use Flarum\Flags\Flag; use Illuminate\Contracts\Events\Dispatcher; class UnapproveNewContent