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

reverting translator contract

Browse Source
This commit is contained in:
Daniël Klabbers
2017-11-29 06:26:48 +01:00
parent c01268d9ae
commit 6280fb2498
4 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,9 +18,9 @@ use Flarum\User\AssertPermissionTrait;
use Flarum\User\EmailToken; use Flarum\User\EmailToken;
use Flarum\User\Exception\PermissionDeniedException; use Flarum\User\Exception\PermissionDeniedException;
use Illuminate\Contracts\Mail\Mailer; use Illuminate\Contracts\Mail\Mailer;
use Illuminate\Contracts\Translation\Translator;
use Illuminate\Mail\Message; use Illuminate\Mail\Message;
use Psr\Http\Message\ServerRequestInterface; use Psr\Http\Message\ServerRequestInterface;
use Symfony\Component\Translation\TranslatorInterface;
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 Translator * @var TranslatorInterface
*/ */
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 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->settings = $settings;
$this->mailer = $mailer; $this->mailer = $mailer;

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

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

7
src/Forum/Controller/ResetPasswordController.php
View File

@ -15,9 +15,9 @@ use DateTime;
use Flarum\Http\Controller\AbstractHtmlController; use Flarum\Http\Controller\AbstractHtmlController;
use Flarum\User\Exception\InvalidConfirmationTokenException; use Flarum\User\Exception\InvalidConfirmationTokenException;
use Flarum\User\PasswordToken; use Flarum\User\PasswordToken;
use Illuminate\Contracts\Translation\Translator;
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;
class ResetPasswordController extends AbstractHtmlController class ResetPasswordController extends AbstractHtmlController
{ {
@ -27,14 +27,15 @@ class ResetPasswordController extends AbstractHtmlController
protected $view; protected $view;
/** /**
* @var Translator * @var TranslatorInterface
*/ */
protected $translator; protected $translator;
/** /**
* @param Factory $view * @param Factory $view
* @param TranslatorInterface $translator
*/ */
public function __construct(Factory $view, Translator $translator) public function __construct(Factory $view, TranslatorInterface $translator)
{ {
$this->view = $view; $this->view = $view;
$this->translator = $translator; $this->translator = $translator;

8
src/Foundation/AbstractValidator.php
View File

@ -13,9 +13,9 @@ namespace Flarum\Foundation;
use Flarum\Foundation\Event\Validating; use Flarum\Foundation\Event\Validating;
use Illuminate\Contracts\Events\Dispatcher; use Illuminate\Contracts\Events\Dispatcher;
use Illuminate\Contracts\Translation\Translator;
use Illuminate\Contracts\Validation\ValidationException; use Illuminate\Contracts\Validation\ValidationException;
use Illuminate\Validation\Factory; use Illuminate\Validation\Factory;
use Symfony\Component\Translation\TranslatorInterface;
abstract class AbstractValidator abstract class AbstractValidator
{ {
@ -35,16 +35,16 @@ abstract class AbstractValidator
protected $events; protected $events;
/** /**
* @var Translator * @var TranslatorInterface
*/ */
protected $translator; protected $translator;
/** /**
* @param Factory $validator * @param Factory $validator
* @param Dispatcher $events * @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->validator = $validator;
$this->events = $events; $this->events = $events;