mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-07-19 07:41:22 +02:00
Code Issues Releases Wiki Activity

fixed the BasicFoo vs FooBasic serializer definition issue, prevented for future using ::class

Browse Source
This commit is contained in:
Daniel Klabbers
2017-12-15 08:29:07 +01:00
parent be8aa6369a
commit 3f7b51cf24
8 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
framework/core/src/Api/ApiServiceProvider.php
View File

@@ -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(

14
framework/core/src/Api/Serializer/BasicDiscussionSerializer.php
View File

@@ -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);
}
}

4
framework/core/src/Api/Serializer/BasicPostSerializer.php
View File

@@ -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);
}
}

2
framework/core/src/Api/Serializer/BasicUserSerializer.php
View File

@@ -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);
}
}

2
framework/core/src/Api/Serializer/ForumSerializer.php
View File

@@ -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);
}
/**

2
framework/core/src/Api/Serializer/GroupSerializer.php
View File

@@ -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);
}
/**

4
framework/core/src/Api/Serializer/NotificationSerializer.php
View File

@@ -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);
}
/**

8
framework/core/src/Api/Serializer/PostSerializer.php
View File

@@ -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);
}
}