oss/wallabag
oss/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2025-10-05 19:31:02 +00:00
Code Wiki Activity

Use Twig 2.0

Browse source 
`mnapoli/piwik-twig-extension` locked Twig to the 1.10 version. The new version is compatible with Twig 2.0
This commit is contained in:
Jeremy Benoist 2019-06-21 12:46:53 +02:00
parent 0a01a5f195
commit a2f4efe6d2
No known key found for this signature in database
GPG key ID: BCA73962457ACC3C
6 changed files with 56 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -4,6 +4,7 @@ namespace Wallabag\UserBundle\Mailer;
use Scheb\TwoFactorBundle\Mailer\AuthCodeMailerInterface;
use Scheb\TwoFactorBundle\Model\Email\TwoFactorInterface;
use Twig\Environment;
/**
* Custom mailer for TwoFactorBundle email.
@ -56,14 +57,14 @@ class AuthCodeMailer implements AuthCodeMailerInterface
/**
* Initialize the auth code mailer with the SwiftMailer object.
*
* @param \Swift_Mailer $mailer
* @param \Twig_Environment $twig
* @param string $senderEmail
* @param string $senderName
* @param string $supportUrl wallabag support url
* @param string $wallabagUrl wallabag instance url
* @param \Swift_Mailer $mailer
* @param Environment $twig
* @param string $senderEmail
* @param string $senderName
* @param string $supportUrl wallabag support url
* @param string $wallabagUrl wallabag instance url
*/
public function __construct(\Swift_Mailer $mailer, \Twig_Environment $twig, $senderEmail, $senderName, $supportUrl, $wallabagUrl)
public function __construct(\Swift_Mailer $mailer, Environment $twig, $senderEmail, $senderName, $supportUrl, $wallabagUrl)
{
$this->mailer = $mailer;
$this->twig = $twig;