green tests

src/Api/Controller/SendConfirmationEmailController.php

@@ -20,7 +20,7 @@
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\RequestHandlerInterface;
-use Symfony\Component\Translation\TranslatorInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 class SendConfirmationEmailController implements RequestHandlerInterface
 {

src/Api/Controller/SendTestMailController.php

@@ -16,7 +16,7 @@
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;
 use Psr\Http\Server\RequestHandlerInterface;
-use Symfony\Component\Translation\TranslatorInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 class SendTestMailController implements RequestHandlerInterface
 {

src/Api/Serializer/GroupSerializer.php

@@ -11,7 +11,7 @@
 
 use Flarum\Group\Group;
 use InvalidArgumentException;
-use Symfony\Component\Translation\TranslatorInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 class GroupSerializer extends AbstractSerializer
 {

src/Forum/Content/Index.php

@@ -18,7 +18,7 @@
 use Illuminate\Contracts\View\Factory;
 use Illuminate\Support\Arr;
 use Psr\Http\Message\ServerRequestInterface as Request;
-use Symfony\Component\Translation\TranslatorInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 class Index
 {

src/Forum/ForumServiceProvider.php

@@ -32,7 +32,7 @@
 use Flarum\Settings\Event\Saving;
 use Flarum\Settings\SettingsRepositoryInterface;
 use Laminas\Stratigility\MiddlewarePipe;
-use Symfony\Component\Translation\TranslatorInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 class ForumServiceProvider extends AbstractServiceProvider
 {

src/Foundation/AbstractValidator.php

@@ -12,7 +12,7 @@
 use Illuminate\Support\Arr;
 use Illuminate\Validation\Factory;
 use Illuminate\Validation\ValidationException;
-use Symfony\Component\Translation\TranslatorInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 abstract class AbstractValidator
 {

src/Foundation/ErrorHandling/ViewFormatter.php

@@ -14,7 +14,7 @@
 use Laminas\Diactoros\Response\HtmlResponse;
 use Psr\Http\Message\ResponseInterface as Response;
 use Psr\Http\Message\ServerRequestInterface as Request;
-use Symfony\Component\Translation\TranslatorInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 /**
  * A formatter for turning caught exceptions into "pretty" HTML error pages.

src/Locale/LocaleServiceProvider.php

@@ -15,7 +15,8 @@
 use Flarum\Settings\SettingsRepositoryInterface;
 use Illuminate\Contracts\Events\Dispatcher;
 use Illuminate\Contracts\Translation\Translator as TranslatorContract;
-use Symfony\Component\Translation\TranslatorInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
+use Symfony\Component\Translation\TranslatorInterface as DeprecatedTranslatorInterface;
 
 class LocaleServiceProvider extends AbstractServiceProvider
 {
@@ -65,6 +66,7 @@ public function register()
         $this->app->alias('translator', Translator::class);
         $this->app->alias('translator', TranslatorContract::class);
         $this->app->alias('translator', TranslatorInterface::class);
+        $this->app->alias('translator', DeprecatedTranslatorInterface::class);
     }
 
     private function getDefaultLocale(): string

src/Locale/Translator.php

@@ -84,4 +84,9 @@ private function getTranslation(MessageCatalogueInterface $catalogue, $id, $doma
 
         return $translation;
     }
+
+    public function setLocale($locale)
+    {
+        parent::setLocale($locale);
+    }
 }

src/Notification/MailableInterface.php

@@ -9,7 +9,7 @@
 
 namespace Flarum\Notification;
 
-use Symfony\Component\Translation\TranslatorInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 interface MailableInterface
 {

src/Notification/NotificationMailer.php

@@ -12,7 +12,7 @@
 use Flarum\User\User;
 use Illuminate\Contracts\Mail\Mailer;
 use Illuminate\Mail\Message;
-use Symfony\Component\Translation\TranslatorInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 class NotificationMailer
 {

src/User/AccountActivationMailer.php

@@ -14,7 +14,7 @@
 use Flarum\Settings\SettingsRepositoryInterface;
 use Flarum\User\Event\Registered;
 use Illuminate\Contracts\Queue\Queue;
-use Symfony\Component\Translation\TranslatorInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 class AccountActivationMailer
 {

src/User/Command/RequestPasswordResetHandler.php

@@ -18,7 +18,7 @@
 use Illuminate\Contracts\Validation\Factory;
 use Illuminate\Database\Eloquent\ModelNotFoundException;
 use Illuminate\Validation\ValidationException;
-use Symfony\Component\Translation\TranslatorInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 class RequestPasswordResetHandler
 {

src/User/EmailConfirmationMailer.php

@@ -14,7 +14,7 @@
 use Flarum\Settings\SettingsRepositoryInterface;
 use Flarum\User\Event\EmailChangeRequested;
 use Illuminate\Contracts\Queue\Queue;
-use Symfony\Component\Translation\TranslatorInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 class EmailConfirmationMailer
 {

tests/integration/extenders/EventTest.php

@@ -18,7 +18,7 @@
 use Flarum\User\User;
 use Illuminate\Contracts\Bus\Dispatcher as BusDispatcher;
 use Illuminate\Contracts\Events\Dispatcher;
-use Symfony\Component\Translation\TranslatorInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 class EventTest extends TestCase
 {