Commit 331c5179 authored by Bertrand Gauthier's avatar Bertrand Gauthier
Browse files

Merge branch 'master' of git.unicaen.fr:dsi/sygal

parents a47eac9a 4f2cb63b

module/Application/config/others/these.config.php

+4 −7
Changes for module/Application/config/others/these.config.php: 4 added lines, 7 removed lines.
Original line number Diff line number Diff line
@@ -16,16 +16,13 @@ use Application\Form\Factory\RdvBuTheseDoctorantFormFactory; 
use Application\Form\Factory\RdvBuTheseFormFactory;

use Application\Form\Factory\RecapBuFormFactory;

use Application\Form\Factory\RecapBuHydratorFactory;

use Application\Form\Hydrator\RdvBuHydrator;

use Application\Form\Hydrator\RecapBuHydrator;

use Application\Provider\Privilege\ThesePrivileges;

use Application\Service\Acteur\ActeurService;

use Application\Service\Message\DiffusionMessages;

use Application\Service\ServiceAwareInitializer;

use Application\Service\These\TheseObserverService;

use Application\Service\These\TheseService;

use Application\Service\These\Factory\TheseObserverServiceFactory;

use Application\Service\These\Factory\TheseServiceFactory;

use Application\Service\Url\UrlServiceFactory;

use Application\Service\Url\UrlTheseService;

use Application\Service\Url\UrlTheseServiceFactory;

use Application\View\Helper\Url\UrlTheseHelperFactory;

use UnicaenAuth\Guard\PrivilegeController;
@@ -893,11 +890,11 @@ return [ 
    ),

    'service_manager' => [

        'invokables' => array(

            'TheseService'                 => TheseService::class,

            'TheseObserverService' => TheseObserverService::class,

            ActeurService::class => ActeurService::class,

        ),

        'factories' => [

            'TheseService'                 => TheseServiceFactory::class,

            'TheseObserverService'         => TheseObserverServiceFactory::class,

        ],

        'abstract_factories' => [

            AssertionAbstractFactory::class,

module/Application/config/others/utilisateur.config.php

+2 −2
Changes for module/Application/config/others/utilisateur.config.php: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line 
<?php



use Application\Controller\UtilisateurController;

use Application\Controller\Factory\UtilisateurControllerFactory;

use Application\Provider\Privilege\UtilisateurPrivileges;

use Application\Service\Individu\IndividuService;

use Application\Service\Utilisateur\UtilisateurService;
@@ -120,9 +120,9 @@ return [ 
    ],

    'controllers'     => [

        'invokables' => [

            'Application\Controller\Utilisateur' => UtilisateurController::class,

        ],

        'factories' => [

            'Application\Controller\Utilisateur' => UtilisateurControllerFactory::class,

        ],

    ],

];

module/Application/config/others/validation.config.php

+3 −3
Changes for module/Application/config/others/validation.config.php: 3 added lines, 3 removed lines.
Original line number Diff line number Diff line 
<?php



use Application\Controller\ValidationController;

use Application\Controller\Factory\ValidationControllerFactory;

use Application\Provider\Privilege\ThesePrivileges;

use Application\Provider\Privilege\ValidationPrivileges;

use Application\Service\Validation\ValidationService;
@@ -157,8 +157,8 @@ return [ 
        ],

    ],

    'controllers' => [

        'invokables' => [

            'Application\Controller\Validation' => ValidationController::class,

        'factories' => [

            'Application\Controller\Validation' => ValidationControllerFactory::class,

        ],

    ],

    'controller_plugins' => [

module/Application/src/Application/Controller/AbstractController.php

+1 −1
Changes for module/Application/src/Application/Controller/AbstractController.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -3,9 +3,9 @@ 
namespace Application\Controller;



use Application\Controller\Plugin\Uploader\UploaderPlugin;

use Application\Controller\Plugin\Url\UrlThesePlugin;

use Application\Controller\Plugin\UrlDoctorant;

use Application\Controller\Plugin\UrlFichierThese;

use Application\Controller\Plugin\Url\UrlThesePlugin;

use Application\Controller\Plugin\UrlWorkflow;

use Application\Entity\Db\These;

use Application\Entity\Db\Utilisateur;

module/Application/src/Application/Controller/ExportController.php

+0 −2
Changes for module/Application/src/Application/Controller/ExportController.php: 0 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -4,9 +4,7 @@ namespace Application\Controller; 


use Application\Entity\Db\NatureFichier;

use Application\Entity\Db\These;

use Application\Service\Fichier\FichierServiceAwareInterface;

use Application\Service\Fichier\FichierServiceAwareTrait;

use Application\Service\These\TheseServiceAwareInterface;

use Application\Service\These\TheseServiceAwareTrait;

use Application\View\Helper\Sortable;

use UnicaenApp\View\Model\CsvModel;