mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-12-24 16:40:30 +00:00
Code Issues Projects Releases Wiki Activity

Fix #1643: fix the way to load the HTML template in 2factor auth

Browse source
This commit is contained in:
Nicolas Lœuillet 2016-02-04 17:29:14 +01:00
parent e008c037f5
commit 855a4c680f
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Wallabag/CoreBundle/Tests/Controller/SettingsControllerTest.php
View file

@ -6,7 +6,7 @@ use Wallabag\CoreBundle\Tests\WallabagCoreTestCase;
/** /**
* The controller `SettingsController` does not exist. * The controller `SettingsController` does not exist.
* This test cover security against the internal settings page managed by CraueConfigBundle * This test cover security against the internal settings page managed by CraueConfigBundle.
*/ */
class SettingsControllerTest extends WallabagCoreTestCase class SettingsControllerTest extends WallabagCoreTestCase
{ {

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

@ -48,7 +48,7 @@ class AuthCodeMailer implements AuthCodeMailerInterface
private $supportUrl; private $supportUrl;
/** /**
* Url for the wallabag instance (only used for image in the HTML email template) * Url for the wallabag instance (only used for image in the HTML email template).
* *
* @var string * @var string
*/ */
@ -80,7 +80,7 @@ class AuthCodeMailer implements AuthCodeMailerInterface
*/ */
public function sendAuthCode(TwoFactorInterface $user) public function sendAuthCode(TwoFactorInterface $user)
{ {
$template = $this->twig->loadTemplate('@WallabagUserBundle/Resources/views/TwoFactor/email_auth_code.html.twig'); $template = $this->twig->loadTemplate('WallabagUserBundle:TwoFactor:email_auth_code.html.twig');
$subject = $template->renderBlock('subject', array()); $subject = $template->renderBlock('subject', array());
$bodyHtml = $template->renderBlock('body_html', [ $bodyHtml = $template->renderBlock('body_html', [

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

@ -43,7 +43,7 @@ class AuthCodeMailerTest extends \PHPUnit_Framework_TestCase
{% block body_text %}text body {{ support_url }}{% endblock %} {% block body_text %}text body {{ support_url }}{% endblock %}
TWIG; TWIG;
$this->twig = new \Twig_Environment(new \Twig_Loader_Array(array('@WallabagUserBundle/Resources/views/TwoFactor/email_auth_code.html.twig' => $twigTemplate))); $this->twig = new \Twig_Environment(new \Twig_Loader_Array(array('WallabagUserBundle:TwoFactor:email_auth_code.html.twig' => $twigTemplate)));
$this->config = $this->getMockBuilder('Craue\ConfigBundle\Util\Config') $this->config = $this->getMockBuilder('Craue\ConfigBundle\Util\Config')
->disableOriginalConstructor() ->disableOriginalConstructor()