Loading module/Mailing/src/Mailing/Service/Mailing/MailingServiceFactory.php +10 −14 Original line number Diff line number Diff line Loading @@ -3,6 +3,7 @@ namespace Mailing\Service\Mailing; use Doctrine\ORM\EntityManager; use Interop\Container\ContainerInterface; use Mailing\Service\MailType\MailTypeService; use UnicaenApp\Options\ModuleOptions; use UnicaenParametre\Service\Parametre\ParametreService; Loading @@ -10,21 +11,16 @@ use UnicaenUtilisateur\Service\User\UserService; use Zend\Mail\Transport\Smtp; use Zend\Mail\Transport\SmtpOptions; use Zend\Mail\Transport\TransportInterface; use Zend\ServiceManager\ServiceLocatorInterface; // use Zend\View\Resolver\TemplatePathStack; class MailingServiceFactory { public function __invoke(ServiceLocatorInterface $serviceLocator) public function __invoke(ContainerInterface $container) { /** @var TransportInterface */ $options = $serviceLocator->get('unicaen-app_module_options'); $config = $container->get('Configuration')['unicaen-mail']; /* @var ModuleOptions $options */ $mailOptions = $options->getMail(); $transport = new Smtp(new SmtpOptions($mailOptions['transport_options'])); $rendererService = $serviceLocator->get('ViewRenderer'); $resolver = $rendererService->resolver(); // $resolver->attach(new TemplatePathStack(['script_paths' => [__DIR__]])); $transport = new Smtp(new SmtpOptions($config['transport_options'])); $rendererService = $container->get('ViewRenderer'); /** * @var EntityManager $entityManager Loading @@ -32,13 +28,13 @@ class MailingServiceFactory { * @var ParametreService $parametreService * @var UserService $userService */ $entityManager = $serviceLocator->get('doctrine.entitymanager.orm_default'); $mailTypeService = $serviceLocator->get(MailTypeService::class); $parametreService = $serviceLocator->get(ParametreService::class); $userService = $serviceLocator->get(UserService::class); $entityManager = $container->get('doctrine.entitymanager.orm_default'); $mailTypeService = $container->get(MailTypeService::class); $parametreService = $container->get(ParametreService::class); $userService = $container->get(UserService::class); /** @var MailingService $service */ $service = new MailingService($transport, $mailOptions['redirect_to'], $mailOptions['do_not_send']); $service = new MailingService($transport, $config['redirect_to'], $config['do_not_send']); $service->setEntityManager($entityManager); $service->setMailTypeService($mailTypeService); $service->setParametreService($parametreService); Loading Loading
module/Mailing/src/Mailing/Service/Mailing/MailingServiceFactory.php +10 −14 Original line number Diff line number Diff line Loading @@ -3,6 +3,7 @@ namespace Mailing\Service\Mailing; use Doctrine\ORM\EntityManager; use Interop\Container\ContainerInterface; use Mailing\Service\MailType\MailTypeService; use UnicaenApp\Options\ModuleOptions; use UnicaenParametre\Service\Parametre\ParametreService; Loading @@ -10,21 +11,16 @@ use UnicaenUtilisateur\Service\User\UserService; use Zend\Mail\Transport\Smtp; use Zend\Mail\Transport\SmtpOptions; use Zend\Mail\Transport\TransportInterface; use Zend\ServiceManager\ServiceLocatorInterface; // use Zend\View\Resolver\TemplatePathStack; class MailingServiceFactory { public function __invoke(ServiceLocatorInterface $serviceLocator) public function __invoke(ContainerInterface $container) { /** @var TransportInterface */ $options = $serviceLocator->get('unicaen-app_module_options'); $config = $container->get('Configuration')['unicaen-mail']; /* @var ModuleOptions $options */ $mailOptions = $options->getMail(); $transport = new Smtp(new SmtpOptions($mailOptions['transport_options'])); $rendererService = $serviceLocator->get('ViewRenderer'); $resolver = $rendererService->resolver(); // $resolver->attach(new TemplatePathStack(['script_paths' => [__DIR__]])); $transport = new Smtp(new SmtpOptions($config['transport_options'])); $rendererService = $container->get('ViewRenderer'); /** * @var EntityManager $entityManager Loading @@ -32,13 +28,13 @@ class MailingServiceFactory { * @var ParametreService $parametreService * @var UserService $userService */ $entityManager = $serviceLocator->get('doctrine.entitymanager.orm_default'); $mailTypeService = $serviceLocator->get(MailTypeService::class); $parametreService = $serviceLocator->get(ParametreService::class); $userService = $serviceLocator->get(UserService::class); $entityManager = $container->get('doctrine.entitymanager.orm_default'); $mailTypeService = $container->get(MailTypeService::class); $parametreService = $container->get(ParametreService::class); $userService = $container->get(UserService::class); /** @var MailingService $service */ $service = new MailingService($transport, $mailOptions['redirect_to'], $mailOptions['do_not_send']); $service = new MailingService($transport, $config['redirect_to'], $config['do_not_send']); $service->setEntityManager($entityManager); $service->setMailTypeService($mailTypeService); $service->setParametreService($parametreService); Loading