Merge branch 'master' into 1236-database-changes

src/Api/Controller/CreateTokenController.php

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

src/Api/Controller/ShowUserController.php

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

src/Api/routes.php

@@ -25,7 +25,7 @@ return function (RouteCollection $map, RouteHandlerFactory $route) {
     $map->post(
         '/token',
         'token',
-        $route->toController(Controller\TokenController::class)
+        $route->toController(Controller\CreateTokenController::class)
     );
 
     // Send forgot password email