diff --git a/src/Api/ApiServiceProvider.php b/src/Api/ApiServiceProvider.php index 7360358a3..f0bdf6659 100644 --- a/src/Api/ApiServiceProvider.php +++ b/src/Api/ApiServiceProvider.php @@ -15,6 +15,7 @@ use Flarum\Api\Controller\AbstractSerializeController; use Flarum\Api\Middleware\FakeHttpMethods; use Flarum\Api\Middleware\HandleErrors; use Flarum\Api\Serializer\AbstractSerializer; +use Flarum\Api\Serializer\BasicDiscussionSerializer; use Flarum\Api\Serializer\NotificationSerializer; use Flarum\Event\ConfigureApiRoutes; use Flarum\Event\ConfigureMiddleware; @@ -114,7 +115,7 @@ class ApiServiceProvider extends AbstractServiceProvider { $blueprints = []; $serializers = [ - 'discussionRenamed' => 'Flarum\Api\Serializer\DiscussionBasicSerializer' + 'discussionRenamed' => BasicDiscussionSerializer::class ]; $this->app->make('events')->fire( diff --git a/src/Api/Serializer/BasicDiscussionSerializer.php b/src/Api/Serializer/BasicDiscussionSerializer.php index b0f39b2fe..b03d6d002 100644 --- a/src/Api/Serializer/BasicDiscussionSerializer.php +++ b/src/Api/Serializer/BasicDiscussionSerializer.php @@ -46,7 +46,7 @@ class BasicDiscussionSerializer extends AbstractSerializer */ protected function startUser($discussion) { - return $this->hasOne($discussion, 'Flarum\Api\Serializer\BasicUserSerializer'); + return $this->hasOne($discussion, BasicUserSerializer::class); } /** @@ -54,7 +54,7 @@ class BasicDiscussionSerializer extends AbstractSerializer */ protected function startPost($discussion) { - return $this->hasOne($discussion, 'Flarum\Api\Serializer\BasicPostSerializer'); + return $this->hasOne($discussion, BasicPostSerializer::class); } /** @@ -62,7 +62,7 @@ class BasicDiscussionSerializer extends AbstractSerializer */ protected function lastUser($discussion) { - return $this->hasOne($discussion, 'Flarum\Api\Serializer\BasicUserSerializer'); + return $this->hasOne($discussion, BasicUserSerializer::class); } /** @@ -70,7 +70,7 @@ class BasicDiscussionSerializer extends AbstractSerializer */ protected function lastPost($discussion) { - return $this->hasOne($discussion, 'Flarum\Api\Serializer\BasicPostSerializer'); + return $this->hasOne($discussion, BasicPostSerializer::class); } /** @@ -78,7 +78,7 @@ class BasicDiscussionSerializer extends AbstractSerializer */ protected function posts($discussion) { - return $this->hasMany($discussion, 'Flarum\Api\Serializer\PostSerializer'); + return $this->hasMany($discussion, PostSerializer::class); } /** @@ -86,7 +86,7 @@ class BasicDiscussionSerializer extends AbstractSerializer */ protected function relevantPosts($discussion) { - return $this->hasMany($discussion, 'Flarum\Api\Serializer\BasicPostSerializer'); + return $this->hasMany($discussion, BasicPostSerializer::class); } /** @@ -94,6 +94,6 @@ class BasicDiscussionSerializer extends AbstractSerializer */ protected function hideUser($discussion) { - return $this->hasOne($discussion, 'Flarum\Api\Serializer\UserBasicSerializer'); + return $this->hasOne($discussion, BasicUserSerializer::class); } } diff --git a/src/Api/Serializer/BasicPostSerializer.php b/src/Api/Serializer/BasicPostSerializer.php index a2a10feeb..103bd8a06 100644 --- a/src/Api/Serializer/BasicPostSerializer.php +++ b/src/Api/Serializer/BasicPostSerializer.php @@ -57,7 +57,7 @@ class BasicPostSerializer extends AbstractSerializer */ protected function user($post) { - return $this->hasOne($post, 'Flarum\Api\Serializer\BasicUserSerializer'); + return $this->hasOne($post, BasicUserSerializer::class); } /** @@ -65,6 +65,6 @@ class BasicPostSerializer extends AbstractSerializer */ protected function discussion($post) { - return $this->hasOne($post, 'Flarum\Api\Serializer\BasicDiscussionSerializer'); + return $this->hasOne($post, BasicDiscussionSerializer::class); } } diff --git a/src/Api/Serializer/BasicUserSerializer.php b/src/Api/Serializer/BasicUserSerializer.php index 5e84273d5..3a6b3d46d 100644 --- a/src/Api/Serializer/BasicUserSerializer.php +++ b/src/Api/Serializer/BasicUserSerializer.php @@ -47,6 +47,6 @@ class BasicUserSerializer extends AbstractSerializer */ protected function groups($user) { - return $this->hasMany($user, 'Flarum\Api\Serializer\GroupSerializer'); + return $this->hasMany($user, GroupSerializer::class); } } diff --git a/src/Api/Serializer/ForumSerializer.php b/src/Api/Serializer/ForumSerializer.php index 399fcfd83..02dcdd6d6 100644 --- a/src/Api/Serializer/ForumSerializer.php +++ b/src/Api/Serializer/ForumSerializer.php @@ -97,7 +97,7 @@ class ForumSerializer extends AbstractSerializer */ protected function groups($model) { - return $this->hasMany($model, 'Flarum\Api\Serializer\GroupSerializer'); + return $this->hasMany($model, GroupSerializer::class); } /** diff --git a/src/Api/Serializer/GroupSerializer.php b/src/Api/Serializer/GroupSerializer.php index 7cd1eb989..7511329cc 100644 --- a/src/Api/Serializer/GroupSerializer.php +++ b/src/Api/Serializer/GroupSerializer.php @@ -62,7 +62,7 @@ class GroupSerializer extends AbstractSerializer */ protected function permissions($group) { - return $this->hasMany($group, 'Flarum\Api\Serializers\PermissionSerializer'); + return $this->hasMany($group, PermissionSerializer::class); } /** diff --git a/src/Api/Serializer/NotificationSerializer.php b/src/Api/Serializer/NotificationSerializer.php index 9159445a3..55b809079 100644 --- a/src/Api/Serializer/NotificationSerializer.php +++ b/src/Api/Serializer/NotificationSerializer.php @@ -57,7 +57,7 @@ class NotificationSerializer extends AbstractSerializer */ protected function user($notification) { - return $this->hasOne($notification, 'Flarum\Api\Serializer\BasicUserSerializer'); + return $this->hasOne($notification, BasicUserSerializer::class); } /** @@ -65,7 +65,7 @@ class NotificationSerializer extends AbstractSerializer */ protected function sender($notification) { - return $this->hasOne($notification, 'Flarum\Api\Serializer\BasicUserSerializer'); + return $this->hasOne($notification, BasicUserSerializer::class); } /** diff --git a/src/Api/Serializer/PostSerializer.php b/src/Api/Serializer/PostSerializer.php index 7843e43ce..ee807374b 100644 --- a/src/Api/Serializer/PostSerializer.php +++ b/src/Api/Serializer/PostSerializer.php @@ -77,7 +77,7 @@ class PostSerializer extends BasicPostSerializer */ protected function user($post) { - return $this->hasOne($post, 'Flarum\Api\Serializer\UserSerializer'); + return $this->hasOne($post, UserSerializer::class); } /** @@ -85,7 +85,7 @@ class PostSerializer extends BasicPostSerializer */ protected function discussion($post) { - return $this->hasOne($post, 'Flarum\Api\Serializer\DiscussionBasicSerializer'); + return $this->hasOne($post, BasicDiscussionSerializer::class); } /** @@ -93,7 +93,7 @@ class PostSerializer extends BasicPostSerializer */ protected function editUser($post) { - return $this->hasOne($post, 'Flarum\Api\Serializer\UserBasicSerializer'); + return $this->hasOne($post, BasicUserSerializer::class); } /** @@ -101,6 +101,6 @@ class PostSerializer extends BasicPostSerializer */ protected function hideUser($post) { - return $this->hasOne($post, 'Flarum\Api\Serializer\UserBasicSerializer'); + return $this->hasOne($post, BasicUserSerializer::class); } }