Merge remote-tracking branch 'origin/master' (ed2fbc9f) · Commits · open-source / OSE

code/formules/testArrondisseurFromService.php

+1 −1

Changes for code/formules/testArrondisseurFromService.php: 1 added line, 1 removed line.
Original line number	Diff line number	Diff line
		@@ -16,7 +16,7 @@ $intervenantId = 784094;
		//$intervenantId = 2032;
		$typeVolumeHoraireId = 1;
		$etatVolumeHoraireId = 1;
		$arrondir = true;
		$arrondir = \Formule\Entity\FormuleIntervenant::ARRONDISSEUR_FULL;

		$fi = $fs->getFormuleServiceIntervenant($intervenantId, $typeVolumeHoraireId, $etatVolumeHoraireId);
		$fi->setArrondisseur($arrondir);

code/test6.php

+14 −9

Changes for code/test6.php: 14 added lines, 9 removed lines.
Original line number	Diff line number	Diff line
		@@ -5,19 +5,24 @@
		* @var $container \Psr\Container\ContainerInterface
		*/

		use Formule\Model\FormuleDetailsExtractor;
		$em = $container->get(\Doctrine\ORM\EntityManager::class);

		$fts = $container->get(\Formule\Service\TestService::class);


		$fs = $container->get(\Formule\Service\FormuleService::class);


		//2023/2024 - DALMASSO Marion
		$fi = $fs->getFormuleServiceIntervenant(783665, 1, 1);
		$intervenantId = 783665;
		$typeVolumeHoraireId = 1;
		$etatVolumeHoraireId = 1;


		$intervenant = $em->find(\Intervenant\Entity\Db\Intervenant::class, $intervenantId);
		$typeVolumeHoraire = $em->find(\Service\Entity\Db\TypeVolumeHoraire::class, $typeVolumeHoraireId);
		$etatVolumeHoraire = $em->find(\Service\Entity\Db\EtatVolumeHoraire::class, $etatVolumeHoraireId);

		if (null == $fi->getArrondisseurTrace()) {
		$fs->calculer($fi);
		}
		$trace = $fi->getArrondisseurTrace();

		$vu = $trace->getValeursUtilisees();
		$ft = $fts->creerDepuisIntervenant($intervenant, $typeVolumeHoraire, $etatVolumeHoraire);

		var_dump($vu);
		No newline at end of file
		var_dump($ft);
		No newline at end of file

composer.json

+3 −3

Changes for composer.json: 3 added lines, 3 removed lines.
Original line number	Diff line number	Diff line
		@@ -13,8 +13,8 @@
		"laminas/laminas-cli" : "1.11.0",
		"symfony/process" : "7.2.0",

		"twbs/bootstrap" : "5.3.3",
		"components/jquery" : "3.6.0",
		"twbs/bootstrap" : "5.0.2",
		"components/jquery" : "3.7.1",
		"webfontkit/open-sans" : "1.0.0",
		"components/font-awesome" : "6.5.2",
		"tinymce/tinymce" : "7.6.0",
		@@ -30,7 +30,7 @@
		"unicaen/tbl" : "6.2.5",
		"unicaen/open-document" : "6.0.10",
		"unicaen/siham" : "6.2.0",
		"unicaen/mail" : "7.0.0",
		"unicaen/mail" : "7.1.0",
		"unicaen/vue" : "6.2.7",
		"unicaen/bddadmin" : "1.0.6",
		"unicaen/signature" : "1.0.0",

composer.lock

+28 −30

