Commit 2a51f51d authored Jun 05, 2025 by Laurent Lecluse

Merge remote-tracking branch 'origin/master' into php84

# Conflicts:
#	composer.json

parents 45052b80 f638f0ed

CHANGELOG.md

+11 −0

Original line number	Diff line number	Diff line
		CHANGELOG
		=========

		6.0.6 (20/02/2025)
		------------------

		- [Fix] Possibilité de préciser l'entité à utiliser pour le diff. de Ligne


		6.0.5 (09/01/2025)
		------------------

		- Compatibilité Ok UnicaenPrivilege 7.0

		6.0.4 (20/11/2024)
		------------------

composer.json

+2 −2

Original line number	Diff line number	Diff line
		@@ -8,8 +8,8 @@
		}
		],
		"require" : {
		"unicaen/privilege" : "*",
		"symfony/console" : "^5.4\|^6.0\|^7.0"
		"unicaen/privilege" : "^6.0\|^7.0",
		"symfony/console": "^4.4\|^5.4\|^6.0\|^7.0"
		},
		"require-dev" : {
		"phpunit/phpunit": "^5.7"

src/Entity/Differentiel/Ligne.php

+5 −3

Original line number	Diff line number	Diff line
		@@ -183,10 +183,12 @@ class Ligne
		*
		* @return StdClass
		*/
		public function getEntity()
		public function getEntity(?string $entityClass = null)
		{
		if (!$entityClass) {
		$filter = new UnderscoreToCamelCase();
		$entityClass = 'Application\\Entity\Db\\' . $filter->filter(strtolower($this->getTableName()));
		}

		return $this->entityManager->find($entityClass, $this->getId());
		}