mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-12-22 23:56:29 +00:00
Code Issues Projects Releases Wiki Activity

Use translator interface instead of final class

Browse source 
Symfony use a different class when in dev mode and prod mode.

Prod loads `Symfony\Bundle\FrameworkBundle\Translation\Translator`.
Dev loads `Symfony\Component\Translation\DataCollectorTranslator` to gather information for the debug bar.

Fix #1585
This commit is contained in:
Jeremy Benoist 2016-01-17 12:52:30 +01:00
parent 3bcc4d4cb2
commit e678c4752a
3 changed files with 14 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Wallabag/CoreBundle/Repository/EntryRepository.php
View file

@ -255,7 +255,7 @@ class EntryRepository extends EntityRepository
*
* @param int $userId
*
* @return integer
* @return int
*/
public function countAllEntriesByUsername($userId)
{

16
src/Wallabag/UserBundle/Mailer/AuthCodeMailer.php
View file

@ -4,7 +4,7 @@ namespace Wallabag\UserBundle\Mailer;
use Scheb\TwoFactorBundle\Model\Email\TwoFactorInterface;
use Scheb\TwoFactorBundle\Mailer\AuthCodeMailerInterface;
use Symfony\Component\Translation\DataCollectorTranslator;
use Symfony\Component\Translation\TranslatorInterface;
/**
* Custom mailer for TwoFactorBundle email.
@ -22,7 +22,7 @@ class AuthCodeMailer implements AuthCodeMailerInterface
/**
* Translator for email content.
*
* @var DataCollectorTranslator
* @var TranslatorInterface
*/
private $translator;
@ -50,13 +50,13 @@ class AuthCodeMailer implements AuthCodeMailerInterface
/**
* Initialize the auth code mailer with the SwiftMailer object.
*
* @param \Swift_Mailer $mailer
* @param DataCollectorTranslator $translator
* @param string $senderEmail
* @param string $senderName
* @param string $supportUrl
* @param \Swift_Mailer $mailer
* @param TranslatorInterface $translator
* @param string $senderEmail
* @param string $senderName
* @param string $supportUrl
*/
public function __construct(\Swift_Mailer $mailer, DataCollectorTranslator $translator, $senderEmail, $senderName, $supportUrl)
public function __construct(\Swift_Mailer $mailer, TranslatorInterface $translator, $senderEmail, $senderName, $supportUrl)
{
$this->mailer = $mailer;
$this->translator = $translator;

13
src/Wallabag/UserBundle/Tests/Mailer/AuthCodeMailerTest.php
View file

@ -6,7 +6,6 @@ use Wallabag\UserBundle\Entity\User;
use Wallabag\UserBundle\Mailer\AuthCodeMailer;
use Symfony\Component\Translation\Translator;
use Symfony\Component\Translation\Loader\ArrayLoader;
use Symfony\Component\Translation\DataCollectorTranslator;
/**
* @see https://www.pmg.com/blog/integration-testing-swift-mailer/
@ -28,7 +27,7 @@ class AuthCodeMailerTest extends \PHPUnit_Framework_TestCase
{
protected $mailer;
protected $spool;
protected $dataCollector;
protected $translator;
protected function setUp()
{
@ -39,14 +38,12 @@ class AuthCodeMailerTest extends \PHPUnit_Framework_TestCase
);
$this->mailer = new \Swift_Mailer($transport);
$translator = new Translator('en');
$translator->addLoader('array', new ArrayLoader());
$translator->addResource('array', array(
$this->translator = new Translator('en');
$this->translator->addLoader('array', new ArrayLoader());
$this->translator->addResource('array', array(
'auth_code.mailer.subject' => 'auth_code subject',
'auth_code.mailer.body' => 'Hi %user%, here is the code: %code% and the support: %support%',
), 'en', 'wallabag_user');
$this->dataCollector = new DataCollectorTranslator($translator);
}
public function testSendEmail()
@ -59,7 +56,7 @@ class AuthCodeMailerTest extends \PHPUnit_Framework_TestCase
$authCodeMailer = new AuthCodeMailer(
$this->mailer,
$this->dataCollector,
$this->translator,
'nobody@test.io',
'wallabag test',
'http://0.0.0.0'