Merge branch 'master' of git.unicaen.fr:open-source/oscar into starling (303d96ea) · Commits · open-source / oscar

module/Oscar/src/Oscar/Entity/PersonRepository.php

+10 −6

Original line number	Diff line number	Diff line
		@@ -11,6 +11,7 @@ use Doctrine\ORM\AbstractQuery;
		use Doctrine\ORM\EntityRepository;
		use Doctrine\ORM\Query\Expr\Join;
		use Doctrine\ORM\Query\ResultSetMapping;
		use Doctrine\ORM\QueryBuilder;
		use Oscar\Connector\IConnectedRepository;
		use Oscar\Import\Data\DataExtractorFullname;
		use Oscar\Utils\DateTimeUtils;
		@@ -411,14 +412,18 @@ class PersonRepository extends EntityRepository implements IConnectedRepository
		}

		/**
		* @param $connector
		* @param $value
		* @return \Doctrine\ORM\QueryBuilder
		* @param string $connector
		* @param int\|string $value
		* @return QueryBuilder
		*/
		public function getPersonByConnectorQuery($connector, $value)
		public function getPersonByConnectorQuery(string $connector, int\|string $value) :QueryBuilder
		{
		$qb = $this->getEntityManager()->createQueryBuilder();
		$search = sprintf('s:%s:"%s";s:%s:"%s";', strlen($connector), $connector, strlen($value), str_replace('_', '\\_', $value));
		if (is_int($value)) {
		$search = sprintf('s:%s:"%s";i:%d;', strlen($connector), $connector, $value);
		} else {
		$search = sprintf('s:%s:"%s";s:%s:"%s";', strlen($connector), $connector, strlen($value), $value);
		}
		$qb->select('p')
		->from(Person::class, 'p')
		->where('p.connectors LIKE :search')
		@@ -427,7 +432,6 @@ class PersonRepository extends EntityRepository implements IConnectedRepository
		return $qb;
		}


		public function getRolesLdapUsed()
		{
		$query = $this->getEntityManager()->createQuery(