Merge branch 'dune-risky' into fix-person-tests

This commit is contained in:
Julien Fastré 2021-06-02 00:47:14 +02:00
commit e8f3c499ee

View File

@ -117,7 +117,7 @@ class TimelineActivityProvider implements TimelineProviderInterface
private function getWhereClauseForPerson(Person $person)
{
$parameters = [];
$metadataActivity = $this->em->getClassMetadata('ChillActivityBundle:Activity');
$metadataActivity = $this->em->getClassMetadata(Activity::class);
$associationMapping = $metadataActivity->getAssociationMapping('person');
$role = new Role('CHILL_ACTIVITY_SEE');
$reachableScopes = $this->helper->getReachableScopes($this->user,
@ -154,8 +154,8 @@ class TimelineActivityProvider implements TimelineProviderInterface
private function getFromClausePerson()
{
$metadataActivity = $this->em->getClassMetadata('ChillActivityBundle:Activity');
$metadataPerson = $this->em->getClassMetadata('ChillPersonBundle:Person');
$metadataActivity = $this->em->getClassMetadata(Activity::class);
$metadataPerson = $this->em->getClassMetadata(Person::class);
$associationMapping = $metadataActivity->getAssociationMapping('person');
return $metadataActivity->getTableName().' JOIN '
@ -173,7 +173,7 @@ class TimelineActivityProvider implements TimelineProviderInterface
*/
public function getEntities(array $ids)
{
$activities = $this->em->getRepository('ChillActivityBundle:Activity')
$activities = $this->em->getRepository(Activity::class)
->findBy(array('id' => $ids));
$result = array();