diff options
author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2019-06-21 12:46:53 +0200 |
---|---|---|
committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2019-06-21 12:46:53 +0200 |
commit | a2f4efe6d2a90d8a2b84a275f48a07dc8aa0a84f (patch) | |
tree | 85c658988b4a769c535e8d3c7a34b573e40818c6 /src/Wallabag/UserBundle | |
parent | 0a01a5f195fa00be0290be1871b6f4798e55d0be (diff) | |
download | wallabag-a2f4efe6d2a90d8a2b84a275f48a07dc8aa0a84f.tar.gz wallabag-a2f4efe6d2a90d8a2b84a275f48a07dc8aa0a84f.tar.zst wallabag-a2f4efe6d2a90d8a2b84a275f48a07dc8aa0a84f.zip |
Use Twig 2.0
`mnapoli/piwik-twig-extension` locked Twig to the 1.10 version. The new version is compatible with Twig 2.0
Diffstat (limited to 'src/Wallabag/UserBundle')
-rw-r--r-- | src/Wallabag/UserBundle/Mailer/AuthCodeMailer.php | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/Wallabag/UserBundle/Mailer/AuthCodeMailer.php b/src/Wallabag/UserBundle/Mailer/AuthCodeMailer.php index 2797efde..e131deb6 100644 --- a/src/Wallabag/UserBundle/Mailer/AuthCodeMailer.php +++ b/src/Wallabag/UserBundle/Mailer/AuthCodeMailer.php | |||
@@ -4,6 +4,7 @@ namespace Wallabag\UserBundle\Mailer; | |||
4 | 4 | ||
5 | use Scheb\TwoFactorBundle\Mailer\AuthCodeMailerInterface; | 5 | use Scheb\TwoFactorBundle\Mailer\AuthCodeMailerInterface; |
6 | use Scheb\TwoFactorBundle\Model\Email\TwoFactorInterface; | 6 | use Scheb\TwoFactorBundle\Model\Email\TwoFactorInterface; |
7 | use Twig\Environment; | ||
7 | 8 | ||
8 | /** | 9 | /** |
9 | * Custom mailer for TwoFactorBundle email. | 10 | * Custom mailer for TwoFactorBundle email. |
@@ -56,14 +57,14 @@ class AuthCodeMailer implements AuthCodeMailerInterface | |||
56 | /** | 57 | /** |
57 | * Initialize the auth code mailer with the SwiftMailer object. | 58 | * Initialize the auth code mailer with the SwiftMailer object. |
58 | * | 59 | * |
59 | * @param \Swift_Mailer $mailer | 60 | * @param \Swift_Mailer $mailer |
60 | * @param \Twig_Environment $twig | 61 | * @param Environment $twig |
61 | * @param string $senderEmail | 62 | * @param string $senderEmail |
62 | * @param string $senderName | 63 | * @param string $senderName |
63 | * @param string $supportUrl wallabag support url | 64 | * @param string $supportUrl wallabag support url |
64 | * @param string $wallabagUrl wallabag instance url | 65 | * @param string $wallabagUrl wallabag instance url |
65 | */ | 66 | */ |
66 | public function __construct(\Swift_Mailer $mailer, \Twig_Environment $twig, $senderEmail, $senderName, $supportUrl, $wallabagUrl) | 67 | public function __construct(\Swift_Mailer $mailer, Environment $twig, $senderEmail, $senderName, $supportUrl, $wallabagUrl) |
67 | { | 68 | { |
68 | $this->mailer = $mailer; | 69 | $this->mailer = $mailer; |
69 | $this->twig = $twig; | 70 | $this->twig = $twig; |