Commit 468f9bd2 authored by Bertrand Gauthier's avatar Bertrand Gauthier
Browse files

Merge branch 'feature_admission_wf' into test__admission_v2

parents 58445132 fe972268

Dockerfile

+1 −0
Changes for Dockerfile: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -140,6 +140,7 @@ ADD ${PHP_CONF_LOCAL_DIR}/fpm/pool.d/www.conf.part /tmp/ 
RUN cat /tmp/www.conf.part >> ${PHP_CONF_DIR}/fpm/pool.d/www.conf && rm /tmp/www.conf.part

ADD ${PHP_CONF_LOCAL_DIR}/fpm/conf.d/99-sygal.ini ${PHP_CONF_DIR}/fpm/conf.d/

ADD ${PHP_CONF_LOCAL_DIR}/cli/conf.d/99-sygal.ini ${PHP_CONF_DIR}/cli/conf.d/

RUN echo 'request_terminate_timeout=600' >> ${PHP_CONF_DIR}/fpm/php-fpm.conf



# Création du fichier pour les logs FPM (cf. fpm/pool.d/www.conf.part)

RUN touch ${FPM_PHP_LOG_FILE} && \

Dockerfile82

+1 −0
Changes for Dockerfile82: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -135,6 +135,7 @@ ADD ${PHP_CONF_LOCAL_DIR}/fpm/pool.d/www.conf.part /tmp/ 
RUN cat /tmp/www.conf.part >> ${PHP_CONF_DIR}/fpm/pool.d/www.conf && rm /tmp/www.conf.part

ADD ${PHP_CONF_LOCAL_DIR}/fpm/conf.d/99-sygal.ini ${PHP_CONF_DIR}/fpm/conf.d/

ADD ${PHP_CONF_LOCAL_DIR}/cli/conf.d/99-sygal.ini ${PHP_CONF_DIR}/cli/conf.d/

RUN echo 'request_terminate_timeout=600' >> ${PHP_CONF_DIR}/fpm/php-fpm.conf



# Création du fichier pour les logs FPM (cf. fpm/pool.d/www.conf.part)

RUN touch ${FPM_PHP_LOG_FILE} && \

composer.json

+5 −3
Changes for composer.json: 5 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -52,8 +52,8 @@ 
        "twig/twig": "^3.0",

        "webmozart/assert": "^1.3",



        "unicaen/alerte": "^3.0",

        "unicaen/app": "6.2.1",

        "unicaen/alerte": "^3.2",

        "unicaen/app": "^6.3",

        "unicaen/auth-token": "^7.1",

        "unicaen/authentification": "^6.4",

        "unicaen/privilege": "^6.3.0",
@@ -68,6 +68,7 @@ 
        "unicaen/livelog": "^4.0",

        "unicaen/mail": "^6.1",

        "unicaen/maintenance-mode": "^1.0",

        "unicaen/multipage-form": "^2.1",

        "unicaen/parametre": "^6.0",

        "unicaen/pdf": "dev-release_7.0.0",

        "unicaen/renderer": "dev-release_7.2.0",
@@ -75,7 +76,8 @@ 
        "unicaen/sql": "^2.0",

        "unicaen/sygal-api": "dev-master",

        "unicaen/utilisateur": "^6.3",

        "unicaen/avis": "dev-main"

        "unicaen/avis": "dev-main",

        "unicaen/exemple": "dev-master"

    },

    "minimum-stability": "dev",

    "prefer-stable": true,

composer.lock

