Merge branch 'feature_admission_wf' into release_11.0.0 (e4008dee) · Commits · open-source / sygal

Dockerfile

+1 −0

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

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

Original line number	Diff line number	Diff line
		@@ -53,8 +53,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",
		@@ -67,6 +67,7 @@
		"unicaen/ldap": "^6.0",
		"unicaen/livelog": "^4.0",
		"unicaen/mail": "^6.1",
		"unicaen/multipage-form": "^2.1",
		"unicaen/parametre": "^6.0",
		"unicaen/pdf": "^7.0",
		"unicaen/renderer": "^7.2",
		@@ -74,7 +75,8 @@
		"unicaen/sql": "^2.0",
		"unicaen/sygal-api": "dev-master",
		"unicaen/utilisateur": "^6.3",
		"unicaen/avis": "dev-main"
		"unicaen/avis": "^1.1",
		"unicaen/exemple": "dev-master"
		},
		"minimum-stability": "dev",
		"prefer-stable": true,

composer.lock

+71 −6

Original line number	Diff line number	Diff line
		@@ -11838,11 +11838,11 @@
		},
		{
		"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",
		@@ -11894,7 +11894,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",
		@@ -11957,11 +11957,11 @@
		},
		{
		"name": "unicaen/avis",
		"version": "dev-main",
		"version": "1.1.0",
		"source": {
		"type": "git",
		"url": "https://git.unicaen.fr/lib/unicaen/avis.git",
		"reference": "b0fc6a43d05e25d66e5f91551cd285cae47d1210"
		"reference": "5c2c70baa1386e7f6dd8c7cc1665fd15a23e7fe3"
		},
		"require": {
		"doctrine/doctrine-laminas-hydrator": "^2.0 \|\| ^3.0",
		@@ -12208,6 +12208,37 @@
		"description": "Module de gestion des etats et actions associés au passage d'état",
		"time": "2026-01-08T06:38:30+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",
		@@ -12373,6 +12404,40 @@
		"description": "Module d'envoi de mail",
		"time": "2024-12-06T10:51:41+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.2.0",
		@@ -15592,7 +15657,7 @@
		"minimum-stability": "dev",
		"stability-flags": {
		"unicaen/sygal-api": 20,
		"unicaen/avis": 20
		"unicaen/exemple": 20
		},
		"prefer-stable": true,
		"prefer-lowest": false,

config/application.config.php

+3 −0

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',