Commit fe73ff68 authored by Laurent Lecluse's avatar Laurent Lecluse
Browse files

Modularisation Plafond 

Réduction du périmètre de context(), deprecated
MAJ Composer
Déclaration des modules de l'appli dans le Composer
parent d29885bf

composer.json

+7 −1
Changes for composer.json: 7 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -15,12 +15,18 @@ 
        "zendframework/zend-code": "3.3.2",

        "unicaen/bjy-authorize"  : "3.0.4",

        "zendframework/zend-file": "2.8.3",

        "unicaen/code"           : "3.0.2",

        "unicaen/code"           : "3.1",

        "unicaen/import"         : "3.1.5",

        "unicaen/tbl"            : "4.1",

        "unicaen/open-document"  : "3.0.2",

        "ocramius/proxy-manager" : "2.2.3"

    },

    "autoload": {

        "psr-4": {

            "Application\\": "module/Application/src/",

            "Plafond\\": "module/Plafond/src/"

        }

    },

    "require-dev" : {

        "zendframework/zend-test"           : "3.3.0",

        "zendframework/zend-developer-tools": "1.2.3",

composer.lock

+94 −86

File changed.

Preview size limit exceeded, changes collapsed.

module/Application/Application.php

+5 −10
Changes for module/Application/Application.php: 5 added lines, 10 removed lines.
Original line number Diff line number Diff line
@@ -80,16 +80,11 @@ class Application 
        $serviceManager->setService('ApplicationConfig', $configuration);



        // Load modules

        $serviceManager->get('ModuleManager')->loadModules();



        // Prepare list of listeners to bootstrap

        //$listenersFromAppConfig     = isset($configuration['listeners']) ? $configuration['listeners'] : [];

        //$config                     = $serviceManager->get('config');

        //$listenersFromConfigService = isset($config['listeners']) ? $config['listeners'] : [];



        $listeners = [];//array_unique(array_merge($listenersFromConfigService, $listenersFromAppConfig));



        $serviceManager->get('Application')->bootstrap($listeners)->run();

        /** @var $moduleManager \Zend\ModuleManager\ModuleManager */

        $moduleManager = $serviceManager->get('ModuleManager');

        $moduleManager->loadModules();

        $application = $serviceManager->get('Application')->bootstrap([]);

        $application->run();

    }

module/Application/src/Application/Controller/IntervenantController.php

+1 −1
Changes for module/Application/src/Application/Controller/IntervenantController.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ use Application\Form\Intervenant\Traits\EditionFormAwareTrait; 
use Application\Form\Intervenant\Traits\HeuresCompFormAwareTrait;

use Application\Form\Intervenant\Traits\RegleStructureValidationFormAwareTrait;

use Application\Processus\Traits\IntervenantProcessusAwareTrait;

use Application\Processus\Traits\PlafondProcessusAwareTrait;

use Plafond\Processus\PlafondProcessusAwareTrait;

use Application\Processus\Traits\ServiceProcessusAwareTrait;

use Application\Processus\Traits\ServiceReferentielProcessusAwareTrait;

use Application\Provider\Privilege\Privileges;

module/Application/src/Application/Controller/Plugin/Context.php

+1 −66

File changed.

Preview size limit exceeded, changes collapsed.