From 494f953ace2f3db3215b23cd9c1327276d617655 Mon Sep 17 00:00:00 2001 From: Franz Liedke Date: Sun, 1 Oct 2017 19:56:38 +0200 Subject: [PATCH] Update namespaces for beta 8 Refs flarum/core#1235. --- ...7_07_22_000000_add_default_permissions.php | 2 +- .../src/Api/Serializer/FlagSerializer.php | 4 +-- extensions/flags/src/Command/CreateFlag.php | 2 +- .../flags/src/Command/CreateFlagHandler.php | 6 ++--- extensions/flags/src/Command/DeleteFlags.php | 2 +- .../flags/src/Command/DeleteFlagsHandler.php | 4 +-- .../flags/src/Event/FlagsWillBeDeleted.php | 4 +-- extensions/flags/src/Flag.php | 6 ++--- .../flags/src/Listener/AddClientAssets.php | 8 +++--- extensions/flags/src/Listener/AddFlagsApi.php | 10 +++---- .../src/Listener/AddPostFlagsRelationship.php | 26 +++++++++---------- 11 files changed, 37 insertions(+), 37 deletions(-) diff --git a/extensions/flags/migrations/2017_07_22_000000_add_default_permissions.php b/extensions/flags/migrations/2017_07_22_000000_add_default_permissions.php index b6c44fd2b..8bc1af6db 100644 --- a/extensions/flags/migrations/2017_07_22_000000_add_default_permissions.php +++ b/extensions/flags/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.flagPosts' => Group::MEMBER_ID, diff --git a/extensions/flags/src/Api/Serializer/FlagSerializer.php b/extensions/flags/src/Api/Serializer/FlagSerializer.php index 29cd63781..91eafb8b4 100644 --- a/extensions/flags/src/Api/Serializer/FlagSerializer.php +++ b/extensions/flags/src/Api/Serializer/FlagSerializer.php @@ -12,8 +12,8 @@ namespace Flarum\Flags\Api\Serializer; use Flarum\Api\Serializer\AbstractSerializer; +use Flarum\Api\Serializer\BasicUserSerializer; use Flarum\Api\Serializer\PostSerializer; -use Flarum\Api\Serializer\UserBasicSerializer; class FlagSerializer extends AbstractSerializer { @@ -48,6 +48,6 @@ class FlagSerializer extends AbstractSerializer */ protected function user($flag) { - return $this->hasOne($flag, UserBasicSerializer::class); + return $this->hasOne($flag, BasicUserSerializer::class); } } diff --git a/extensions/flags/src/Command/CreateFlag.php b/extensions/flags/src/Command/CreateFlag.php index 0418969f9..0c7c84d73 100644 --- a/extensions/flags/src/Command/CreateFlag.php +++ b/extensions/flags/src/Command/CreateFlag.php @@ -11,7 +11,7 @@ namespace Flarum\Flags\Command; -use Flarum\Core\User; +use Flarum\User\User; class CreateFlag { diff --git a/extensions/flags/src/Command/CreateFlagHandler.php b/extensions/flags/src/Command/CreateFlagHandler.php index ae22dfa1c..7e5b43b82 100644 --- a/extensions/flags/src/Command/CreateFlagHandler.php +++ b/extensions/flags/src/Command/CreateFlagHandler.php @@ -11,10 +11,10 @@ namespace Flarum\Flags\Command; -use Flarum\Core\Access\AssertPermissionTrait; -use Flarum\Core\Post\CommentPost; -use Flarum\Core\Repository\PostRepository; use Flarum\Flags\Flag; +use Flarum\Post\Post\CommentPost; +use Flarum\Post\PostRepository; +use Flarum\User\AssertPermissionTrait; use Tobscure\JsonApi\Exception\InvalidParameterException; class CreateFlagHandler diff --git a/extensions/flags/src/Command/DeleteFlags.php b/extensions/flags/src/Command/DeleteFlags.php index 454fefcb0..cbb0d30c7 100644 --- a/extensions/flags/src/Command/DeleteFlags.php +++ b/extensions/flags/src/Command/DeleteFlags.php @@ -11,7 +11,7 @@ namespace Flarum\Flags\Command; -use Flarum\Core\User; +use Flarum\User\User; class DeleteFlags { diff --git a/extensions/flags/src/Command/DeleteFlagsHandler.php b/extensions/flags/src/Command/DeleteFlagsHandler.php index 893269d98..176ca2533 100644 --- a/extensions/flags/src/Command/DeleteFlagsHandler.php +++ b/extensions/flags/src/Command/DeleteFlagsHandler.php @@ -11,10 +11,10 @@ namespace Flarum\Flags\Command; -use Flarum\Core\Access\AssertPermissionTrait; -use Flarum\Core\Repository\PostRepository; use Flarum\Flags\Event\FlagsWillBeDeleted; use Flarum\Flags\Flag; +use Flarum\Post\PostRepository; +use Flarum\User\AssertPermissionTrait; use Illuminate\Contracts\Events\Dispatcher; class DeleteFlagsHandler diff --git a/extensions/flags/src/Event/FlagsWillBeDeleted.php b/extensions/flags/src/Event/FlagsWillBeDeleted.php index a38884c8c..7d613c8ec 100644 --- a/extensions/flags/src/Event/FlagsWillBeDeleted.php +++ b/extensions/flags/src/Event/FlagsWillBeDeleted.php @@ -11,8 +11,8 @@ namespace Flarum\Flags\Event; -use Flarum\Core\Post; -use Flarum\Core\User; +use Flarum\Post\Post; +use Flarum\User\User; class FlagsWillBeDeleted { diff --git a/extensions/flags/src/Flag.php b/extensions/flags/src/Flag.php index e8ac9a6d6..5795418e3 100644 --- a/extensions/flags/src/Flag.php +++ b/extensions/flags/src/Flag.php @@ -11,10 +11,10 @@ namespace Flarum\Flags; -use Flarum\Core\Post; -use Flarum\Core\Support\ScopeVisibilityTrait; -use Flarum\Core\User; use Flarum\Database\AbstractModel; +use Flarum\Database\ScopeVisibilityTrait; +use Flarum\Post\Post; +use Flarum\User\User; class Flag extends AbstractModel { diff --git a/extensions/flags/src/Listener/AddClientAssets.php b/extensions/flags/src/Listener/AddClientAssets.php index 5d74a7cb3..047c9f530 100644 --- a/extensions/flags/src/Listener/AddClientAssets.php +++ b/extensions/flags/src/Listener/AddClientAssets.php @@ -11,7 +11,7 @@ namespace Flarum\Flags\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/flags/src/Listener/AddFlagsApi.php b/extensions/flags/src/Listener/AddFlagsApi.php index e97b40dcc..0203e5a19 100755 --- a/extensions/flags/src/Listener/AddFlagsApi.php +++ b/extensions/flags/src/Listener/AddFlagsApi.php @@ -11,16 +11,16 @@ namespace Flarum\Flags\Listener; +use Flarum\Api\Event\Serializing; use Flarum\Api\Serializer\CurrentUserSerializer; use Flarum\Api\Serializer\ForumSerializer; use Flarum\Api\Serializer\PostSerializer; -use Flarum\Core\User; use Flarum\Event\ConfigureApiRoutes; use Flarum\Event\ConfigureModelDates; -use Flarum\Event\PrepareApiAttributes; use Flarum\Flags\Api\Controller; use Flarum\Flags\Flag; use Flarum\Settings\SettingsRepositoryInterface; +use Flarum\User\User; use Illuminate\Contracts\Events\Dispatcher; class AddFlagsApi @@ -44,7 +44,7 @@ class AddFlagsApi public function subscribe(Dispatcher $events) { $events->listen(ConfigureModelDates::class, [$this, 'configureModelDates']); - $events->listen(PrepareApiAttributes::class, [$this, 'prepareApiAttributes']); + $events->listen(Serializing::class, [$this, 'prepareApiAttributes']); $events->listen(ConfigureApiRoutes::class, [$this, 'configureApiRoutes']); } @@ -59,9 +59,9 @@ class AddFlagsApi } /** - * @param PrepareApiAttributes $event + * @param Serializing $event */ - public function prepareApiAttributes(PrepareApiAttributes $event) + public function prepareApiAttributes(Serializing $event) { if ($event->isSerializer(ForumSerializer::class)) { $event->attributes['canViewFlags'] = $event->actor->hasPermissionLike('discussion.viewFlags'); diff --git a/extensions/flags/src/Listener/AddPostFlagsRelationship.php b/extensions/flags/src/Listener/AddPostFlagsRelationship.php index 3f95882f8..e0d2c5b8c 100755 --- a/extensions/flags/src/Listener/AddPostFlagsRelationship.php +++ b/extensions/flags/src/Listener/AddPostFlagsRelationship.php @@ -12,16 +12,16 @@ namespace Flarum\Flags\Listener; use Flarum\Api\Controller; +use Flarum\Api\Event\WillGetData; +use Flarum\Api\Event\WillSerializeData; use Flarum\Api\Serializer\PostSerializer; -use Flarum\Core\Post; -use Flarum\Event\ConfigureApiController; use Flarum\Event\GetApiRelationship; use Flarum\Event\GetModelRelationship; -use Flarum\Event\PostWasDeleted; -use Flarum\Event\PrepareApiData; use Flarum\Flags\Api\Controller\CreateFlagController; use Flarum\Flags\Api\Serializer\FlagSerializer; use Flarum\Flags\Flag; +use Flarum\Post\Event\Deleted; +use Flarum\Post\Post; use Illuminate\Contracts\Events\Dispatcher; use Illuminate\Database\Eloquent\Collection; @@ -33,10 +33,10 @@ class AddPostFlagsRelationship public function subscribe(Dispatcher $events) { $events->listen(GetModelRelationship::class, [$this, 'getModelRelationship']); - $events->listen(PostWasDeleted::class, [$this, 'postWasDeleted']); + $events->listen(Deleted::class, [$this, 'postWasDeleted']); $events->listen(GetApiRelationship::class, [$this, 'getApiRelationship']); - $events->listen(ConfigureApiController::class, [$this, 'includeFlagsRelationship']); - $events->listen(PrepareApiData::class, [$this, 'prepareApiData']); + $events->listen(WillGetData::class, [$this, 'includeFlagsRelationship']); + $events->listen(WillSerializeData::class, [$this, 'prepareApiData']); } /** @@ -51,9 +51,9 @@ class AddPostFlagsRelationship } /** - * @param PostWasDeleted $event + * @param Deleted $event */ - public function postWasDeleted(PostWasDeleted $event) + public function postWasDeleted(Deleted $event) { $event->post->flags()->delete(); } @@ -70,9 +70,9 @@ class AddPostFlagsRelationship } /** - * @param ConfigureApiController $event + * @param WillGetData $event */ - public function includeFlagsRelationship(ConfigureApiController $event) + public function includeFlagsRelationship(WillGetData $event) { if ($event->isController(Controller\ShowDiscussionController::class)) { $event->addInclude([ @@ -91,9 +91,9 @@ class AddPostFlagsRelationship } /** - * @param PrepareApiData $event + * @param WillSerializeData $event */ - public function prepareApiData(PrepareApiData $event) + public function prepareApiData(WillSerializeData $event) { // For any API action that allows the 'flags' relationship to be // included, we need to preload this relationship onto the data (Post