Commit 7dbd120a authored by Bertrand Gauthier's avatar Bertrand Gauthier
Browse files

Notifications par mail : utilisation généralisée de factories de notifications

parent af4ed421

module/Application/config/others/notification.config.php

+3 −4
Original line number Diff line number Diff line
@@ -2,14 +2,13 @@ 


namespace Application;



use Application\Service\Notification\NotifierService;

use Application\Service\Notification\NotifierServiceFactory;

use Application\Service\Notification\ApplicationNotificationFactory;

use Application\Service\Notification\ApplicationNotificationFactoryFactory;



return [

    'service_manager' => [

        'factories' => [

            NotifierService::class                       => NotifierServiceFactory::class,

            \Notification\Service\NotifierService::class => NotifierServiceFactory::class, // substitution

            ApplicationNotificationFactory::class => ApplicationNotificationFactoryFactory::class,

        ],

    ],

];
 
 No newline at end of file

module/Application/src/Application/Controller/Factory/ListeDiffusionControllerFactory.php

+2 −2
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ use Structure\Service\Etablissement\EtablissementService; 
use Fichier\Service\Fichier\FichierStorageService;

use Individu\Service\IndividuService;

use Application\Service\ListeDiffusion\ListeDiffusionService;

use Application\Service\Notification\NotifierService;

use Notification\Service\NotifierService;

use Application\Service\Role\RoleService;

use Structure\Service\Structure\StructureService;

use Interop\Container\ContainerInterface;
@@ -41,7 +41,7 @@ class ListeDiffusionControllerFactory 
         * @var NotifierService $notifierService

         */

        $notifierService = $container->get(NotifierService::class);

        $controller->setApplicationNotifierService($notifierService);

        $controller->setNotifierService($notifierService);



        /**

         * @var RoleService $roleService

module/Application/src/Application/Controller/Factory/MailConfirmationControllerFactory.php

+10 −7
Original line number Diff line number Diff line
@@ -4,20 +4,19 @@ namespace Application\Controller\Factory; 


use Application\Controller\MailConfirmationController;

use Application\Form\MailConfirmationForm;

use Application\Service\Notification\ApplicationNotificationFactory;

use Individu\Service\IndividuService;

use Application\Service\MailConfirmationService;

use Application\Service\Notification\NotifierService;

use Notification\Service\NotifierService;

use Interop\Container\ContainerInterface;



class MailConfirmationControllerFactory

{

    /**

     * Create service

     *

     * @param ContainerInterface $container

     * @return MailConfirmationController

     * @throws \Psr\Container\NotFoundExceptionInterface

     * @throws \Psr\Container\ContainerExceptionInterface

     */

    public function __invoke(ContainerInterface $container)

    public function __invoke(ContainerInterface $container): MailConfirmationController

    {

        /**

         * @var MailConfirmationService $mailConfirmationService
@@ -34,9 +33,13 @@ class MailConfirmationControllerFactory 
        $controller = new MailConfirmationController();

        $controller->setMailConfirmationService($mailConfirmationService);

        $controller->setIndividuService($individuService);

        $controller->setApplicationNotifierService($notifierService);

        $controller->setNotifierService($notifierService);

        $controller->setMailConfirmationForm($mailConfirmationForm);



        /** @var \Application\Service\Notification\ApplicationNotificationFactory $applicationNotificationFactory */

        $applicationNotificationFactory = $container->get(ApplicationNotificationFactory::class);

        $controller->setApplicationNotificationFactory($applicationNotificationFactory);



        return $controller;

    }

}
 
 No newline at end of file

module/Application/src/Application/Controller/Factory/Rapport/RapportCsiControllerFactory.php

+0 −4
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ use Application\Form\RapportCsiForm; 
use ComiteSuiviIndividuel\Service\Membre\MembreService;

use Fichier\Service\Fichier\FichierService;

use Individu\Service\IndividuService;

use Application\Service\Notification\NotifierService;

use Application\Service\Rapport\RapportService;

use These\Service\These\TheseService;

use These\Service\TheseAnneeUniv\TheseAnneeUnivService;
@@ -33,7 +32,6 @@ class RapportCsiControllerFactory 
         * @var FichierService        $fichierService

         * @var RapportService        $rapportService

         * @var VersionFichierService $versionFichierService

         * @var NotifierService       $notificationService

         * @var IndividuService       $individuService

         * @var ValidationService     $validationService

         * @var RapportForm           $rapportForm
@@ -44,7 +42,6 @@ class RapportCsiControllerFactory 
        $fichierService = $container->get(FichierService::class);

        $rapportService = $container->get(RapportService::class);

        $versionFichierService = $container->get('VersionFichierService');

        $notificationService = $container->get(NotifierService::class);

        $individuService = $container->get(IndividuService::class);

        $rapportForm = $container->get('FormElementManager')->get(RapportCsiForm::class);

        $validationService = $container->get(ValidationService::class);
@@ -59,7 +56,6 @@ class RapportCsiControllerFactory 
        $controller->setRapportService($rapportService);

        $controller->setFichierService($fichierService);

        $controller->setVersionFichierService($versionFichierService);

        $controller->setApplicationNotifierService($notificationService);

        $controller->setIndividuService($individuService);

        $controller->setForm($rapportForm);

        $controller->setValidationService($validationService);

module/Application/src/Application/Controller/Factory/Rapport/RapportMiparcoursControllerFactory.php

+0 −4
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ use Application\Form\Rapport\RapportForm; 
use Application\Form\RapportMiparcoursForm;

use Fichier\Service\Fichier\FichierService;

use Individu\Service\IndividuService;

use Application\Service\Notification\NotifierService;

use Application\Service\Rapport\RapportService;

use These\Service\These\TheseService;

use These\Service\TheseAnneeUniv\TheseAnneeUnivService;
@@ -32,7 +31,6 @@ class RapportMiparcoursControllerFactory 
         * @var FichierService        $fichierService

         * @var RapportService        $rapportService

         * @var VersionFichierService $versionFichierService

         * @var NotifierService       $notificationService

         * @var IndividuService       $individuService

         * @var ValidationService     $validationService

         * @var RapportForm           $rapportForm
@@ -41,7 +39,6 @@ class RapportMiparcoursControllerFactory 
        $fichierService = $container->get(FichierService::class);

        $rapportService = $container->get(RapportService::class);

        $versionFichierService = $container->get('VersionFichierService');

        $notificationService = $container->get(NotifierService::class);

        $individuService = $container->get(IndividuService::class);

        $rapportForm = $container->get('FormElementManager')->get(RapportMiparcoursForm::class);

        $validationService = $container->get(ValidationService::class);
@@ -54,7 +51,6 @@ class RapportMiparcoursControllerFactory 
        $controller->setRapportService($rapportService);

        $controller->setFichierService($fichierService);

        $controller->setVersionFichierService($versionFichierService);

        $controller->setApplicationNotifierService($notificationService);

        $controller->setIndividuService($individuService);

        $controller->setForm($rapportForm);

        $controller->setValidationService($validationService);