diff options
author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-10-30 20:27:41 +0100 |
---|---|---|
committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-10-30 20:27:41 +0100 |
commit | 4b3c983ab85af2ab09540c4849a9e65843a7ab67 (patch) | |
tree | 83fcdb3959cdd8735fee1f4d7520bf8db8709131 /src/Wallabag/UserBundle | |
parent | f74061f1e1e70f8f1ec1fb72f7cf6e1ed388023c (diff) | |
download | wallabag-4b3c983ab85af2ab09540c4849a9e65843a7ab67.tar.gz wallabag-4b3c983ab85af2ab09540c4849a9e65843a7ab67.tar.zst wallabag-4b3c983ab85af2ab09540c4849a9e65843a7ab67.zip |
Inject parameter instead of service
We are injecting CraueConfig service when we only need to retrieve one or two values from it.
Instead I discovered we can directly inject a value from a service in the service definition!
Diffstat (limited to 'src/Wallabag/UserBundle')
-rw-r--r-- | src/Wallabag/UserBundle/Mailer/AuthCodeMailer.php | 10 | ||||
-rw-r--r-- | src/Wallabag/UserBundle/Resources/config/services.yml | 3 |
2 files changed, 7 insertions, 6 deletions
diff --git a/src/Wallabag/UserBundle/Mailer/AuthCodeMailer.php b/src/Wallabag/UserBundle/Mailer/AuthCodeMailer.php index ca9d18f1..961208f2 100644 --- a/src/Wallabag/UserBundle/Mailer/AuthCodeMailer.php +++ b/src/Wallabag/UserBundle/Mailer/AuthCodeMailer.php | |||
@@ -4,7 +4,6 @@ namespace Wallabag\UserBundle\Mailer; | |||
4 | 4 | ||
5 | use Scheb\TwoFactorBundle\Model\Email\TwoFactorInterface; | 5 | use Scheb\TwoFactorBundle\Model\Email\TwoFactorInterface; |
6 | use Scheb\TwoFactorBundle\Mailer\AuthCodeMailerInterface; | 6 | use Scheb\TwoFactorBundle\Mailer\AuthCodeMailerInterface; |
7 | use Craue\ConfigBundle\Util\Config; | ||
8 | 7 | ||
9 | /** | 8 | /** |
10 | * Custom mailer for TwoFactorBundle email. | 9 | * Custom mailer for TwoFactorBundle email. |
@@ -61,16 +60,17 @@ class AuthCodeMailer implements AuthCodeMailerInterface | |||
61 | * @param \Twig_Environment $twig | 60 | * @param \Twig_Environment $twig |
62 | * @param string $senderEmail | 61 | * @param string $senderEmail |
63 | * @param string $senderName | 62 | * @param string $senderName |
64 | * @param Config $craueConfig Craue\Config instance to get wallabag support url from database | 63 | * @param string $supportUrl wallabag support url |
64 | * @param string $wallabagUrl wallabag instance url | ||
65 | */ | 65 | */ |
66 | public function __construct(\Swift_Mailer $mailer, \Twig_Environment $twig, $senderEmail, $senderName, Config $craueConfig) | 66 | public function __construct(\Swift_Mailer $mailer, \Twig_Environment $twig, $senderEmail, $senderName, $supportUrl, $wallabagUrl) |
67 | { | 67 | { |
68 | $this->mailer = $mailer; | 68 | $this->mailer = $mailer; |
69 | $this->twig = $twig; | 69 | $this->twig = $twig; |
70 | $this->senderEmail = $senderEmail; | 70 | $this->senderEmail = $senderEmail; |
71 | $this->senderName = $senderName; | 71 | $this->senderName = $senderName; |
72 | $this->supportUrl = $craueConfig->get('wallabag_support_url'); | 72 | $this->supportUrl = $supportUrl; |
73 | $this->wallabagUrl = $craueConfig->get('wallabag_url'); | 73 | $this->wallabagUrl = $wallabagUrl; |
74 | } | 74 | } |
75 | 75 | ||
76 | /** | 76 | /** |
diff --git a/src/Wallabag/UserBundle/Resources/config/services.yml b/src/Wallabag/UserBundle/Resources/config/services.yml index eb9c8e67..a8ee721b 100644 --- a/src/Wallabag/UserBundle/Resources/config/services.yml +++ b/src/Wallabag/UserBundle/Resources/config/services.yml | |||
@@ -6,7 +6,8 @@ services: | |||
6 | - "@twig" | 6 | - "@twig" |
7 | - "%scheb_two_factor.email.sender_email%" | 7 | - "%scheb_two_factor.email.sender_email%" |
8 | - "%scheb_two_factor.email.sender_name%" | 8 | - "%scheb_two_factor.email.sender_name%" |
9 | - "@craue_config" | 9 | - '@=service(''craue_config'').get(''wallabag_support_url'')' |
10 | - '@=service(''craue_config'').get(''wallabag_url'')' | ||
10 | 11 | ||
11 | wallabag_user.password_resetting: | 12 | wallabag_user.password_resetting: |
12 | class: Wallabag\UserBundle\EventListener\PasswordResettingListener | 13 | class: Wallabag\UserBundle\EventListener\PasswordResettingListener |