mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-10-12 15:34:26 +02:00
Code Issues Releases Wiki Activity

merges 5.5 and master into next-back

Browse Source
This commit is contained in:
Daniël Klabbers
2017-12-14 01:00:16 +01:00
parent 93aa3d77b5 c6ce172caa
commit f65e4dcba3
104 changed files with 1723 additions and 1828 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Api/Serializer/BasicDiscussionSerializer.php
View File

@@ -88,4 +88,12 @@ class BasicDiscussionSerializer extends AbstractSerializer
{
return $this->hasMany($discussion, 'Flarum\Api\Serializer\BasicPostSerializer');
}
/**
* @return \Tobscure\JsonApi\Relationship
*/
protected function hideUser($discussion)
{
return $this->hasOne($discussion, 'Flarum\Api\Serializer\UserBasicSerializer');
}
}

5
src/Api/Serializer/BasicUserSerializer.php
View File

@@ -36,8 +36,9 @@ class BasicUserSerializer extends AbstractSerializer
}
return [
'username' => $user->username,
'avatarUrl' => $user->avatar_url
'username' => $user->username,
'displayName' => $user->display_name,
'avatarUrl' => $user->avatar_url
];
}

8
src/Api/Serializer/DiscussionSerializer.php
View File

@@ -64,12 +64,4 @@ class DiscussionSerializer extends BasicDiscussionSerializer
return $attributes;
}
/**
* @return \Tobscure\JsonApi\Relationship
*/
protected function hideUser($discussion)
{
return $this->hasOne($discussion, 'Flarum\Api\Serializer\UserSerializer');
}
}

6
src/Api/Serializer/PostSerializer.php
View File

@@ -85,7 +85,7 @@ class PostSerializer extends BasicPostSerializer
*/
protected function discussion($post)
{
return $this->hasOne($post, 'Flarum\Api\Serializer\DiscussionSerializer');
return $this->hasOne($post, 'Flarum\Api\Serializer\DiscussionBasicSerializer');
}
/**
@@ -93,7 +93,7 @@ class PostSerializer extends BasicPostSerializer
*/
protected function editUser($post)
{
return $this->hasOne($post, 'Flarum\Api\Serializer\UserSerializer');
return $this->hasOne($post, 'Flarum\Api\Serializer\UserBasicSerializer');
}
/**
@@ -101,6 +101,6 @@ class PostSerializer extends BasicPostSerializer
*/
protected function hideUser($post)
{
return $this->hasOne($post, 'Flarum\Api\Serializer\UserSerializer');
return $this->hasOne($post, 'Flarum\Api\Serializer\UserBasicSerializer');
}
}

1
src/Api/Serializer/UserSerializer.php
View File

@@ -40,7 +40,6 @@ class UserSerializer extends BasicUserSerializer
$canEdit = $gate->allows('edit', $user);
$attributes += [
'bio' => $user->bio,
'joinTime' => $this->formatDate($user->join_time),
'discussionsCount' => (int) $user->discussions_count,
'commentsCount' => (int) $user->comments_count,