mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-10-11 23:14:29 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master' into 1236-database-changes

Browse Source
This commit is contained in:
Daniel Klabbers
2018-06-19 09:57:47 +02:00
parent 26b02adc9d 07eda60561
commit 2cd77e231f
21 changed files with 84 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Api/Controller/TokenController.php → src/Api/Controller/CreateTokenController.php
View File

@@ -21,7 +21,7 @@ use Psr\Http\Message\ServerRequestInterface;
use Psr\Http\Server\RequestHandlerInterface;
use Zend\Diactoros\Response\JsonResponse;
class TokenController implements RequestHandlerInterface
class CreateTokenController implements RequestHandlerInterface
{
/**
* @var \Flarum\User\UserRepository

3
src/Api/Controller/ShowUserController.php
View File

@@ -11,6 +11,7 @@
namespace Flarum\Api\Controller;
use Flarum\Api\Serializer\CurrentUserSerializer;
use Flarum\Api\Serializer\UserSerializer;
use Flarum\User\UserRepository;
use Psr\Http\Message\ServerRequestInterface;
@@ -55,7 +56,7 @@ class ShowUserController extends AbstractShowController
$actor = $request->getAttribute('actor');
if ($actor->id == $id) {
$this->serializer = 'Flarum\Api\Serializer\CurrentUserSerializer';
$this->serializer = CurrentUserSerializer::class;
}
return $this->users->findOrFail($id, $actor);