Adaptation php8.4 (c609e52f) · Commits · open-source / OSE

composer.json

+13 −11

Original line number	Diff line number	Diff line
		@@ -9,8 +9,9 @@
		}
		],
		"require" : {
		"php" : ">=8.2",
		"php" : ">=8.4",
		"laminas/laminas-cli" : "1.11.0",
		"laminas/laminas-cache-storage-adapter-filesystem": 2.5.0,
		"symfony/process" : "7.2.0",

		"twbs/bootstrap" : "5.0.2",
		@@ -21,19 +22,20 @@
		"datatables.net/datatables.net-bs5": "2.1.8",
		"vakata/jstree" : "3.3.17",

		"unicaen/app" : "7.1.0",
		"unicaen/authentification" : "6.4.3",
		"unicaen/privilege" : "6.2.1",
		"unicaen/utilisateur" : "7.0.2",
		"unicaen/code" : "6.5.0",
		"unicaen/import" : "6.0.6",
		"unicaen/tbl" : "6.2.5",
		"unicaen/app" : "dev-php84",
		"unicaen/authentification" : "dev-php84",
		"unicaen/privilege" : "dev-php84",
		"unicaen/utilisateur" : "dev-php84",
		"unicaen/code" : "dev-master",
		"unicaen/import" : "dev-php84",
		"unicaen/tbl" : "dev-php84",
		"unicaen/open-document" : "6.0.10",
		"unicaen/siham" : "6.2.0",
		"unicaen/mail" : "7.1.2",
		"unicaen/mail" : "dev-php84",
		"unicaen/vue" : "6.3.3",
		"unicaen/bddadmin" : "1.4.2",
		"unicaen/signature" : "1.0.6",
		"unicaen/bddadmin" : "dev-main",
		"unicaen/zfc-user": "dev-php84",
		"unicaen/signature" : "dev-master",
		"connecteur-ose/actul" : "dev-master",
		"connecteur-ose/pegase" : "dev-master"
		},

+627 −719

File changed.

Preview size limit exceeded, changes collapsed.

+16 −0

Original line number	Diff line number	Diff line
		@@ -111,4 +111,20 @@ return [
		],
		],
		],
		'caches' => [
		'doctrinemodule.cache.filesystem' => [
		'options' => [
		'cache_dir' => 'cache/Doctrine',
		],
		],
		/*'filesystem' => [
		'class' => Laminas\Cache\Storage\Adapter\Filesystem::class,
		//'options' => [

		//],
		//'cache_dir' => 'cache/Doctrine',
		'directory' => 'cache/Doctrine',
		'namespace' => 'DoctrineModule',
		],*/
		],
		];

+2 −1

Original line number	Diff line number	Diff line
		@@ -2,6 +2,8 @@

		$modules = [
		'Laminas\Cache',
		'Laminas\Cache\Storage\Adapter\Memory',
		'Laminas\Cache\Storage\Adapter\Filesystem',
		'Laminas\Filter',
		'Laminas\Form',
		'Laminas\Hydrator',
		@@ -9,7 +11,6 @@ $modules = [
		'Laminas\InputFilter',
		'Laminas\Mvc\I18n',
		'Laminas\Mvc\Plugin\FlashMessenger',
		'Laminas\Mvc\Plugin\Prg',
		'Laminas\Navigation',
		'Laminas\Paginator',
		'Laminas\Router',

+2 −2

Original line number	Diff line number	Diff line
		@@ -20,7 +20,7 @@ class GestionAssertion extends AbstractAssertion



		protected function assertController($controller, $action = null, $privilege = null)
		protected function assertController($controller, $action = null, $privilege = null): bool
		{
		$role = $this->getRole();

		@@ -37,7 +37,7 @@ class GestionAssertion extends AbstractAssertion



		protected function assertIntervenant( Role $role, $privilege )
		protected function assertIntervenant( Role $role, $privilege ): bool
		{
		return $this->asserts([
		!$privilege \|\| $role->hasPrivilege($privilege), // pareil si le rôle ne possède pas le privilège adéquat