mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-10-18 18:26:07 +02:00
Code Issues Releases Wiki Activity

replaced the Symfony\Component\Translation\TranslationInterface with the Illuminate\Contracts\Translation\Translator, deprecating the Symfony version

Browse Source
This commit is contained in:
Daniel Klabbers
2017-11-27 10:42:16 +01:00
parent 7b2663e0bc
commit 642332ffe2
8 changed files with 25 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/User/Command/RequestPasswordResetHandler.php
View File

@@ -20,7 +20,7 @@ use Illuminate\Contracts\Validation\Factory;
use Illuminate\Contracts\Validation\ValidationException;
use Illuminate\Database\Eloquent\ModelNotFoundException;
use Illuminate\Mail\Message;
use Symfony\Component\Translation\TranslatorInterface;
use Illuminate\Contracts\Translation\Translator;
class RequestPasswordResetHandler
{
@@ -45,7 +45,7 @@ class RequestPasswordResetHandler
protected $url;
/**
* @var TranslatorInterface
* @var Translator
*/
protected $translator;
@@ -59,7 +59,7 @@ class RequestPasswordResetHandler
* @param SettingsRepositoryInterface $settings
* @param Mailer $mailer
* @param UrlGenerator $url
* @param TranslatorInterface $translator
* @param Translator $translator
* @param Factory $validatorFactory
*/
public function __construct(
@@ -67,7 +67,7 @@ class RequestPasswordResetHandler
SettingsRepositoryInterface $settings,
Mailer $mailer,
UrlGenerator $url,
TranslatorInterface $translator,
Translator $translator,
Factory $validatorFactory
) {
$this->users = $users;

8
src/User/EmailConfirmationMailer.php
View File

@@ -18,7 +18,7 @@ use Flarum\User\Event\Registered;
use Illuminate\Contracts\Events\Dispatcher;
use Illuminate\Contracts\Mail\Mailer;
use Illuminate\Mail\Message;
use Symfony\Component\Translation\TranslatorInterface;
use Illuminate\Contracts\Translation\Translator;
class EmailConfirmationMailer
{
@@ -38,7 +38,7 @@ class EmailConfirmationMailer
protected $url;
/**
* @var TranslatorInterface
* @var Translator
*/
protected $translator;
@@ -46,9 +46,9 @@ class EmailConfirmationMailer
* @param \Flarum\Settings\SettingsRepositoryInterface $settings
* @param Mailer $mailer
* @param UrlGenerator $url
* @param TranslatorInterface $translator
* @param Translator $translator
*/
public function __construct(SettingsRepositoryInterface $settings, Mailer $mailer, UrlGenerator $url, TranslatorInterface $translator)
public function __construct(SettingsRepositoryInterface $settings, Mailer $mailer, UrlGenerator $url, Translator $translator)
{
$this->settings = $settings;
$this->mailer = $mailer;