+73 −7
Changes for composer.lock: 73 added lines, 7 removed lines.
Original line number Diff line number Diff line
@@ -11790,11 +11790,11 @@ 
        },

        {

            "name": "unicaen/alerte",

            "version": "3.1.1",

            "version": "3.2.0",

            "source": {

                "type": "git",

                "url": "https://git.unicaen.fr/lib/unicaen/alerte.git",

                "reference": "60220897e71358acae5bcec2b0ab1ed846b1e45f"

                "reference": "8facc77b81ee1f40765daf263b882d5007c18105"

            },

            "require": {

                "doctrine/doctrine-laminas-hydrator": "^2.0 || ^3.0",
@@ -11816,15 +11816,15 @@ 
                ]

            },

            "description": "Affichage d'alertes",

            "time": "2025-01-29T13:34:15+00:00"

            "time": "2026-01-21T16:06:03+00:00"

        },

        {

            "name": "unicaen/app",

            "version": "6.2.1",

            "version": "6.3.1",

            "source": {

                "type": "git",

                "url": "https://git.unicaen.fr/lib/unicaen/app.git",

                "reference": "8ded04d54ed8f814b64cbe1b3f7e04f44275bcf8"

                "reference": "3f1638f262b0283f9c5cc51cc5b8be6b9f2c0706"

            },

            "require": {

                "beberlei/assert": "^3.3",
@@ -11876,7 +11876,7 @@ 
                ]

            },

            "description": "Module de base des applications unicaen",

            "time": "2025-09-24T16:18:13+00:00"

            "time": "2025-10-27T13:22:07+00:00"

        },

        {

            "name": "unicaen/auth-token",
@@ -12190,6 +12190,37 @@ 
            "description": "Module de gestion des etats et actions associés au passage d'état",

            "time": "2025-03-06T16:05:54+00:00"

        },

        {

            "name": "unicaen/exemple",

            "version": "dev-master",

            "source": {

                "type": "git",

                "url": "https://git.unicaen.fr/lib/unicaen/exemple.git",

                "reference": "c7a231f5b05877095907bfb5b6596eb77477c6f3"

            },

            "require": {

                "php": "^8.0",

                "unicaen/app": "^6.0",

                "unicaen/bjy-authorize": "^6.0",

                "unicaen/multipage-form": "^2.0"

            },

            "type": "library",

            "extra": {

                "branch-alias": {

                    "dev-master": "1.0.x-dev"

                }

            },

            "autoload": {

                "psr-0": {

                    "UnicaenExemple": "src/"

                },

                "classmap": [

                    "./Module.php"

                ]

            },

            "description": "Module d'exemples d'utilisation des bibliothèques Unicaen.",

            "time": "2025-11-04T08:34:13+00:00"

        },

        {

            "name": "unicaen/faq",

            "version": "7.1.0",
@@ -12382,6 +12413,40 @@ 
            "description": "Module Unicaen pour activer/désactiver le mode maintenance d'une application",

            "time": "2025-03-24T08:45:25+00:00"

        },

        {

            "name": "unicaen/multipage-form",

            "version": "2.1.1",

            "source": {

                "type": "git",

                "url": "https://git.unicaen.fr/lib/unicaen/multipage-form.git",

                "reference": "9e2273b2d50256e9d4855df89a71d3ef1540032b"

            },

            "require": {

                "laminas/laminas-config": "^3.9",

                "laminas/laminas-form": "^3.9",

                "laminas/laminas-http": "^2.18",

                "laminas/laminas-mvc": "^3.6",

                "laminas/laminas-mvc-plugin-prg": "^1.7",

                "laminas/laminas-servicemanager": "^3.20",

                "laminas/laminas-session": "^2.16",

                "laminas/laminas-view": "^2.27"

            },

            "require-dev": {

                "laminas/laminas-test": "^4.7"

            },

            "type": "library",

            "autoload": {

                "psr-0": {

                    "UnicaenMultipageForm": "src/",

                    "UnicaenMultipageFormTest": "tests/"

                },

                "classmap": [

                    "./Module.php"

                ]

            },

            "description": "Gestion de formulaire multi-page",

            "time": "2026-02-05T15:44:45+00:00"

        },

        {

            "name": "unicaen/parametre",

            "version": "6.1.3",
@@ -15508,7 +15573,8 @@ 
        "unicaen/pdf": 20,

        "unicaen/renderer": 20,

        "unicaen/sygal-api": 20,

        "unicaen/avis": 20

        "unicaen/avis": 20,

        "unicaen/exemple": 20

    },

    "prefer-stable": true,

    "prefer-lowest": false,

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
@@ -62,6 +62,8 @@ return [ 
        'Unicaen\Console',

        'UnicaenParametre',

        'UnicaenSearch',

        'UnicaenMultipageForm',

        'UnicaenExemple',

        'Feature',

        'Horodatage',

        'Structure',
@@ -85,6 +87,7 @@ return [ 
        'InscriptionAdministrative',

        'Admission',

        'Application',

        'Operation',

        'Substitution',

        'SygalApi',

        'SygalApiImpl',