forked from wallabag/wallabag
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!
This commit is contained in:
@ -4,7 +4,6 @@ namespace Wallabag\UserBundle\Mailer;
|
||||
|
||||
use Scheb\TwoFactorBundle\Model\Email\TwoFactorInterface;
|
||||
use Scheb\TwoFactorBundle\Mailer\AuthCodeMailerInterface;
|
||||
use Craue\ConfigBundle\Util\Config;
|
||||
|
||||
/**
|
||||
* Custom mailer for TwoFactorBundle email.
|
||||
@ -61,16 +60,17 @@ class AuthCodeMailer implements AuthCodeMailerInterface
|
||||
* @param \Twig_Environment $twig
|
||||
* @param string $senderEmail
|
||||
* @param string $senderName
|
||||
* @param Config $craueConfig Craue\Config instance to get wallabag support url from database
|
||||
* @param string $supportUrl wallabag support url
|
||||
* @param string $wallabagUrl wallabag instance url
|
||||
*/
|
||||
public function __construct(\Swift_Mailer $mailer, \Twig_Environment $twig, $senderEmail, $senderName, Config $craueConfig)
|
||||
public function __construct(\Swift_Mailer $mailer, \Twig_Environment $twig, $senderEmail, $senderName, $supportUrl, $wallabagUrl)
|
||||
{
|
||||
$this->mailer = $mailer;
|
||||
$this->twig = $twig;
|
||||
$this->senderEmail = $senderEmail;
|
||||
$this->senderName = $senderName;
|
||||
$this->supportUrl = $craueConfig->get('wallabag_support_url');
|
||||
$this->wallabagUrl = $craueConfig->get('wallabag_url');
|
||||
$this->supportUrl = $supportUrl;
|
||||
$this->wallabagUrl = $wallabagUrl;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@ -6,7 +6,8 @@ services:
|
||||
- "@twig"
|
||||
- "%scheb_two_factor.email.sender_email%"
|
||||
- "%scheb_two_factor.email.sender_name%"
|
||||
- "@craue_config"
|
||||
- '@=service(''craue_config'').get(''wallabag_support_url'')'
|
||||
- '@=service(''craue_config'').get(''wallabag_url'')'
|
||||
|
||||
wallabag_user.password_resetting:
|
||||
class: Wallabag\UserBundle\EventListener\PasswordResettingListener
|
||||
|
||||
Reference in New Issue
Block a user