Merge branch 'master' into psr-7

Conflicts:
	composer.json
	composer.lock
	src/Api/Actions/TokenAction.php
	src/Core/Formatter/FormatterManager.php
	src/Core/Handlers/Events/EmailConfirmationMailer.php
	src/Forum/Actions/ConfirmEmailAction.php
	src/Forum/Actions/IndexAction.php
	src/Forum/Actions/ResetPasswordAction.php
	src/Forum/Actions/SavePasswordAction.php
	src/Forum/routes.php

src/Api/Actions/Discussions/IndexAction.php

@@ -41,7 +41,9 @@ class IndexAction extends SerializeCollectionAction
         'lastUser' => true,
         'startPost' => false,
         'lastPost' => false,
-        'relevantPosts' => false
+        'relevantPosts' => false,
+        'relevantPosts.discussion' => false,
+        'relevantPosts.user' => false
     ];
 
     /**

src/Api/Actions/Discussions/ShowAction.php

@@ -51,7 +51,7 @@ class ShowAction extends SerializeResourceAction
      *
      * @var array
      */
-    public static $link = ['posts'];
+    public static $link = ['posts', 'posts.discussion'];
 
     /**
      * The fields that are available to be sorted by.

src/Api/Actions/Notifications/IndexAction.php

@@ -74,6 +74,7 @@ class IndexAction extends SerializeCollectionAction
 
         $user->markNotificationsAsRead()->save();
 
-        return $this->notifications->findByUser($user, $request->limit, $request->offset);
+        return $this->notifications->findByUser($user, $request->limit, $request->offset)
+            ->load($request->include);
     }
 }

src/Api/Actions/TokenAction.php

@@ -4,6 +4,7 @@ use Flarum\Api\Request;
 use Flarum\Core\Commands\GenerateAccessTokenCommand;
 use Flarum\Core\Repositories\UserRepositoryInterface;
 use Flarum\Core\Exceptions\PermissionDeniedException;
+use Flarum\Core\Events\UserEmailChangeWasRequested;
 use Illuminate\Contracts\Bus\Dispatcher;
 
 class TokenAction extends JsonApiAction
@@ -36,6 +37,14 @@ class TokenAction extends JsonApiAction
             throw new PermissionDeniedException;
         }
 
+        if (! $user->is_activated) {
+            event(new UserEmailChangeWasRequested($user, $user->email));
+            return $this->json([
+                'code' => 'confirm_email',
+                'email' => $user->email
+            ], 401);
+        }
+
         $token = $this->bus->dispatch(
             new GenerateAccessTokenCommand($user->id)
         );

src/Api/Actions/Users/ShowAction.php

@@ -17,7 +17,7 @@ class ShowAction extends SerializeResourceAction
      *
      * @var string
      */
-    public static $serializer = 'Flarum\Api\Serializers\UserSerializer';
+    public static $serializer = 'Flarum\Api\Serializers\CurrentUserSerializer';
 
     /**
      * The relationships that are available to be included, and which ones are