Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-06-07 18:44:08 +00:00
Code Issues Actions Projects Releases Wiki Activity

fix: Remove deprecations.

Browse Source
This commit is contained in:
Pol Dellaiera 2021-11-18 14:33:06 +01:00
parent ae79ebc299
commit 7fd45d5735
No known key found for this signature in database
GPG Key ID: D476DFE9C67467CA
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/Bundle/ChillReportBundle/Timeline/TimelineReportProvider.php
View File

@ -22,7 +22,6 @@ use Chill\MainBundle\Timeline\TimelineSingleQuery;
*/ */
class TimelineReportProvider implements TimelineProviderInterface class TimelineReportProvider implements TimelineProviderInterface
{ {
protected EntityManager $em; protected EntityManager $em;
protected AuthorizationHelper $helper; protected AuthorizationHelper $helper;
@ -84,10 +83,12 @@ class TimelineReportProvider implements TimelineProviderInterface
private function getWhereClauseForCenter(string $context, array $args): array private function getWhereClauseForCenter(string $context, array $args): array
{ {
$role = 'CHILL_REPORT_SEE';
$report = $this->em->getClassMetadata(Report::class); $report = $this->em->getClassMetadata(Report::class);
$person = $this->em->getClassMetadata(Person::class); $person = $this->em->getClassMetadata(Person::class);
$role = new Role('CHILL_REPORT_SEE');
$reachableCenters = $this->helper->getReachableCenters($this->security->getUser(), $role->getRole()); $reachableCenters = $this->helper->getReachableCenters($this->security->getUser(), $role);
$reportPersonId = $report->getAssociationMapping('person')['joinColumns'][0]['name']; $reportPersonId = $report->getAssociationMapping('person')['joinColumns'][0]['name'];
$reportScopeId = $report->getAssociationMapping('scope')['joinColumns'][0]['name']; $reportScopeId = $report->getAssociationMapping('scope')['joinColumns'][0]['name'];
$personCenterId = $person->getAssociationMapping('center')['joinColumns'][0]['name']; $personCenterId = $person->getAssociationMapping('center')['joinColumns'][0]['name'];
@ -110,7 +111,7 @@ class TimelineReportProvider implements TimelineProviderInterface
$parameters[] = $center->getId(); $parameters[] = $center->getId();
// loop over scopes // loop over scopes
$scopeIds = []; $scopeIds = [];
foreach ($this->helper->getReachableScopes($this->security->getUser(), $role->getRole(), $center) as $scope) { foreach ($this->helper->getReachableScopes($this->security->getUser(), $role, $center) as $scope) {
if (\in_array($scope->getId(), $scopeIds)) { if (\in_array($scope->getId(), $scopeIds)) {
continue; continue;
} }
@ -144,9 +145,9 @@ class TimelineReportProvider implements TimelineProviderInterface
private function getWhereClauseForPerson(string $context, array $args): array private function getWhereClauseForPerson(string $context, array $args): array
{ {
$role = 'CHILL_REPORT_SEE';
$report = $this->em->getClassMetadata(Report::class); $report = $this->em->getClassMetadata(Report::class);
$person = $this->em->getClassMetadata(Person::class); $person = $this->em->getClassMetadata(Person::class);
$role = new Role('CHILL_REPORT_SEE');
$reportPersonId = $report->getAssociationMapping('person')['joinColumns'][0]['name']; $reportPersonId = $report->getAssociationMapping('person')['joinColumns'][0]['name'];
$reportScopeId = $report->getAssociationMapping('scope')['joinColumns'][0]['name']; $reportScopeId = $report->getAssociationMapping('scope')['joinColumns'][0]['name'];
$personCenterId = $person->getAssociationMapping('center')['joinColumns'][0]['name']; $personCenterId = $person->getAssociationMapping('center')['joinColumns'][0]['name'];
@ -156,7 +157,7 @@ class TimelineReportProvider implements TimelineProviderInterface
// this is the final clause that we are going to fill // this is the final clause that we are going to fill
$clause = "{report}.{person_id} = ? AND {report}.{scopes_id} IN ({scopes_ids})"; $clause = "{report}.{person_id} = ? AND {report}.{scopes_id} IN ({scopes_ids})";
// iterate over reachable scopes // iterate over reachable scopes
$scopes = $this->helper->getReachableScopes($this->security->getUser(), $role->getRole(), $args['person']->getCenter()); $scopes = $this->helper->getReachableScopes($this->security->getUser(), $role, $args['person']->getCenter());
foreach ($scopes as $scope) { foreach ($scopes as $scope) {
if (\in_array($scope->getId(), $parameters)) { if (\in_array($scope->getId(), $parameters)) {