github-mirror/framework
github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2025-02-28 16:05:27 +08:00
Code Issues Actions Packages Projects 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 386416c017
commit c8e1d71702
8 changed files with 25 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
framework/core/src/Api/Controller/SendConfirmationEmailController.php
View File

@ -20,7 +20,7 @@ use Flarum\User\Exception\PermissionDeniedException;
use Illuminate\Contracts\Mail\Mailer; use Illuminate\Contracts\Mail\Mailer;
use Illuminate\Mail\Message; use Illuminate\Mail\Message;
use Psr\Http\Message\ServerRequestInterface; use Psr\Http\Message\ServerRequestInterface;
use Symfony\Component\Translation\TranslatorInterface; use Illuminate\Contracts\Translation\Translator;
use Zend\Diactoros\Response\EmptyResponse; use Zend\Diactoros\Response\EmptyResponse;
class SendConfirmationEmailController implements ControllerInterface class SendConfirmationEmailController implements ControllerInterface
@ -43,7 +43,7 @@ class SendConfirmationEmailController implements ControllerInterface
protected $url; protected $url;
/** /**
* @var TranslatorInterface * @var Translator
*/ */
protected $translator; protected $translator;
@ -51,9 +51,9 @@ class SendConfirmationEmailController implements ControllerInterface
* @param \Flarum\Settings\SettingsRepositoryInterface $settings * @param \Flarum\Settings\SettingsRepositoryInterface $settings
* @param Mailer $mailer * @param Mailer $mailer
* @param UrlGenerator $url * @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->settings = $settings;
$this->mailer = $mailer; $this->mailer = $mailer;

8
framework/core/src/Api/Serializer/GroupSerializer.php
View File

@ -13,7 +13,7 @@ namespace Flarum\Api\Serializer;
use Flarum\Group\Group; use Flarum\Group\Group;
use InvalidArgumentException; use InvalidArgumentException;
use Symfony\Component\Translation\TranslatorInterface; use Illuminate\Contracts\Translation\Translator;
class GroupSerializer extends AbstractSerializer class GroupSerializer extends AbstractSerializer
{ {
@ -23,14 +23,14 @@ class GroupSerializer extends AbstractSerializer
protected $type = 'groups'; protected $type = 'groups';
/** /**
* @var TranslatorInterface * @var Translator
*/ */
private $translator; private $translator;
/** /**
* @param TranslatorInterface $translator * @param Translator $translator
*/ */
public function __construct(TranslatorInterface $translator) public function __construct(Translator $translator)
{ {
$this->translator = $translator; $this->translator = $translator;
} }

6
framework/core/src/Forum/Controller/ResetPasswordController.php
View File

@ -17,7 +17,7 @@ use Flarum\User\Exception\InvalidConfirmationTokenException;
use Flarum\User\PasswordToken; use Flarum\User\PasswordToken;
use Illuminate\Contracts\View\Factory; use Illuminate\Contracts\View\Factory;
use Psr\Http\Message\ServerRequestInterface as Request; use Psr\Http\Message\ServerRequestInterface as Request;
use Symfony\Component\Translation\TranslatorInterface; use Illuminate\Contracts\Translation\Translator;
class ResetPasswordController extends AbstractHtmlController class ResetPasswordController extends AbstractHtmlController
{ {
@ -27,14 +27,14 @@ class ResetPasswordController extends AbstractHtmlController
protected $view; protected $view;
/** /**
* @var TranslatorInterface * @var Translator
*/ */
protected $translator; protected $translator;
/** /**
* @param Factory $view * @param Factory $view
*/ */
public function __construct(Factory $view, TranslatorInterface $translator) public function __construct(Factory $view, Translator $translator)
{ {
$this->view = $view; $this->view = $view;
$this->translator = $translator; $this->translator = $translator;

8
framework/core/src/Foundation/AbstractValidator.php
View File

@ -15,7 +15,7 @@ use Flarum\Foundation\Event\Validating;
use Illuminate\Contracts\Events\Dispatcher; use Illuminate\Contracts\Events\Dispatcher;
use Illuminate\Contracts\Validation\ValidationException; use Illuminate\Contracts\Validation\ValidationException;
use Illuminate\Validation\Factory; use Illuminate\Validation\Factory;
use Symfony\Component\Translation\TranslatorInterface; use Illuminate\Contracts\Translation\Translator;
abstract class AbstractValidator abstract class AbstractValidator
{ {
@ -35,16 +35,16 @@ abstract class AbstractValidator
protected $events; protected $events;
/** /**
* @var TranslatorInterface * @var Translator
*/ */
protected $translator; protected $translator;
/** /**
* @param Factory $validator * @param Factory $validator
* @param Dispatcher $events * @param Dispatcher $events
* @param TranslatorInterface $translator * @param Translator $translator
*/ */
public function __construct(Factory $validator, Dispatcher $events, TranslatorInterface $translator) public function __construct(Factory $validator, Dispatcher $events, Translator $translator)
{ {
$this->validator = $validator; $this->validator = $validator;
$this->events = $events; $this->events = $events;

4
framework/core/src/Install/Console/InstallCommand.php
View File

@ -36,7 +36,7 @@ use Illuminate\Filesystem\Filesystem;
use Illuminate\Validation\Factory; use Illuminate\Validation\Factory;
use PDO; use PDO;
use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Input\InputOption;
use Symfony\Component\Translation\TranslatorInterface; use Illuminate\Contracts\Translation\Translator;
class InstallCommand extends AbstractCommand class InstallCommand extends AbstractCommand
{ {
@ -409,7 +409,7 @@ class InstallCommand extends AbstractCommand
*/ */
protected function getValidator() protected function getValidator()
{ {
return new Factory($this->application->make(TranslatorInterface::class)); return new Factory($this->application->make(Translator::class));
} }
protected function showErrors($errors) protected function showErrors($errors)

2
framework/core/src/Locale/LocaleServiceProvider.php
View File

@ -16,7 +16,6 @@ use Flarum\Foundation\AbstractServiceProvider;
use Illuminate\Contracts\Events\Dispatcher; use Illuminate\Contracts\Events\Dispatcher;
use Illuminate\Contracts\Translation\Translator as TranslatorContract; use Illuminate\Contracts\Translation\Translator as TranslatorContract;
use Symfony\Component\Translation\MessageSelector; use Symfony\Component\Translation\MessageSelector;
use Symfony\Component\Translation\TranslatorInterface;
class LocaleServiceProvider extends AbstractServiceProvider class LocaleServiceProvider extends AbstractServiceProvider
{ {
@ -48,7 +47,6 @@ class LocaleServiceProvider extends AbstractServiceProvider
return $translator; return $translator;
}); });
$this->app->alias('translator', Translator::class); $this->app->alias('translator', Translator::class);
$this->app->alias('translator', TranslatorInterface::class);
$this->app->alias('translator', TranslatorContract::class); $this->app->alias('translator', TranslatorContract::class);
} }

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

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

8
framework/core/src/User/EmailConfirmationMailer.php
View File

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