Merge remote-tracking branch 'origin/master'

This commit is contained in:
Julien Fastré 2021-12-07 18:23:13 +01:00
commit 56dd825f39
2 changed files with 3 additions and 4 deletions

View File

@ -31,8 +31,7 @@ class ActivityRepository extends ServiceEntityRepository
} }
/** /**
* @deprecated use @see{ActivityACLAwareRepositoryInterface::findByAccompanyingPeriod} * @deprecated use @link{ActivityACLAwareRepositoryInterface::findByAccompanyingPeriod}
*
* @return Activity[] * @return Activity[]
*/ */
public function findByAccompanyingPeriod(AccompanyingPeriod $period, array $scopes, ?bool $allowNullScope = false, ?int $limit = 100, ?int $offset = 0, array $orderBy = ['date' => 'desc']): array public function findByAccompanyingPeriod(AccompanyingPeriod $period, array $scopes, ?bool $allowNullScope = false, ?int $limit = 100, ?int $offset = 0, array $orderBy = ['date' => 'desc']): array

View File

@ -122,7 +122,7 @@ class SocialIssue
} }
/** /**
* get all the ancestors of the social issue. * get all the ancestors of the social issue
* *
* @param bool $includeThis if the array in the result must include the present SocialIssue * @param bool $includeThis if the array in the result must include the present SocialIssue
*/ */
@ -135,7 +135,7 @@ class SocialIssue
} }
$current = $this; $current = $this;
while ($current->hasParent()) { while ($current->hasParent()) {
$ancestors[] = $current = $current->getParent(); $ancestors[] = $current = $current->getParent();
} }