Changes for composer.lock: 28 added lines, 30 removed lines.
Original line number	Diff line number	Diff line
		@@ -4,7 +4,7 @@
		"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
		"This file is @generated automatically"
		],
		"content-hash": "115c110416ff71cdaf751f8351d28c1d",
		"content-hash": "b48ca2b6015199df1ca7bdbd689465c8",
		"packages": [
		{
		"name": "apereo/phpcas",
		@@ -234,16 +234,16 @@
		},
		{
		"name": "components/jquery",
		"version": "3.6.0",
		"version": "v3.7.1",
		"source": {
		"type": "git",
		"url": "https://github.com/components/jquery.git",
		"reference": "6cf38ee1fd04b6adf8e7dda161283aa35be818c3"
		"reference": "8edc7785239bb8c2ad2b83302b856a1d61de60e7"
		},
		"dist": {
		"type": "zip",
		"url": "https://api.github.com/repos/components/jquery/zipball/6cf38ee1fd04b6adf8e7dda161283aa35be818c3",
		"reference": "6cf38ee1fd04b6adf8e7dda161283aa35be818c3",
		"url": "https://api.github.com/repos/components/jquery/zipball/8edc7785239bb8c2ad2b83302b856a1d61de60e7",
		"reference": "8edc7785239bb8c2ad2b83302b856a1d61de60e7",
		"shasum": ""
		},
		"type": "component",
		@@ -279,7 +279,7 @@
		"source": "https://github.com/jquery/jquery",
		"wiki": "http://docs.jquery.com/"
		},
		"time": "2021-03-20T19:13:42+00:00"
		"time": "2023-09-22T01:43:46+00:00"
		},
		{
		"name": "connecteur-ose/actul",
		@@ -739,16 +739,16 @@
		},
		{
		"name": "doctrine/dbal",
		"version": "3.9.3",
		"version": "3.9.4",
		"source": {
		"type": "git",
		"url": "https://github.com/doctrine/dbal.git",
		"reference": "61446f07fcb522414d6cfd8b1c3e5f9e18c579ba"
		"reference": "ec16c82f20be1a7224e65ac67144a29199f87959"
		},
		"dist": {
		"type": "zip",
		"url": "https://api.github.com/repos/doctrine/dbal/zipball/61446f07fcb522414d6cfd8b1c3e5f9e18c579ba",
		"reference": "61446f07fcb522414d6cfd8b1c3e5f9e18c579ba",
		"url": "https://api.github.com/repos/doctrine/dbal/zipball/ec16c82f20be1a7224e65ac67144a29199f87959",
		"reference": "ec16c82f20be1a7224e65ac67144a29199f87959",
		"shasum": ""
		},
		"require": {
		@@ -764,15 +764,13 @@
		"doctrine/coding-standard": "12.0.0",
		"fig/log-test": "^1",
		"jetbrains/phpstorm-stubs": "2023.1",
		"phpstan/phpstan": "1.12.6",
		"phpstan/phpstan-strict-rules": "^1.6",
		"phpunit/phpunit": "9.6.20",
		"psalm/plugin-phpunit": "0.18.4",
		"phpstan/phpstan": "2.1.1",
		"phpstan/phpstan-strict-rules": "^2",
		"phpunit/phpunit": "9.6.22",
		"slevomat/coding-standard": "8.13.1",
		"squizlabs/php_codesniffer": "3.10.2",
		"symfony/cache": "^5.4\|^6.0\|^7.0",
		"symfony/console": "^4.4\|^5.4\|^6.0\|^7.0",
		"vimeo/psalm": "4.30.0"
		"symfony/console": "^4.4\|^5.4\|^6.0\|^7.0"
		},
		"suggest": {
		"symfony/console": "For helpful console commands such as SQL execution and import of files."
		@@ -832,7 +830,7 @@
		],
		"support": {
		"issues": "https://github.com/doctrine/dbal/issues",
		"source": "https://github.com/doctrine/dbal/tree/3.9.3"
		"source": "https://github.com/doctrine/dbal/tree/3.9.4"
		},
		"funding": [
		{
		@@ -848,7 +846,7 @@
		"type": "tidelift"
		}
		],
		"time": "2024-10-10T17:56:43+00:00"
		"time": "2025-01-16T08:28:55+00:00"
		},
		{
		"name": "doctrine/deprecations",
		@@ -7620,16 +7618,16 @@
		},
		{
		"name": "twbs/bootstrap",
		"version": "v5.3.3",
		"version": "v5.0.2",
		"source": {
		"type": "git",
		"url": "https://github.com/twbs/bootstrap.git",
		"reference": "6e1f75f420f68e1d52733b8e407fc7c3766c9dba"
		"reference": "688bce4fa695cc360a0d084e34f029b0c192b223"
		},
		"dist": {
		"type": "zip",
		"url": "https://api.github.com/repos/twbs/bootstrap/zipball/6e1f75f420f68e1d52733b8e407fc7c3766c9dba",
		"reference": "6e1f75f420f68e1d52733b8e407fc7c3766c9dba",
		"url": "https://api.github.com/repos/twbs/bootstrap/zipball/688bce4fa695cc360a0d084e34f029b0c192b223",
		"reference": "688bce4fa695cc360a0d084e34f029b0c192b223",
		"shasum": ""
		},
		"replace": {
		@@ -7664,9 +7662,9 @@
		],
		"support": {
		"issues": "https://github.com/twbs/bootstrap/issues",
		"source": "https://github.com/twbs/bootstrap/tree/v5.3.3"
		"source": "https://github.com/twbs/bootstrap/tree/v5.0.2"
		},
		"time": "2024-02-20T15:14:29+00:00"
		"time": "2021-06-22T18:29:16+00:00"
		},
		{
		"name": "unicaen/app",
		@@ -7728,11 +7726,11 @@
		},
		{
		"name": "unicaen/authentification",
		"version": "6.4.0",
		"version": "6.4.1",
		"source": {
		"type": "git",
		"url": "https://git.unicaen.fr/lib/unicaen/authentification.git",
		"reference": "8e518af2342ff23efa344aa4c807e8f031045b25"
		"reference": "9acbfe5153e535f674762a83647a72edf2aa14de"
		},
		"require": {
		"apereo/phpcas": "1.6.*",
		@@ -7754,7 +7752,7 @@
		]
		},
		"description": "Module d'authentification pour les applications Unicaen - Version Laminas",
		"time": "2025-01-10T09:05:20+00:00"
		"time": "2025-01-14T09:33:08+00:00"
		},
		{
		"name": "unicaen/bddadmin",
		@@ -7894,11 +7892,11 @@
		},
		{
		"name": "unicaen/mail",
		"version": "7.0.0",
		"version": "7.1.0",
		"source": {
		"type": "git",
		"url": "https://git.unicaen.fr/lib/unicaen/mail.git",
		"reference": "084d7c2b3f7752831e308aff779316cf8a622f47"
		"reference": "fafdc3f20ed76d45ea3596f1986336a74227169a"
		},
		"require": {
		"symfony/mailer": "^7",
		@@ -7914,7 +7912,7 @@
		]
		},
		"description": "Module d'envoi de mail",
		"time": "2025-01-07T07:24:03+00:00"
		"time": "2025-01-16T12:50:52+00:00"
		},
		{
		"name": "unicaen/open-document",

config/autoload/unicaen-mail.global.php

+0 −20

Changes for config/autoload/unicaen-mail.global.php: 0 added lines, 20 removed lines.
Original line number	Diff line number	Diff line
		@@ -5,26 +5,6 @@ use UnicaenMail\Entity\Db\Mail;
		$conf = AppAdmin::config();

		return [
		'unicaen-app' => [

		/**
		* Options concernant l'envoi de mail par l'application
		*/
		'mail' => [
		// transport des mails
		'transport_options' => [
		'host' => $conf['mail']['smtpHost'] ?? 'localhost',
		'port' => $conf['mail']['smtpPort'] ?? null,
		],
		// adresses à substituer à celles des destinataires originaux ('CURRENT_USER' équivaut à l'utilisateur connecté)
		'redirect_to' => $conf['mail']['redirection'] ?? null,
		// adresse d'expéditeur par défaut
		'from' => $conf['mail']['from'] ?? null,
		// désactivation totale de l'envoi de mail par l'application
		'do_not_send' => $conf['mail']['envoiDesactive'] ?? true,
		],
		],

		'unicaen-mail' => [
		/**
		* Classe de entité