From 94b5c06d102cba1296b477e9eb6db1a86c612ce6 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Thu, 11 Sep 2025 12:12:29 +0200
Subject: [PATCH] Fix TranslatableActivityTypeTest.php

---
 .../Tests/Form/ActivityTypeTest.php           | 46 +++++++++----------
 .../Type/TranslatableActivityTypeTest.php     |  6 +--
 2 files changed, 25 insertions(+), 27 deletions(-)

diff --git a/src/Bundle/ChillActivityBundle/Tests/Form/ActivityTypeTest.php b/src/Bundle/ChillActivityBundle/Tests/Form/ActivityTypeTest.php
index 5d5eb622b..fd66424df 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Form/ActivityTypeTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Form/ActivityTypeTest.php
@@ -12,32 +12,28 @@ declare(strict_types=1);
 namespace Chill\ActivityBundle\Tests\Form;
 
 use Chill\ActivityBundle\Entity\Activity;
-use Chill\ActivityBundle\Form\ActivityType;
+use Chill\ActivityBundle\Entity\ActivityType;
+use Chill\MainBundle\Entity\Center;
+use Chill\MainBundle\Entity\User;
+use Prophecy\Prophet;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 use Symfony\Component\Form\Extension\Core\Type\FormType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Security\Core\Authentication\Token\AbstractToken;
+use Symfony\Component\Security\Core\User\UserInterface;
 
 /**
  * @internal
  *
  * @coversNothing
  */
-final class ActivityTypeTest extends KernelTestCase
+class ActivityTypeTest extends KernelTestCase
 {
-    /**
-     * @var \Chill\MainBundle\Entity\Center
-     */
-    protected $center;
+    protected Center $center;
+    protected FormBuilderInterface $formBuilder;
 
-    /**
-     * @var \Symfony\Component\Form\FormBuilderInterface
-     */
-    protected $formBuilder;
-
-    /**
-     * @var \Symfony\Component\Security\Core\User\UserInterface
-     */
-    protected $user;
+    protected UserInterface $user;
 
     protected function setUp(): void
     {
@@ -45,39 +41,41 @@ final class ActivityTypeTest extends KernelTestCase
 
         $this->container = self::$kernel->getContainer();
 
-        $prophet = new \Prophecy\Prophet();
+        $prophet = new Prophet();
 
-        $this->formBuilder = $this->container
+        $this->formBuilder = static::getContainer()
             ->get('form.factory')
             ->createBuilder(FormType::class, null, [
                 'csrf_protection' => false,
                 'csrf_field_name' => '_token',
             ]);
 
-        $request = new \Symfony\Component\HttpFoundation\Request();
+        $request = new Request();
         $request->setLocale('fr');
 
         self::$kernel->getContainer()
             ->get('request_stack')
             ->push($request);
 
-        $this->user = $this->container->get('doctrine.orm.entity_manager')
-            ->getRepository(\Chill\MainBundle\Entity\User::class)
+        $em = static::getContainer()->get('doctrine.orm.entity_manager');
+
+        $this->user = $em
+            ->getRepository(User::class)
             ->findOneBy(['username' => 'center a_social']);
-        $this->center = $this->container->get('doctrine.orm.entity_manager')
-            ->getRepository(\Chill\MainBundle\Entity\Center::class)
+        $this->center = $em
+            ->getRepository(Center::class)
             ->findOneBy(['name' => 'Center A']);
         $token = $prophet->prophesize();
         $token->willExtend(AbstractToken::class);
         $token->getUser()->willReturn($this->user);
-        $this->container->get('security.token_storage')
+        static::getContainer()->get('security.token_storage')
             ->setToken($token->reveal());
     }
 
     public function testForm(): void
     {
         $form = $this->formBuilder
-            ->add('activity', ActivityType::class, [
+            ->add('activity', \Chill\ActivityBundle\Form\ActivityType::class, [
                 'center' => $this->center,
                 'role' => 'CHILL_ACTIVITY_CREATE',
             ])
diff --git a/src/Bundle/ChillActivityBundle/Tests/Form/Type/TranslatableActivityTypeTest.php b/src/Bundle/ChillActivityBundle/Tests/Form/Type/TranslatableActivityTypeTest.php
index 88cf914e1..c246bf829 100644
--- a/src/Bundle/ChillActivityBundle/Tests/Form/Type/TranslatableActivityTypeTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Form/Type/TranslatableActivityTypeTest.php
@@ -21,7 +21,7 @@ use Symfony\Component\Form\Extension\Core\Type\FormType;
  *
  * @coversNothing
  */
-final class TranslatableActivityTypeTest extends KernelTestCase
+class TranslatableActivityTypeTest extends KernelTestCase
 {
     /**
      * @var \Symfony\Component\Form\FormBuilderInterface
@@ -42,7 +42,7 @@ final class TranslatableActivityTypeTest extends KernelTestCase
         $request = new \Symfony\Component\HttpFoundation\Request();
         $request->setLocale('fr');
 
-        $this->container->get('request_stack')
+        static::getContainer()->get('request_stack')
             ->push($request);
     }
 
@@ -87,7 +87,7 @@ final class TranslatableActivityTypeTest extends KernelTestCase
      */
     protected function getRandomType(mixed $active = true)
     {
-        $types = $this->container->get('doctrine.orm.entity_manager')
+        $types = static::getContainer()->get('doctrine.orm.entity_manager')
             ->getRepository(ActivityType::class)
             ->findBy(['active' => $active]);