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

src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseController.php

@@ -32,6 +32,7 @@ use Symfony\Component\Workflow\Registry;
 use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
+use function array_slice;
 use function is_array;
 
 /**
@@ -221,9 +222,11 @@ class AccompanyingCourseController extends Controller
 
         $activities = $this->getDoctrine()->getManager()->getRepository(Activity::class)->findBy(
             ['accompanyingPeriod' => $accompanyingCourse],
-            ['date' => 'DESC'],
+            ['date' => 'DESC', 'id' => 'DESC'],
         );
 
+        $activities = array_slice($activities, 0, 3);
+
         $works = $this->workRepository->findByAccompanyingPeriod(
             $accompanyingCourse,
             ['startDate' => 'DESC', 'endDate' => 'DESC'],

src/Bundle/ChillPersonBundle/Controller/PersonController.php

@@ -30,8 +30,8 @@ use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpFoundation\Session\SessionInterface;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Component\Security\Core\Security;
-use Symfony\Component\Translation\TranslatorInterface;
 use Symfony\Component\Validator\Validator\ValidatorInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 use function count;
 use function hash;

src/Bundle/ChillPersonBundle/Controller/PersonDuplicateController.php

@@ -28,7 +28,7 @@ use http\Exception\InvalidArgumentException;
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\Translation\TranslatorInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 use function count;