Commit f1557691 authored by Jean-Philippe Metivier's avatar Jean-Philippe Metivier
Browse files

Fixing mauvais usage de l'ancien ParametreService

parent 2e92353c
Loading
Loading
Loading
Loading
+4 −3
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ use Soutenance\Entity\Evenement;
use Soutenance\Entity\Membre;
use Soutenance\Form\AdresseSoutenance\AdresseSoutenanceFormAwareTrait;
use Soutenance\Form\DateRenduRapport\DateRenduRapportFormAwareTrait;
use Soutenance\Provider\Parametre\SoutenanceParametres;
use Soutenance\Service\Avis\AvisServiceAwareTrait;
use Soutenance\Service\EngagementImpartialite\EngagementImpartialiteServiceAwareTrait;
use Soutenance\Service\Evenement\EvenementServiceAwareTrait;
@@ -39,7 +40,6 @@ use Soutenance\Service\Justificatif\JustificatifServiceAwareTrait;
use Soutenance\Service\Membre\MembreServiceAwareTrait;
use Soutenance\Service\Notification\SoutenanceNotificationFactoryAwareTrait;
use Notification\Service\NotifierServiceAwareTrait;
use Soutenance\Service\Parametre\ParametreServiceAwareTrait;
use Soutenance\Service\Proposition\PropositionServiceAwareTrait;
use Soutenance\Service\Validation\ValidatationServiceAwareTrait;
use Structure\Entity\Db\Etablissement;
@@ -51,6 +51,7 @@ use These\Service\These\TheseServiceAwareTrait;
use UnicaenApp\Exception\RuntimeException;
use UnicaenAuth\Service\Traits\UserServiceAwareTrait;
use UnicaenAuthToken\Service\TokenServiceAwareTrait;
use UnicaenParametre\Service\Parametre\ParametreServiceAwareTrait;

/** @method FlashMessenger flashMessenger() */

@@ -61,6 +62,7 @@ class PresoutenanceController extends AbstractController
    use MembreServiceAwareTrait;
    use IndividuServiceAwareTrait;
    use NotifierServiceAwareTrait;
    use ParametreServiceAwareTrait;
    use SoutenanceNotificationFactoryAwareTrait;
    use PropositionServiceAwareTrait;
    use ActeurServiceAwareTrait;
@@ -69,7 +71,6 @@ class PresoutenanceController extends AbstractController
    use AvisServiceAwareTrait;
    use UtilisateurServiceAwareTrait;
    use UserServiceAwareTrait;
    use ParametreServiceAwareTrait;
    use EngagementImpartialiteServiceAwareTrait;
    use FichierServiceAwareTrait;
    use JustificatifServiceAwareTrait;
@@ -130,7 +131,7 @@ class PresoutenanceController extends AbstractController
            'evenementsEngagement' => $this->getEvenementService()->getEvenementsByPropositionAndType($proposition, Evenement::EVENEMENT_ENGAGEMENT),
            'evenementsPrerapport' => $this->getEvenementService()->getEvenementsByPropositionAndType($proposition, Evenement::EVENEMENT_PRERAPPORT),

            'deadline' => $this->getParametreService()->getParametreByCode('AVIS_DEADLINE')->getValeur(),
            'deadline' => $this->getParametreService()->getParametreByCode(SoutenanceParametres::CATEGORIE, SoutenanceParametres::DELAI_RETOUR)->getValeur(),
        ]);
    }

+5 −4
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@

namespace Soutenance\Controller;

