1
0
mirror of https://github.com/flarum/core.git synced 2025-10-26 21:21:28 +01:00

Inject Symfony translator contract, not Laravel's

The Laravel changes with v6, and our translator is primarily an
implementation of the Symfony contract.
This commit is contained in:
Franz Liedke
2020-07-24 17:31:46 +02:00
parent e4077ab4ad
commit 7fd23ff950
4 changed files with 19 additions and 14 deletions

View File

@@ -15,10 +15,10 @@ use Flarum\Settings\SettingsRepositoryInterface;
use Flarum\User\PasswordToken;
use Flarum\User\UserRepository;
use Illuminate\Contracts\Queue\Queue;
use Illuminate\Contracts\Translation\Translator;
use Illuminate\Contracts\Validation\Factory;
use Illuminate\Database\Eloquent\ModelNotFoundException;
use Illuminate\Validation\ValidationException;
use Symfony\Component\Translation\TranslatorInterface;
class RequestPasswordResetHandler
{
@@ -43,7 +43,7 @@ class RequestPasswordResetHandler
protected $url;
/**
* @var Translator
* @var TranslatorInterface
*/
protected $translator;
@@ -57,7 +57,7 @@ class RequestPasswordResetHandler
* @param SettingsRepositoryInterface $settings
* @param Queue $queue
* @param UrlGenerator $url
* @param Translator $translator
* @param TranslatorInterface $translator
* @param Factory $validatorFactory
*/
public function __construct(
@@ -65,7 +65,7 @@ class RequestPasswordResetHandler
SettingsRepositoryInterface $settings,
Queue $queue,
UrlGenerator $url,
Translator $translator,
TranslatorInterface $translator,
Factory $validatorFactory
) {
$this->users = $users;