Divers (8d97686e) · Commits · open-source / OSE

composer.lock

+66 −65

Original line number	Diff line number	Diff line
		@@ -1207,29 +1207,30 @@
		},
		{
		"name": "doctrine/instantiator",
		"version": "1.4.0",
		"version": "1.4.1",
		"source": {
		"type": "git",
		"url": "https://github.com/doctrine/instantiator.git",
		"reference": "d56bf6102915de5702778fe20f2de3b2fe570b5b"
		"reference": "10dcfce151b967d20fde1b34ae6640712c3891bc"
		},
		"dist": {
		"type": "zip",
		"url": "https://api.github.com/repos/doctrine/instantiator/zipball/d56bf6102915de5702778fe20f2de3b2fe570b5b",
		"reference": "d56bf6102915de5702778fe20f2de3b2fe570b5b",
		"url": "https://api.github.com/repos/doctrine/instantiator/zipball/10dcfce151b967d20fde1b34ae6640712c3891bc",
		"reference": "10dcfce151b967d20fde1b34ae6640712c3891bc",
		"shasum": ""
		},
		"require": {
		"php": "^7.1 \|\| ^8.0"
		},
		"require-dev": {
		"doctrine/coding-standard": "^8.0",
		"doctrine/coding-standard": "^9",
		"ext-pdo": "*",
		"ext-phar": "*",
		"phpbench/phpbench": "^0.13 \|\| 1.0.0-alpha2",
		"phpstan/phpstan": "^0.12",
		"phpstan/phpstan-phpunit": "^0.12",
		"phpunit/phpunit": "^7.0 \|\| ^8.0 \|\| ^9.0"
		"phpbench/phpbench": "^0.16 \|\| ^1",
		"phpstan/phpstan": "^1.4",
		"phpstan/phpstan-phpunit": "^1",
		"phpunit/phpunit": "^7.5 \|\| ^8.5 \|\| ^9.5",
		"vimeo/psalm": "^4.22"
		},
		"type": "library",
		"autoload": {
		@@ -1256,7 +1257,7 @@
		],
		"support": {
		"issues": "https://github.com/doctrine/instantiator/issues",
		"source": "https://github.com/doctrine/instantiator/tree/1.4.0"
		"source": "https://github.com/doctrine/instantiator/tree/1.4.1"
		},
		"funding": [
		{
		@@ -1272,7 +1273,7 @@
		"type": "tidelift"
		}
		],
		"time": "2020-11-10T18:47:58+00:00"
		"time": "2022-03-03T08:28:38+00:00"
		},
		{
		"name": "doctrine/lexer",
		@@ -1833,12 +1834,12 @@
		"source": {
		"type": "git",
		"url": "https://github.com/laminas/laminas-cache-storage-adapter-memory.git",
		"reference": "e99380bf735559e69770da7f4fc69cb6525cd00f"
		"reference": "ede186514104ea6f4226264f07bc571c0f3b68aa"
		},
		"dist": {
		"type": "zip",
		"url": "https://api.github.com/repos/laminas/laminas-cache-storage-adapter-memory/zipball/e99380bf735559e69770da7f4fc69cb6525cd00f",
		"reference": "e99380bf735559e69770da7f4fc69cb6525cd00f",
		"url": "https://api.github.com/repos/laminas/laminas-cache-storage-adapter-memory/zipball/ede186514104ea6f4226264f07bc571c0f3b68aa",
		"reference": "ede186514104ea6f4226264f07bc571c0f3b68aa",
		"shasum": ""
		},
		"require": {
		@@ -1891,7 +1892,7 @@
		"type": "community_bridge"
		}
		],
		"time": "2022-02-28T20:15:47+00:00"
		"time": "2022-03-06T03:42:47+00:00"
		},
		{
		"name": "laminas/laminas-cache-storage-deprecated-factory",
		@@ -5043,16 +5044,16 @@
		},
		{
		"name": "myclabs/deep-copy",
		"version": "1.10.3",
		"version": "1.11.0",
		"source": {
		"type": "git",
		"url": "https://github.com/myclabs/DeepCopy.git",
		"reference": "c6a951b75d684fd43fbbd69617488e1e2e8924ba"
		"reference": "14daed4296fae74d9e3201d2c4925d1acb7aa614"
		},
		"dist": {
		"type": "zip",
		"url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/c6a951b75d684fd43fbbd69617488e1e2e8924ba",
		"reference": "c6a951b75d684fd43fbbd69617488e1e2e8924ba",
		"url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/14daed4296fae74d9e3201d2c4925d1acb7aa614",
		"reference": "14daed4296fae74d9e3201d2c4925d1acb7aa614",
		"shasum": ""
		},
		"require": {
		@@ -5090,7 +5091,7 @@
		],
		"support": {
		"issues": "https://github.com/myclabs/DeepCopy/issues",
		"source": "https://github.com/myclabs/DeepCopy/tree/1.10.3"
		"source": "https://github.com/myclabs/DeepCopy/tree/1.11.0"
		},
		"funding": [
		{
		@@ -5098,7 +5099,7 @@
		"type": "tidelift"
		}
		],
		"time": "2022-03-02T14:16:47+00:00"
		"time": "2022-03-03T13:19:32+00:00"
		},
		{
		"name": "nikic/php-parser",
		@@ -5158,16 +5159,16 @@
		},
		{
		"name": "ocramius/proxy-manager",
		"version": "2.14.0",
		"version": "2.14.1",
		"source": {
		"type": "git",
		"url": "https://github.com/Ocramius/ProxyManager.git",
		"reference": "dbcdf2c925c774d3521107174672665a2f0f7255"
		"reference": "3990d60ef79001badbab4927a6a811682274a0d1"
		},
		"dist": {
		"type": "zip",
		"url": "https://api.github.com/repos/Ocramius/ProxyManager/zipball/dbcdf2c925c774d3521107174672665a2f0f7255",
		"reference": "dbcdf2c925c774d3521107174672665a2f0f7255",
		"url": "https://api.github.com/repos/Ocramius/ProxyManager/zipball/3990d60ef79001badbab4927a6a811682274a0d1",
		"reference": "3990d60ef79001badbab4927a6a811682274a0d1",
		"shasum": ""
		},
		"require": {
		@@ -5223,7 +5224,7 @@
		],
		"support": {
		"issues": "https://github.com/Ocramius/ProxyManager/issues",
		"source": "https://github.com/Ocramius/ProxyManager/tree/2.14.0"
		"source": "https://github.com/Ocramius/ProxyManager/tree/2.14.1"
		},
		"funding": [
		{
		@@ -5235,7 +5236,7 @@
		"type": "tidelift"
		}
		],
		"time": "2022-02-28T13:55:36+00:00"
		"time": "2022-03-05T18:43:14+00:00"
		},
		{
		"name": "paragonie/random_compat",
		@@ -5898,7 +5899,7 @@
		},
		{
		"name": "symfony/polyfill-ctype",
		"version": "v1.24.0",
		"version": "v1.25.0",
		"source": {
		"type": "git",
		"url": "https://github.com/symfony/polyfill-ctype.git",
		@@ -5960,7 +5961,7 @@
		"portable"
		],
		"support": {
		"source": "https://github.com/symfony/polyfill-ctype/tree/v1.24.0"
		"source": "https://github.com/symfony/polyfill-ctype/tree/v1.25.0"
		},
		"funding": [
		{
		@@ -5980,7 +5981,7 @@
		},
		{
		"name": "symfony/polyfill-intl-grapheme",
		"version": "v1.24.0",
		"version": "v1.25.0",
		"source": {
		"type": "git",
		"url": "https://github.com/symfony/polyfill-intl-grapheme.git",
		@@ -6041,7 +6042,7 @@
		"shim"
		],
		"support": {
		"source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.24.0"
		"source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.25.0"
		},
		"funding": [
		{
		@@ -6061,7 +6062,7 @@
		},
		{
		"name": "symfony/polyfill-intl-idn",
		"version": "v1.24.0",
		"version": "v1.25.0",
		"source": {
		"type": "git",
		"url": "https://github.com/symfony/polyfill-intl-idn.git",
		@@ -6128,7 +6129,7 @@
		"shim"
		],
		"support": {
		"source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.24.0"
		"source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.25.0"
		},
		"funding": [
		{
		@@ -6148,7 +6149,7 @@
		},
		{
		"name": "symfony/polyfill-intl-normalizer",
		"version": "v1.24.0",
		"version": "v1.25.0",
		"source": {
		"type": "git",
		"url": "https://github.com/symfony/polyfill-intl-normalizer.git",
		@@ -6212,7 +6213,7 @@
		"shim"
		],
		"support": {
		"source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.24.0"
		"source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.25.0"
		},
		"funding": [
		{
		@@ -6232,7 +6233,7 @@
		},
		{
		"name": "symfony/polyfill-mbstring",
		"version": "v1.24.0",
		"version": "v1.25.0",
		"source": {
		"type": "git",
		"url": "https://github.com/symfony/polyfill-mbstring.git",
		@@ -6295,7 +6296,7 @@
		"shim"
		],
		"support": {
		"source": "https://github.com/symfony/polyfill-mbstring/tree/v1.24.0"
		"source": "https://github.com/symfony/polyfill-mbstring/tree/v1.25.0"
		},
		"funding": [
		{
		@@ -6315,7 +6316,7 @@
		},
		{
		"name": "symfony/polyfill-php72",
		"version": "v1.24.0",
		"version": "v1.25.0",
		"source": {
		"type": "git",
		"url": "https://github.com/symfony/polyfill-php72.git",
		@@ -6371,7 +6372,7 @@
		"shim"
		],
		"support": {
		"source": "https://github.com/symfony/polyfill-php72/tree/v1.24.0"
		"source": "https://github.com/symfony/polyfill-php72/tree/v1.25.0"
		},
		"funding": [
		{
		@@ -6391,16 +6392,16 @@
		},
		{
		"name": "symfony/polyfill-php80",
		"version": "v1.24.0",
		"version": "v1.25.0",
		"source": {
		"type": "git",
		"url": "https://github.com/symfony/polyfill-php80.git",
		"reference": "57b712b08eddb97c762a8caa32c84e037892d2e9"
		"reference": "4407588e0d3f1f52efb65fbe92babe41f37fe50c"
		},
		"dist": {
		"type": "zip",
		"url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/57b712b08eddb97c762a8caa32c84e037892d2e9",
		"reference": "57b712b08eddb97c762a8caa32c84e037892d2e9",
		"url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/4407588e0d3f1f52efb65fbe92babe41f37fe50c",
		"reference": "4407588e0d3f1f52efb65fbe92babe41f37fe50c",
		"shasum": ""
		},
		"require": {
		@@ -6454,7 +6455,7 @@
		"shim"
		],
		"support": {
		"source": "https://github.com/symfony/polyfill-php80/tree/v1.24.0"
		"source": "https://github.com/symfony/polyfill-php80/tree/v1.25.0"
		},
		"funding": [
		{
		@@ -6470,11 +6471,11 @@
		"type": "tidelift"
		}
		],
		"time": "2021-09-13T13:58:33+00:00"
		"time": "2022-03-04T08:16:47+00:00"
		},
		{
		"name": "symfony/polyfill-php81",
		"version": "v1.24.0",
		"version": "v1.25.0",
		"source": {
		"type": "git",
		"url": "https://github.com/symfony/polyfill-php81.git",
		@@ -6533,7 +6534,7 @@
		"shim"
		],
		"support": {
		"source": "https://github.com/symfony/polyfill-php81/tree/v1.24.0"
		"source": "https://github.com/symfony/polyfill-php81/tree/v1.25.0"
		},
		"funding": [
		{
		@@ -6721,16 +6722,16 @@
		},
		{
		"name": "symfony/var-dumper",
		"version": "v6.0.5",
		"version": "v6.0.6",
		"source": {
		"type": "git",
		"url": "https://github.com/symfony/var-dumper.git",
		"reference": "60d6a756d5f485df5e6e40b337334848f79f61ce"
		"reference": "38358405ae948963c50a3aae3dfea598223ba15e"
		},
		"dist": {
		"type": "zip",
		"url": "https://api.github.com/repos/symfony/var-dumper/zipball/60d6a756d5f485df5e6e40b337334848f79f61ce",
		"reference": "60d6a756d5f485df5e6e40b337334848f79f61ce",
		"url": "https://api.github.com/repos/symfony/var-dumper/zipball/38358405ae948963c50a3aae3dfea598223ba15e",
		"reference": "38358405ae948963c50a3aae3dfea598223ba15e",
		"shasum": ""
		},
		"require": {
		@@ -6789,7 +6790,7 @@
		"dump"
		],
		"support": {
		"source": "https://github.com/symfony/var-dumper/tree/v6.0.5"
		"source": "https://github.com/symfony/var-dumper/tree/v6.0.6"
		},
		"funding": [
		{
		@@ -6805,7 +6806,7 @@
		"type": "tidelift"
		}
		],
		"time": "2022-02-21T17:15:17+00:00"
		"time": "2022-03-02T12:58:14+00:00"
		},
		{
		"name": "unicaen/app",
		@@ -8314,16 +8315,16 @@
		},
		{
		"name": "symfony/dependency-injection",
		"version": "v6.0.5",
		"version": "v6.0.6",
		"source": {
		"type": "git",
		"url": "https://github.com/symfony/dependency-injection.git",
		"reference": "481846cbd2441cf3444340ee53486fc24da525bd"
		"reference": "a296611f599d0b28e7af88798f830f9cb4d1e8e6"
		},
		"dist": {
		"type": "zip",
		"url": "https://api.github.com/repos/symfony/dependency-injection/zipball/481846cbd2441cf3444340ee53486fc24da525bd",
		"reference": "481846cbd2441cf3444340ee53486fc24da525bd",
		"url": "https://api.github.com/repos/symfony/dependency-injection/zipball/a296611f599d0b28e7af88798f830f9cb4d1e8e6",
		"reference": "a296611f599d0b28e7af88798f830f9cb4d1e8e6",
		"shasum": ""
		},
		"require": {
		@@ -8382,7 +8383,7 @@
		"description": "Allows you to standardize and centralize the way objects are constructed in your application",
		"homepage": "https://symfony.com",
		"support": {
		"source": "https://github.com/symfony/dependency-injection/tree/v6.0.5"
		"source": "https://github.com/symfony/dependency-injection/tree/v6.0.6"
		},
		"funding": [
		{
		@@ -8398,20 +8399,20 @@
		"type": "tidelift"
		}
		],
		"time": "2022-02-24T10:01:27+00:00"
		"time": "2022-03-02T12:58:14+00:00"
		},
		{
		"name": "symfony/filesystem",
		"version": "v6.0.5",
		"version": "v6.0.6",
		"source": {
		"type": "git",
		"url": "https://github.com/symfony/filesystem.git",
		"reference": "6646c13f787057d64701a3a0235cf9567c6ccbbd"
		"reference": "52b888523545b0b4049ab9ce48766802484d7046"
		},
		"dist": {
		"type": "zip",
		"url": "https://api.github.com/repos/symfony/filesystem/zipball/6646c13f787057d64701a3a0235cf9567c6ccbbd",
		"reference": "6646c13f787057d64701a3a0235cf9567c6ccbbd",
		"url": "https://api.github.com/repos/symfony/filesystem/zipball/52b888523545b0b4049ab9ce48766802484d7046",
		"reference": "52b888523545b0b4049ab9ce48766802484d7046",
		"shasum": ""
		},
		"require": {
		@@ -8445,7 +8446,7 @@
		"description": "Provides basic utilities for the filesystem",
		"homepage": "https://symfony.com",
		"support": {
		"source": "https://github.com/symfony/filesystem/tree/v6.0.5"
		"source": "https://github.com/symfony/filesystem/tree/v6.0.6"
		},
		"funding": [
		{
		@@ -8461,7 +8462,7 @@
		"type": "tidelift"
		}
		],
		"time": "2022-02-28T07:42:30+00:00"
		"time": "2022-03-02T12:58:14+00:00"
		},
		{
		"name": "tysonandre/var_representation_polyfill",

module/Intervenant/src/Controller/StatutController.php

+9 −2

Original line number	Diff line number	Diff line
		@@ -11,6 +11,7 @@ use Intervenant\Form\StatutSaisieFormAwareTrait;
		use Application\Provider\Role\RoleProvider;
		use Application\Service\Traits\DossierAutreServiceAwareTrait;
		use Intervenant\Service\StatutServiceAwareTrait;
		use Plafond\Service\PlafondServiceAwareTrait;
		use UnicaenApp\View\Model\MessengerViewModel;
		use Intervenant\Service\TypeIntervenantServiceAwareTrait;
		use Laminas\View\Model\ViewModel;
		@@ -24,6 +25,7 @@ class StatutController extends AbstractController
		use CacheContainerTrait;
		use DossierAutreServiceAwareTrait;
		use ContextServiceAwareTrait;
		use PlafondServiceAwareTrait;

		public function indexAction()
		{
		@@ -67,12 +69,17 @@ class StatutController extends AbstractController
		$title = $statut->getLibelle();
		}

		$plafonds = $this->getServicePlafond()->getPlafondsConfig($statut);

		$canEdit = $this->isAllowed($statut, Privileges::INTERVENANT_STATUT_EDITION);
		if ($canEdit) {
		$form->bindRequestSave($statut, $this->getRequest(), function (Statut $si) {
		$form->bindRequestSave($statut, $this->getRequest(), function (Statut $si) use ($plafonds) {
		try {
		$isNew = !$si->getId();
		$this->getServiceStatut()->save($si);
		foreach ($plafonds as $plafond) {
		$this->getServicePlafond()->saveConfig($plafond);
		}
		unset($this->getCacheContainer(RoleProvider::class)->statutsInfo);
		unset($this->getCacheContainer(PrivilegeService::class)->privilegesRoles);
		$this->flashMessenger()->addSuccessMessage('Enregistrement effectué');
		@@ -88,7 +95,7 @@ class StatutController extends AbstractController
		$form->readOnly();
		}

		return compact('typesIntervenants', 'canEdit', 'statut', 'statuts', 'form', 'title');
		return compact('typesIntervenants', 'canEdit', 'statut', 'statuts', 'form', 'title', 'plafonds');
		}

module/Intervenant/view/intervenant/statut/saisie.phtml

+2 −1

Original line number	Diff line number	Diff line
		@@ -9,6 +9,7 @@ use Application\Provider\Privilege\Privileges;
		* @var $statuts \Intervenant\Entity\Db\Statut[]
		* @var $statut \Intervenant\Entity\Db\Statut
		* @var $form \Intervenant\Form\StatutSaisieForm
		* @var $plafonds \Plafond\Interfaces\PlafondConfigInterface[]
		* @var $title string
		*/

		@@ -264,7 +265,7 @@ $canAdd = $this->isAllowed(Privileges::getResourceId(Privileges::INTERVENANT_STA
		<div class="panel panel-default">
		<div class="panel-heading">Plafonds</div>
		<div class="panel-body">
		TODO
		<?php var_dump($plafonds) ?>
		</div>
		</div>

module/Plafond/config/module.config.php

+5 −7

Original line number	Diff line number	Diff line
		@@ -186,14 +186,12 @@ return [

		'controllers' => [
		'Plafond\Controller\Plafond' => Controller\PlafondControllerFactory::class,
		'Plafond\Controller\PlafondStructure' => Controller\PlafondStructureControllerFactory::class,
		'Plafond\Controller\Derogation' => Controller\DerogationControllerFactory::class,
		],

		'services' => [
		Assertion\PlafondAssertion::class => AssertionFactory::class,
		Service\PlafondService::class => Service\PlafondServiceFactory::class,
		Service\PlafondStructureService::class => Service\PlafondStructureServiceFactory::class,
		Processus\PlafondProcessus::class => Processus\PlafondProcessusFactory::class,
		],

module/Plafond/src/Form/PlafondConfigForm.php

+1 −23

Original line number	Diff line number	Diff line
		@@ -43,14 +43,7 @@ class PlafondConfigForm extends AbstractForm
		],
		]);

		$this->add([
		'name' => 'submit',
		'type' => 'Submit',
		'attributes' => [
		'value' => 'Enregistrer',
		'class' => 'btn btn-primary',
		],
		]);
		$this->addSubmit();
		}


		@@ -100,19 +93,4 @@ class PlafondConfigForm extends AbstractForm
		return $e;
		}



		/**
		* Should return an array specification compatible with
		* {@link Laminas\InputFilter\Factory::createInputFilter()}.
		*
		* @return array
		*/
		public function getInputFilterSpecification()
		{
		return [
		/* Filtres et validateurs */
		];
		}

		}
		No newline at end of file