keep prophecy when test get 'request_stack'

src/Bundle/ChillActivityBundle/Tests/Export/Filter/ActivityReasonFilterTest.php

@@ -14,6 +14,7 @@ namespace Chill\ActivityBundle\Tests\Export\Filter;
 use Chill\ActivityBundle\Export\Filter\PersonFilters\ActivityReasonFilter;
 use Chill\MainBundle\Test\Export\AbstractFilterTest;
 use Doctrine\Common\Collections\ArrayCollection;
+use Prophecy\PhpUnit\ProphecyTrait;
 
 /**
  * @internal
@@ -21,23 +22,22 @@ use Doctrine\Common\Collections\ArrayCollection;
  */
 final class ActivityReasonFilterTest extends AbstractFilterTest
 {
+    use ProphecyTrait;
+    
     private ActivityReasonFilter $filter;
 
     protected function setUp(): void
     {
         self::bootKernel();
 
-        $container = self::$kernel->getContainer();
+        $this->filter = self::$container->get('chill.activity.export.reason_filter');
 
-        $this->filter = $container->get('chill.activity.export.reason_filter');
-
-        // add a fake request with a default locale (used in translatable string)
-        $prophet = new \Prophecy\Prophet();
-        $request = $prophet->prophesize();
-        $request->willExtend(\Symfony\Component\HttpFoundation\Request::class);
+        $request = $this->prophesize()
+            ->willExtend(\Symfony\Component\HttpFoundation\Request::class);
+        
         $request->getLocale()->willReturn('fr');
 
-        $container->get('request_stack')
+        self::$container->get('request_stack')
             ->push($request->reveal());
     }
 

src/Bundle/ChillActivityBundle/Tests/Export/Filter/PersonHavingActivityBetweenDateFilterTest.php

@@ -28,18 +28,14 @@ final class PersonHavingActivityBetweenDateFilterTest extends AbstractFilterTest
     {
         self::bootKernel();
 
-        $container = self::$kernel->getContainer();
+        $this->filter = self::$container->get('chill.activity.export.person_having_an_activity_between_date_filter');
 
-        $this->filter = $container->get('chill.activity.export.'
-            . 'person_having_an_activity_between_date_filter');
+        $request = $this->prophesize()
+            ->willExtend(\Symfony\Component\HttpFoundation\Request::class);
 
-        // add a fake request with a default locale (used in translatable string)
-        $prophet = new \Prophecy\Prophet();
-        $request = $prophet->prophesize();
-        $request->willExtend(\Symfony\Component\HttpFoundation\Request::class);
         $request->getLocale()->willReturn('fr');
 
-        $container->get('request_stack')
+        self::$container->get('request_stack')
             ->push($request->reveal());
     }
 

src/Bundle/ChillPersonBundle/Tests/Export/Export/ListPersonTest.php

@@ -14,6 +14,7 @@ namespace Chill\PersonBundle\Tests\Export\Export;
 use Chill\MainBundle\Test\Export\AbstractExportTest;
 use Chill\PersonBundle\Export\Export\ListPerson;
 use DateTime;
+use Prophecy\PhpUnit\ProphecyTrait;
 
 /**
  * Test the export "ListPerson".
@@ -23,10 +24,9 @@ use DateTime;
  */
 final class ListPersonTest extends AbstractExportTest
 {
-    /**
-     * @var ListPerson
-     */
-    private $export;
+    use ProphecyTrait;
+
+    private ListPerson $export;
 
     protected function setUp(): void
     {
@@ -34,10 +34,9 @@ final class ListPersonTest extends AbstractExportTest
 
         $this->export = self::$container->get('chill.person.export.list_person');
 
-        // add a fake request with a default locale (used in translatable string)
-        $prophet = new \Prophecy\Prophet();
-        $request = $prophet->prophesize();
-        $request->willExtend(\Symfony\Component\HttpFoundation\Request::class);
+        $request = $this->prophesize()
+            ->willExtend(\Symfony\Component\HttpFoundation\Request::class);
+
         $request->getLocale()->willReturn('fr');
 
         self::$container->get('request_stack')
@@ -49,7 +48,7 @@ final class ListPersonTest extends AbstractExportTest
         return $this->export;
     }
 
-    public function getFormData()
+    public function getFormData(): array
     {
         return [
             ['fields' => ['id', 'firstName', 'lastName']],
@@ -65,7 +64,7 @@ final class ListPersonTest extends AbstractExportTest
         ];
     }
 
-    public function getModifiersCombination()
+    public function getModifiersCombination(): array
     {
         return [
             ['person'],

src/Bundle/ChillPersonBundle/Tests/Export/Filter/AccompanyingCourseFilters/RequestorFilterTest.php

@@ -26,7 +26,6 @@ final class RequestorFilterTest extends AbstractFilterTest
 
     protected function setUp(): void
     {
-        //parent::setUp();
         self::bootKernel();
 
         // add a fake request with a default locale (used in translatable string)