Commit c58d5a76 authored by Bertrand Gauthier's avatar Bertrand Gauthier
Browse files

Merge branch 'ModuleFormation_4.0.0' into release_5.0.0

parents e9647e89 e16780f7

.gitignore

+1 −0
Changes for .gitignore: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -12,3 +12,4 @@ 
# temporaire (pour la branche migration_postgres)

bin/aaa.sh

data/db/

data/cache/

composer.json

+4 −2
Changes for composer.json: 4 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
        "guzzlehttp/guzzle": "^6.3",

        "ramsey/uuid": "^3.3",

        "twig/twig": "^3.0",

        "unicaen/alerte": "^1.0",

        "unicaen/app": "^5.1",

        "unicaen/auth": "^5.1",

        "unicaen/auth-token": "^5.0",
@@ -38,12 +39,13 @@ 
        "unicaen/livelog": "dev-master",

        "unicaen/faq": "^5.0",

        "unicaen/ldap": "^4.0",

        "unicaen/renderer": "^5.0",

        "unicaen/pdf": "^4.0",

        "webmozart/assert": "^1.3",

        "laminas/laminas-feed": "^2.12",

        "laminas/laminas-soap": "^2.8",

        "laminas/laminas-development-mode": "^3.2",

        "laminas/laminas-dependency-plugin": "^2.1",

        "unicaen/alerte": "^1.0"

        "laminas/laminas-dependency-plugin": "^2.1"

    },

    "autoload": {

        "psr-0": {

composer.lock

+573 −454

File changed.

Preview size limit exceeded, changes collapsed.

config/application.config.php

+3 −0
Changes for config/application.config.php: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -35,12 +35,15 @@ return [ 
        'UnicaenDbImport',

        'UnicaenFaq',

        'UnicaenLivelog',

        'UnicaenPdf',

        'UnicaenRenderer',

        'Structure',

        'Import',

        'Indicateur',

        'Individu',

        'Retraitement',

        'Soutenance',

        'Formation',

        'RapportActivite',

        'Notification',

        'Information',

config/autoload/unicaen-auth.global.php

+2 −1
Changes for config/autoload/unicaen-auth.global.php: 2 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -25,7 +25,8 @@ return [ 
        'identity_providers'  => [

            300 => 'UnicaenAuth\Provider\Identity\Basic',   // en 1er

            200 => 'UnicaenAuth\Provider\Identity\Db',      // en 2e

            100 => 'Application\Provider\IdentityProvider', // en 3e

            110 => 'Application\Provider\IdentityProvider', // en 3e

            100 => 'Formation\Provider\IdentityProvider',   // en 4e

        ],

    ],