From 6280fb2498ca0708492338c281ea24e991299da5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dani=C3=ABl=20Klabbers?= <daniel@klabbers.email>
Date: Wed, 29 Nov 2017 06:26:48 +0100
Subject: [PATCH] reverting translator contract

---
 src/Api/Controller/SendConfirmationEmailController.php | 8 ++++----
 src/Api/Serializer/GroupSerializer.php                 | 8 ++++----
 src/Forum/Controller/ResetPasswordController.php       | 7 ++++---
 src/Foundation/AbstractValidator.php                   | 8 ++++----
 4 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/src/Api/Controller/SendConfirmationEmailController.php b/src/Api/Controller/SendConfirmationEmailController.php
index dd9e37afa..2935f0067 100644
--- a/src/Api/Controller/SendConfirmationEmailController.php
+++ b/src/Api/Controller/SendConfirmationEmailController.php
@@ -18,9 +18,9 @@ use Flarum\User\AssertPermissionTrait;
 use Flarum\User\EmailToken;
 use Flarum\User\Exception\PermissionDeniedException;
 use Illuminate\Contracts\Mail\Mailer;
-use Illuminate\Contracts\Translation\Translator;
 use Illuminate\Mail\Message;
 use Psr\Http\Message\ServerRequestInterface;
+use Symfony\Component\Translation\TranslatorInterface;
 use Zend\Diactoros\Response\EmptyResponse;
 
 class SendConfirmationEmailController implements ControllerInterface
@@ -43,7 +43,7 @@ class SendConfirmationEmailController implements ControllerInterface
     protected $url;
 
     /**
-     * @var Translator
+     * @var TranslatorInterface
      */
     protected $translator;
 
@@ -51,9 +51,9 @@ class SendConfirmationEmailController implements ControllerInterface
      * @param \Flarum\Settings\SettingsRepositoryInterface $settings
      * @param Mailer $mailer
      * @param UrlGenerator $url
-     * @param Translator $translator
+     * @param TranslatorInterface $translator
      */
-    public function __construct(SettingsRepositoryInterface $settings, Mailer $mailer, UrlGenerator $url, Translator $translator)
+    public function __construct(SettingsRepositoryInterface $settings, Mailer $mailer, UrlGenerator $url, TranslatorInterface $translator)
     {
         $this->settings = $settings;
         $this->mailer = $mailer;
diff --git a/src/Api/Serializer/GroupSerializer.php b/src/Api/Serializer/GroupSerializer.php
index 94bf6b80f..7cd1eb989 100644
--- a/src/Api/Serializer/GroupSerializer.php
+++ b/src/Api/Serializer/GroupSerializer.php
@@ -12,8 +12,8 @@
 namespace Flarum\Api\Serializer;
 
 use Flarum\Group\Group;
-use Illuminate\Contracts\Translation\Translator;
 use InvalidArgumentException;
+use Symfony\Component\Translation\TranslatorInterface;
 
 class GroupSerializer extends AbstractSerializer
 {
@@ -23,14 +23,14 @@ class GroupSerializer extends AbstractSerializer
     protected $type = 'groups';
 
     /**
-     * @var Translator
+     * @var TranslatorInterface
      */
     private $translator;
 
     /**
-     * @param Translator $translator
+     * @param TranslatorInterface $translator
      */
-    public function __construct(Translator $translator)
+    public function __construct(TranslatorInterface $translator)
     {
         $this->translator = $translator;
     }
diff --git a/src/Forum/Controller/ResetPasswordController.php b/src/Forum/Controller/ResetPasswordController.php
index 0be98834d..f5f7e9300 100644
--- a/src/Forum/Controller/ResetPasswordController.php
+++ b/src/Forum/Controller/ResetPasswordController.php
@@ -15,9 +15,9 @@ use DateTime;
 use Flarum\Http\Controller\AbstractHtmlController;
 use Flarum\User\Exception\InvalidConfirmationTokenException;
 use Flarum\User\PasswordToken;
-use Illuminate\Contracts\Translation\Translator;
 use Illuminate\Contracts\View\Factory;
 use Psr\Http\Message\ServerRequestInterface as Request;
+use Symfony\Component\Translation\TranslatorInterface;
 
 class ResetPasswordController extends AbstractHtmlController
 {
@@ -27,14 +27,15 @@ class ResetPasswordController extends AbstractHtmlController
     protected $view;
 
     /**
-     * @var Translator
+     * @var TranslatorInterface
      */
     protected $translator;
 
     /**
      * @param Factory $view
+     * @param TranslatorInterface $translator
      */
-    public function __construct(Factory $view, Translator $translator)
+    public function __construct(Factory $view, TranslatorInterface $translator)
     {
         $this->view = $view;
         $this->translator = $translator;
diff --git a/src/Foundation/AbstractValidator.php b/src/Foundation/AbstractValidator.php
index 90b3af47c..ee1062af5 100644
--- a/src/Foundation/AbstractValidator.php
+++ b/src/Foundation/AbstractValidator.php
@@ -13,9 +13,9 @@ namespace Flarum\Foundation;
 
 use Flarum\Foundation\Event\Validating;
 use Illuminate\Contracts\Events\Dispatcher;
-use Illuminate\Contracts\Translation\Translator;
 use Illuminate\Contracts\Validation\ValidationException;
 use Illuminate\Validation\Factory;
+use Symfony\Component\Translation\TranslatorInterface;
 
 abstract class AbstractValidator
 {
@@ -35,16 +35,16 @@ abstract class AbstractValidator
     protected $events;
 
     /**
-     * @var Translator
+     * @var TranslatorInterface
      */
     protected $translator;
 
     /**
      * @param Factory $validator
      * @param Dispatcher $events
-     * @param Translator $translator
+     * @param TranslatorInterface $translator
      */
-    public function __construct(Factory $validator, Dispatcher $events, Translator $translator)
+    public function __construct(Factory $validator, Dispatcher $events, TranslatorInterface $translator)
     {
         $this->validator = $validator;
         $this->events = $events;