use phpDocumentor\Reflection\DocBlock\Tags\Param;
use Psr\Container\ContainerExceptionInterface;
use Psr\Container\NotFoundExceptionInterface;
use Soutenance\Service\Notification\SoutenanceNotificationFactory;
@@ -23,12 +24,12 @@ use Soutenance\Service\Evenement\EvenementService;
use Soutenance\Service\Justificatif\JustificatifService;
use Soutenance\Service\Membre\MembreService;
use Notification\Service\NotifierService;
use Soutenance\Service\Parametre\ParametreService;
use Soutenance\Service\Proposition\PropositionService;
use Soutenance\Service\Validation\ValidationService;
use UnicaenAuth\Service\User as UserService;
use UnicaenAuthToken\Service\TokenService;
use Laminas\View\Renderer\PhpRenderer;
use UnicaenParametre\Service\Parametre\ParametreService;
use UnicaenRenderer\Service\Rendu\RenduService;

class PresoutenanceControllerFactory
@@ -54,7 +55,6 @@ class PresoutenanceControllerFactory
         * @var RoleService $roleService
         * @var UtilisateurService $utilisateurService
         * @var UserService $userService
         * @var ParametreService $parametreService
         * @var EngagementImpartialiteService $engagementImpartialiteService
         * @var FichierService $fichierService
         * @var StructureDocumentService $structureDocumentService
@@ -62,6 +62,7 @@ class PresoutenanceControllerFactory
         * @var SourceService $sourceService
         * @var JustificatifService $justificatifService
         * @var FichierStorageService $fichierStorageService
         * @var ParametreService $parametreService
         */
        $evenementService = $container->get(EvenementService::class);
        $propositionService = $container->get(PropositionService::class);
@@ -75,7 +76,6 @@ class PresoutenanceControllerFactory
        $avisService = $container->get(AvisService::class);
        $utilisateurService = $container->get('UtilisateurService');
        $userService = $container->get('unicaen-auth_user_service');
        $parametreService = $container->get(ParametreService::class);
        $engagementImpartialiteService = $container->get(EngagementImpartialiteService::class);
        $fichierService = $container->get(FichierService::class);
        $structureDocumentService = $container->get(StructureDocumentService::class);
@@ -83,6 +83,7 @@ class PresoutenanceControllerFactory
        $sourceService = $container->get(SourceService::class);
        $justificatifService = $container->get(JustificatifService::class);
        $fichierStorageService = $container->get(FichierStorageService::class);
        $parametreService = $container->get(ParametreService::class);

        /**
         * @var DateRenduRapportForm $dateRenduRapportForm
@@ -108,13 +109,13 @@ class PresoutenanceControllerFactory
        $controller->setAvisService($avisService);
        $controller->setUtilisateurService($utilisateurService);
        $controller->setUserService($userService);
        $controller->setParametreService($parametreService);
        $controller->setEngagementImpartialiteService($engagementImpartialiteService);
        $controller->setFichierService($fichierService);
        $controller->setStructureDocumentService($structureDocumentService);
        $controller->setTokenService($tokenService);
        $controller->setJustificatifService($justificatifService);
        $controller->setFichierStorageService($fichierStorageService);
        $controller->setParametreService($parametreService);

        $controller->setDateRenduRapportForm($dateRenduRapportForm);
        $controller->setAdresseSoutenanceForm($adresseSoutenanceForm);
+1 −2
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@
namespace Soutenance\Controller;

use Fichier\Service\Fichier\FichierStorageService;
use Information\Controller\InformationController;
use Information\Service\InformationService;
use Psr\Container\ContainerExceptionInterface;
use Psr\Container\NotFoundExceptionInterface;
@@ -27,10 +26,10 @@ use Soutenance\Service\Evenement\EvenementService;
use Soutenance\Service\Justificatif\JustificatifService;
use Soutenance\Service\Membre\MembreService;
use Notification\Service\NotifierService;
use Soutenance\Service\Parametre\ParametreService;
use Soutenance\Service\Proposition\PropositionService;
use Soutenance\Service\Validation\ValidationService;
use Laminas\View\Renderer\PhpRenderer;
use UnicaenParametre\Service\Parametre\ParametreService;
use UnicaenRenderer\Service\Rendu\RenduService;

class PropositionControllerFactory