From 936f67e953c1ba051b2bfc20074fc9425ba4e064 Mon Sep 17 00:00:00 2001 From: Franz Liedke Date: Tue, 2 Jan 2018 19:36:48 +0100 Subject: [PATCH] Use ::class instead of some hardcoded class names This gives us better refactoring functionality in IDEs like PhpStorm, and also more quickly surfaces typos through errors about undefined classes. :) --- src/Api/Controller/CreateDiscussionController.php | 3 ++- src/Api/Controller/CreateGroupController.php | 3 ++- src/Api/Controller/CreatePostController.php | 3 ++- src/Api/Controller/CreateUserController.php | 3 ++- src/Api/Controller/DeleteAvatarController.php | 3 ++- src/Api/Controller/ListDiscussionsController.php | 3 ++- src/Api/Controller/ListGroupsController.php | 3 ++- src/Api/Controller/ListNotificationsController.php | 3 ++- src/Api/Controller/ListPostsController.php | 3 ++- src/Api/Controller/ListUsersController.php | 3 ++- src/Api/Controller/ShowDiscussionController.php | 3 ++- src/Api/Controller/ShowForumController.php | 3 ++- src/Api/Controller/ShowPostController.php | 3 ++- src/Api/Controller/ShowUserController.php | 3 ++- src/Api/Controller/UpdateDiscussionController.php | 3 ++- src/Api/Controller/UpdateGroupController.php | 3 ++- src/Api/Controller/UpdateNotificationController.php | 3 ++- src/Api/Controller/UpdatePostController.php | 3 ++- src/Api/Controller/UpdateUserController.php | 3 ++- src/Api/Controller/UploadAvatarController.php | 3 ++- 20 files changed, 40 insertions(+), 20 deletions(-) diff --git a/src/Api/Controller/CreateDiscussionController.php b/src/Api/Controller/CreateDiscussionController.php index 69f2afc15..a58418a1e 100644 --- a/src/Api/Controller/CreateDiscussionController.php +++ b/src/Api/Controller/CreateDiscussionController.php @@ -11,6 +11,7 @@ namespace Flarum\Api\Controller; +use Flarum\Api\Serializer\DiscussionSerializer; use Flarum\Discussion\Command\ReadDiscussion; use Flarum\Discussion\Command\StartDiscussion; use Flarum\Post\Floodgate; @@ -23,7 +24,7 @@ class CreateDiscussionController extends AbstractCreateController /** * {@inheritdoc} */ - public $serializer = 'Flarum\Api\Serializer\DiscussionSerializer'; + public $serializer = DiscussionSerializer::class; /** * {@inheritdoc} diff --git a/src/Api/Controller/CreateGroupController.php b/src/Api/Controller/CreateGroupController.php index 9bf23052f..623815924 100644 --- a/src/Api/Controller/CreateGroupController.php +++ b/src/Api/Controller/CreateGroupController.php @@ -11,6 +11,7 @@ namespace Flarum\Api\Controller; +use Flarum\Api\Serializer\GroupSerializer; use Flarum\Group\Command\CreateGroup; use Illuminate\Contracts\Bus\Dispatcher; use Psr\Http\Message\ServerRequestInterface; @@ -21,7 +22,7 @@ class CreateGroupController extends AbstractCreateController /** * {@inheritdoc} */ - public $serializer = 'Flarum\Api\Serializer\GroupSerializer'; + public $serializer = GroupSerializer::class; /** * @var Dispatcher diff --git a/src/Api/Controller/CreatePostController.php b/src/Api/Controller/CreatePostController.php index 1d7e9f5c2..050314838 100644 --- a/src/Api/Controller/CreatePostController.php +++ b/src/Api/Controller/CreatePostController.php @@ -11,6 +11,7 @@ namespace Flarum\Api\Controller; +use Flarum\Api\Serializer\PostSerializer; use Flarum\Discussion\Command\ReadDiscussion; use Flarum\Post\Command\PostReply; use Flarum\Post\Floodgate; @@ -23,7 +24,7 @@ class CreatePostController extends AbstractCreateController /** * {@inheritdoc} */ - public $serializer = 'Flarum\Api\Serializer\PostSerializer'; + public $serializer = PostSerializer::class; /** * {@inheritdoc} diff --git a/src/Api/Controller/CreateUserController.php b/src/Api/Controller/CreateUserController.php index 155f862ac..20bcda015 100644 --- a/src/Api/Controller/CreateUserController.php +++ b/src/Api/Controller/CreateUserController.php @@ -11,6 +11,7 @@ namespace Flarum\Api\Controller; +use Flarum\Api\Serializer\CurrentUserSerializer; use Flarum\User\Command\RegisterUser; use Illuminate\Contracts\Bus\Dispatcher; use Psr\Http\Message\ServerRequestInterface; @@ -21,7 +22,7 @@ class CreateUserController extends AbstractCreateController /** * {@inheritdoc} */ - public $serializer = 'Flarum\Api\Serializer\CurrentUserSerializer'; + public $serializer = CurrentUserSerializer::class; /** * @var Dispatcher diff --git a/src/Api/Controller/DeleteAvatarController.php b/src/Api/Controller/DeleteAvatarController.php index 61ab87109..c22d9a798 100644 --- a/src/Api/Controller/DeleteAvatarController.php +++ b/src/Api/Controller/DeleteAvatarController.php @@ -11,6 +11,7 @@ namespace Flarum\Api\Controller; +use Flarum\Api\Serializer\UserSerializer; use Flarum\User\Command\DeleteAvatar; use Illuminate\Contracts\Bus\Dispatcher; use Psr\Http\Message\ServerRequestInterface; @@ -21,7 +22,7 @@ class DeleteAvatarController extends AbstractShowController /** * {@inheritdoc} */ - public $serializer = 'Flarum\Api\Serializer\UserSerializer'; + public $serializer = UserSerializer::class; /** * @var Dispatcher diff --git a/src/Api/Controller/ListDiscussionsController.php b/src/Api/Controller/ListDiscussionsController.php index 7a90bf540..55cc4a4e9 100644 --- a/src/Api/Controller/ListDiscussionsController.php +++ b/src/Api/Controller/ListDiscussionsController.php @@ -11,6 +11,7 @@ namespace Flarum\Api\Controller; +use Flarum\Api\Serializer\DiscussionSerializer; use Flarum\Discussion\Search\DiscussionSearcher; use Flarum\Http\UrlGenerator; use Flarum\Search\SearchCriteria; @@ -22,7 +23,7 @@ class ListDiscussionsController extends AbstractListController /** * {@inheritdoc} */ - public $serializer = 'Flarum\Api\Serializer\DiscussionSerializer'; + public $serializer = DiscussionSerializer::class; /** * {@inheritdoc} diff --git a/src/Api/Controller/ListGroupsController.php b/src/Api/Controller/ListGroupsController.php index f02253810..2ebc478b1 100644 --- a/src/Api/Controller/ListGroupsController.php +++ b/src/Api/Controller/ListGroupsController.php @@ -11,6 +11,7 @@ namespace Flarum\Api\Controller; +use Flarum\Api\Serializer\GroupSerializer; use Flarum\Group\Group; use Psr\Http\Message\ServerRequestInterface; use Tobscure\JsonApi\Document; @@ -20,7 +21,7 @@ class ListGroupsController extends AbstractListController /** * {@inheritdoc} */ - public $serializer = 'Flarum\Api\Serializer\GroupSerializer'; + public $serializer = GroupSerializer::class; /** * {@inheritdoc} diff --git a/src/Api/Controller/ListNotificationsController.php b/src/Api/Controller/ListNotificationsController.php index f09dd7ca9..b1bec9718 100644 --- a/src/Api/Controller/ListNotificationsController.php +++ b/src/Api/Controller/ListNotificationsController.php @@ -11,6 +11,7 @@ namespace Flarum\Api\Controller; +use Flarum\Api\Serializer\NotificationSerializer; use Flarum\Discussion\Discussion; use Flarum\Http\UrlGenerator; use Flarum\Notification\NotificationRepository; @@ -23,7 +24,7 @@ class ListNotificationsController extends AbstractListController /** * {@inheritdoc} */ - public $serializer = 'Flarum\Api\Serializer\NotificationSerializer'; + public $serializer = NotificationSerializer::class; /** * {@inheritdoc} diff --git a/src/Api/Controller/ListPostsController.php b/src/Api/Controller/ListPostsController.php index 5c732bc6f..4818b54e9 100644 --- a/src/Api/Controller/ListPostsController.php +++ b/src/Api/Controller/ListPostsController.php @@ -11,6 +11,7 @@ namespace Flarum\Api\Controller; +use Flarum\Api\Serializer\PostSerializer; use Flarum\Event\ConfigurePostsQuery; use Flarum\Post\PostRepository; use Illuminate\Database\Eloquent\Builder; @@ -23,7 +24,7 @@ class ListPostsController extends AbstractListController /** * {@inheritdoc} */ - public $serializer = 'Flarum\Api\Serializer\PostSerializer'; + public $serializer = PostSerializer::class; /** * {@inheritdoc} diff --git a/src/Api/Controller/ListUsersController.php b/src/Api/Controller/ListUsersController.php index 679230a98..b04b17233 100644 --- a/src/Api/Controller/ListUsersController.php +++ b/src/Api/Controller/ListUsersController.php @@ -11,6 +11,7 @@ namespace Flarum\Api\Controller; +use Flarum\Api\Serializer\UserSerializer; use Flarum\Http\UrlGenerator; use Flarum\Search\SearchCriteria; use Flarum\User\Exception\PermissionDeniedException; @@ -23,7 +24,7 @@ class ListUsersController extends AbstractListController /** * {@inheritdoc} */ - public $serializer = 'Flarum\Api\Serializer\UserSerializer'; + public $serializer = UserSerializer::class; /** * {@inheritdoc} diff --git a/src/Api/Controller/ShowDiscussionController.php b/src/Api/Controller/ShowDiscussionController.php index a2930c15e..6321820f0 100644 --- a/src/Api/Controller/ShowDiscussionController.php +++ b/src/Api/Controller/ShowDiscussionController.php @@ -11,6 +11,7 @@ namespace Flarum\Api\Controller; +use Flarum\Api\Serializer\DiscussionSerializer; use Flarum\Discussion\Discussion; use Flarum\Discussion\DiscussionRepository; use Flarum\Post\PostRepository; @@ -33,7 +34,7 @@ class ShowDiscussionController extends AbstractShowController /** * {@inheritdoc} */ - public $serializer = 'Flarum\Api\Serializer\DiscussionSerializer'; + public $serializer = DiscussionSerializer::class; /** * {@inheritdoc} diff --git a/src/Api/Controller/ShowForumController.php b/src/Api/Controller/ShowForumController.php index 2dd3cd369..427962b77 100644 --- a/src/Api/Controller/ShowForumController.php +++ b/src/Api/Controller/ShowForumController.php @@ -11,6 +11,7 @@ namespace Flarum\Api\Controller; +use Flarum\Api\Serializer\ForumSerializer; use Flarum\Group\Group; use Psr\Http\Message\ServerRequestInterface; use Tobscure\JsonApi\Document; @@ -20,7 +21,7 @@ class ShowForumController extends AbstractShowController /** * {@inheritdoc} */ - public $serializer = 'Flarum\Api\Serializer\ForumSerializer'; + public $serializer = ForumSerializer::class; /** * {@inheritdoc} diff --git a/src/Api/Controller/ShowPostController.php b/src/Api/Controller/ShowPostController.php index 49a5f2dec..f269b7ebc 100644 --- a/src/Api/Controller/ShowPostController.php +++ b/src/Api/Controller/ShowPostController.php @@ -11,6 +11,7 @@ namespace Flarum\Api\Controller; +use Flarum\Api\Serializer\PostSerializer; use Flarum\Post\PostRepository; use Psr\Http\Message\ServerRequestInterface; use Tobscure\JsonApi\Document; @@ -20,7 +21,7 @@ class ShowPostController extends AbstractShowController /** * {@inheritdoc} */ - public $serializer = 'Flarum\Api\Serializer\PostSerializer'; + public $serializer = PostSerializer::class; /** * {@inheritdoc} diff --git a/src/Api/Controller/ShowUserController.php b/src/Api/Controller/ShowUserController.php index f61d3a1b6..310643c3b 100644 --- a/src/Api/Controller/ShowUserController.php +++ b/src/Api/Controller/ShowUserController.php @@ -11,6 +11,7 @@ namespace Flarum\Api\Controller; +use Flarum\Api\Serializer\UserSerializer; use Flarum\User\UserRepository; use Psr\Http\Message\ServerRequestInterface; use Tobscure\JsonApi\Document; @@ -20,7 +21,7 @@ class ShowUserController extends AbstractShowController /** * {@inheritdoc} */ - public $serializer = 'Flarum\Api\Serializer\UserSerializer'; + public $serializer = UserSerializer::class; /** * {@inheritdoc} diff --git a/src/Api/Controller/UpdateDiscussionController.php b/src/Api/Controller/UpdateDiscussionController.php index 3fa1900f3..f8c8cd0b4 100644 --- a/src/Api/Controller/UpdateDiscussionController.php +++ b/src/Api/Controller/UpdateDiscussionController.php @@ -11,6 +11,7 @@ namespace Flarum\Api\Controller; +use Flarum\Api\Serializer\DiscussionSerializer; use Flarum\Discussion\Command\EditDiscussion; use Flarum\Discussion\Command\ReadDiscussion; use Illuminate\Contracts\Bus\Dispatcher; @@ -23,7 +24,7 @@ class UpdateDiscussionController extends AbstractShowController /** * {@inheritdoc} */ - public $serializer = 'Flarum\Api\Serializer\DiscussionSerializer'; + public $serializer = DiscussionSerializer::class; /** * @var Dispatcher diff --git a/src/Api/Controller/UpdateGroupController.php b/src/Api/Controller/UpdateGroupController.php index c4bd8f5dd..919ebcf53 100644 --- a/src/Api/Controller/UpdateGroupController.php +++ b/src/Api/Controller/UpdateGroupController.php @@ -11,6 +11,7 @@ namespace Flarum\Api\Controller; +use Flarum\Api\Serializer\GroupSerializer; use Flarum\Group\Command\EditGroup; use Illuminate\Contracts\Bus\Dispatcher; use Psr\Http\Message\ServerRequestInterface; @@ -21,7 +22,7 @@ class UpdateGroupController extends AbstractShowController /** * {@inheritdoc} */ - public $serializer = 'Flarum\Api\Serializer\GroupSerializer'; + public $serializer = GroupSerializer::class; /** * @var Dispatcher diff --git a/src/Api/Controller/UpdateNotificationController.php b/src/Api/Controller/UpdateNotificationController.php index f459e0338..fe9564838 100644 --- a/src/Api/Controller/UpdateNotificationController.php +++ b/src/Api/Controller/UpdateNotificationController.php @@ -11,6 +11,7 @@ namespace Flarum\Api\Controller; +use Flarum\Api\Serializer\NotificationSerializer; use Flarum\Notification\Command\ReadNotification; use Illuminate\Contracts\Bus\Dispatcher; use Psr\Http\Message\ServerRequestInterface; @@ -21,7 +22,7 @@ class UpdateNotificationController extends AbstractShowController /** * {@inheritdoc} */ - public $serializer = 'Flarum\Api\Serializer\NotificationSerializer'; + public $serializer = NotificationSerializer::class; /** * @var Dispatcher diff --git a/src/Api/Controller/UpdatePostController.php b/src/Api/Controller/UpdatePostController.php index 6f13e3371..fe2db5ed9 100644 --- a/src/Api/Controller/UpdatePostController.php +++ b/src/Api/Controller/UpdatePostController.php @@ -11,6 +11,7 @@ namespace Flarum\Api\Controller; +use Flarum\Api\Serializer\PostSerializer; use Flarum\Post\Command\EditPost; use Illuminate\Contracts\Bus\Dispatcher; use Psr\Http\Message\ServerRequestInterface; @@ -21,7 +22,7 @@ class UpdatePostController extends AbstractShowController /** * {@inheritdoc} */ - public $serializer = 'Flarum\Api\Serializer\PostSerializer'; + public $serializer = PostSerializer::class; /** * {@inheritdoc} diff --git a/src/Api/Controller/UpdateUserController.php b/src/Api/Controller/UpdateUserController.php index 42a57754a..92781c85b 100644 --- a/src/Api/Controller/UpdateUserController.php +++ b/src/Api/Controller/UpdateUserController.php @@ -11,6 +11,7 @@ namespace Flarum\Api\Controller; +use Flarum\Api\Serializer\CurrentUserSerializer; use Flarum\User\Command\EditUser; use Flarum\User\Exception\PermissionDeniedException; use Illuminate\Contracts\Bus\Dispatcher; @@ -22,7 +23,7 @@ class UpdateUserController extends AbstractShowController /** * {@inheritdoc} */ - public $serializer = 'Flarum\Api\Serializer\CurrentUserSerializer'; + public $serializer = CurrentUserSerializer::class; /** * {@inheritdoc} diff --git a/src/Api/Controller/UploadAvatarController.php b/src/Api/Controller/UploadAvatarController.php index b2e23e33b..5ac1e1fdc 100644 --- a/src/Api/Controller/UploadAvatarController.php +++ b/src/Api/Controller/UploadAvatarController.php @@ -11,6 +11,7 @@ namespace Flarum\Api\Controller; +use Flarum\Api\Serializer\UserSerializer; use Flarum\User\Command\UploadAvatar; use Illuminate\Contracts\Bus\Dispatcher; use Psr\Http\Message\ServerRequestInterface; @@ -21,7 +22,7 @@ class UploadAvatarController extends AbstractShowController /** * {@inheritdoc} */ - public $serializer = 'Flarum\Api\Serializer\UserSerializer'; + public $serializer = UserSerializer::class; /** * @var Dispatcher