minor symfony#2079 [LiveComponent] Fix PHP8.4 errors + deprecations (…

…smnandre) This PR was merged into the 2.x branch. Discussion ---------- [LiveComponent] Fix PHP8.4 errors + deprecations First patch of fixes (thanks to the PHP 8.4 tesst) Commits ------- 0a862d7 [LiveComponent] Fix PHP8.4 errors + deprecations
Kocal · Aug 25, 2024 · 211ee5b · 211ee5b
2 parents b083b76 + 0a862d7
commit 211ee5b
Show file tree

Hide file tree

Showing 19 changed files with 125 additions and 151 deletions.
diff --git a/src/Icons/tests/Integration/Command/SearchIconCommandTest.php b/src/Icons/tests/Integration/Command/SearchIconCommandTest.php
@@ -23,19 +23,20 @@ final class SearchIconCommandTest extends KernelTestCase
 
     public function testSearchWithPrefix(): void
     {
-        $this->consoleCommand('ux:icons:search lucide')
+        $this->consoleCommand('ux:icons:search iconoir')
             ->execute()
             ->assertSuccessful()
             ->assertOutputContains('Icon set')
-            ->assertOutputContains('Lucide')
+            ->assertOutputContains('Iconoir')
             ->assertOutputContains('Icons')
             ->assertOutputContains('License')
-            ->assertOutputContains('ISC')
+            ->assertOutputContains('MIT')
             ->assertOutputContains('Prefix')
-            ->assertOutputContains('lucide')
+            ->assertOutputContains('iconoir')
             ->assertOutputContains('Example')
-            ->assertOutputContains('lucide:')
-            ->assertOutputContains('php bin/console ux:icons:search lucide');
+            ->assertOutputContains('iconoir:')
+            ->assertOutputContains('php bin/console ux:icons:search iconoir')
+            ->assertStatusCode(0);
     }
 
     public function testSearchWithPrefixMatchingMultipleSet(): void

diff --git a/src/LiveComponent/composer.json b/src/LiveComponent/composer.json
@@ -51,7 +51,7 @@
         "symfony/twig-bundle": "^5.4|^6.0|^7.0",
         "symfony/validator": "^5.4|^6.0|^7.0",
         "zenstruck/browser": "^1.2.0",
-        "zenstruck/foundry": "1.37.*"
+        "zenstruck/foundry": "^2.0"
     },
     "conflict": {
         "symfony/config": "<5.4.0"

diff --git a/src/LiveComponent/phpunit.xml.dist b/src/LiveComponent/phpunit.xml.dist
@@ -18,7 +18,7 @@
         <server name="KERNEL_CLASS" value="Symfony\UX\LiveComponent\Tests\Fixtures\Kernel"/>
         <server name="DATABASE_URL" value="sqlite:///%kernel.project_dir%/var/data.db"/>
         <env name="SHELL_VERBOSITY" value="-1"/>
-        <server name="SYMFONY_DEPRECATIONS_HELPER" value="max[self]=0&amp;max[direct]=0&amp;ignoreFile=./tests/baseline-ignore"/>
+        <server name="SYMFONY_DEPRECATIONS_HELPER" value="max[self]=0&amp;max[direct]=0&amp;quiet[]=indirect&amp;quiet[]=other"/>
     </php>
 
     <testsuites>

diff --git a/src/LiveComponent/tests/Fixtures/Dto/HoldsArrayOfDtos.php b/src/LiveComponent/tests/Fixtures/Dto/HoldsArrayOfDtos.php
@@ -2,12 +2,21 @@
 
 declare(strict_types=1);
 
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 namespace Symfony\UX\LiveComponent\Tests\Fixtures\Dto;
 
 final class HoldsArrayOfDtos
 {
     /**
-     * @var Address[] $addresses
+     * @var Address[]
      */
     public array $addresses;
 }
diff --git a/src/LiveComponent/tests/Fixtures/Entity/TodoItemFixtureEntity.php b/src/LiveComponent/tests/Fixtures/Entity/TodoItemFixtureEntity.php
@@ -24,15 +24,12 @@ class TodoItemFixtureEntity
     public $id;
 
     #[ORM\Column(type: 'string')]
-    private ?string $name = null;
+    private ?string $name;
 
     #[ORM\ManyToOne(targetEntity: TodoListFixtureEntity::class, inversedBy: 'todoItems')]
     private TodoListFixtureEntity $todoList;
 
-    /**
-     * @param string $name
-     */
-    public function __construct(string $name = null)
+    public function __construct(?string $name = null)
     {
         $this->name = $name;
     }

diff --git a/src/LiveComponent/tests/Fixtures/Factory/CompositeIdEntityFactory.php b/src/LiveComponent/tests/Fixtures/Factory/CompositeIdEntityFactory.php
@@ -11,38 +11,20 @@
 
 namespace Symfony\UX\LiveComponent\Tests\Fixtures\Factory;
 
-use Doctrine\ORM\EntityRepository;
 use Symfony\UX\LiveComponent\Tests\Fixtures\Entity\CompositeIdEntity;
-use Zenstruck\Foundry\ModelFactory;
-use Zenstruck\Foundry\Proxy;
-use Zenstruck\Foundry\RepositoryProxy;
+use Zenstruck\Foundry\Persistence\PersistentProxyObjectFactory;
 
 /**
- * @extends ModelFactory<CompositeIdEntity>
- *
- * @method static CompositeIdEntity|Proxy          createOne(array $attributes = [])
- * @method static CompositeIdEntity[]|Proxy[]      createMany(int $number, array|callable $attributes = [])
- * @method static CompositeIdEntity|Proxy          find(object|array|mixed $criteria)
- * @method static CompositeIdEntity|Proxy          findOrCreate(array $attributes)
- * @method static CompositeIdEntity|Proxy          first(string $sortedField = 'id')
- * @method static CompositeIdEntity|Proxy          last(string $sortedField = 'id')
- * @method static CompositeIdEntity|Proxy          random(array $attributes = [])
- * @method static CompositeIdEntity|Proxy          randomOrCreate(array $attributes = []))
- * @method static CompositeIdEntity[]|Proxy[]      all()
- * @method static CompositeIdEntity[]|Proxy[]      findBy(array $attributes)
- * @method static CompositeIdEntity[]|Proxy[]      randomSet(int $number, array $attributes = []))
- * @method static CompositeIdEntity[]|Proxy[]      randomRange(int $min, int $max, array $attributes = []))
- * @method static EntityRepository|RepositoryProxy repository()
- * @method        CompositeIdEntity|Proxy          create(array|callable $attributes = [])
+ * @extends PersistentProxyObjectFactory<CompositeIdEntity>
  */
-class CompositeIdEntityFactory extends ModelFactory
+class CompositeIdEntityFactory extends PersistentProxyObjectFactory
 {
-    protected static function getClass(): string
+    public static function class(): string
     {
         return CompositeIdEntity::class;
     }
 
-    protected function getDefaults(): array
+    protected function defaults(): array
     {
         return [
             'firstIdPart' => rand(1, \PHP_INT_MAX),

diff --git a/src/LiveComponent/tests/Fixtures/Factory/ForeignKeyIdEntityFactory.php b/src/LiveComponent/tests/Fixtures/Factory/ForeignKeyIdEntityFactory.php
@@ -11,41 +11,23 @@
 
 namespace Symfony\UX\LiveComponent\Tests\Fixtures\Factory;
 
-use Doctrine\ORM\EntityRepository;
 use Symfony\UX\LiveComponent\Tests\Fixtures\Entity\Entity1;
 use Symfony\UX\LiveComponent\Tests\Fixtures\Entity\ForeignKeyIdEntity;
-use Zenstruck\Foundry\ModelFactory;
-use Zenstruck\Foundry\Proxy;
-use Zenstruck\Foundry\RepositoryProxy;
+use Zenstruck\Foundry\Persistence\PersistentProxyObjectFactory;
 
 use function Zenstruck\Foundry\lazy;
 
 /**
- * @extends ModelFactory<ForeignKeyIdEntity>
- *
- * @method static ForeignKeyIdEntity|Proxy         createOne(array $attributes = [])
- * @method static ForeignKeyIdEntity[]|Proxy[]     createMany(int $number, array|callable $attributes = [])
- * @method static ForeignKeyIdEntity|Proxy         find(object|array|mixed $criteria)
- * @method static ForeignKeyIdEntity|Proxy         findOrCreate(array $attributes)
- * @method static ForeignKeyIdEntity|Proxy         first(string $sortedField = 'id')
- * @method static ForeignKeyIdEntity|Proxy         last(string $sortedField = 'id')
- * @method static ForeignKeyIdEntity|Proxy         random(array $attributes = [])
- * @method static ForeignKeyIdEntity|Proxy         randomOrCreate(array $attributes = []))
- * @method static ForeignKeyIdEntity[]|Proxy[]     all()
- * @method static ForeignKeyIdEntity[]|Proxy[]     findBy(array $attributes)
- * @method static ForeignKeyIdEntity[]|Proxy[]     randomSet(int $number, array $attributes = []))
- * @method static ForeignKeyIdEntity[]|Proxy[]     randomRange(int $min, int $max, array $attributes = []))
- * @method static EntityRepository|RepositoryProxy repository()
- * @method        ForeignKeyIdEntity|Proxy         create(array|callable $attributes = [])
+ * @extends PersistentProxyObjectFactory<ForeignKeyIdEntity>
  */
-class ForeignKeyIdEntityFactory extends ModelFactory
+class ForeignKeyIdEntityFactory extends PersistentProxyObjectFactory
 {
-    protected static function getClass(): string
+    public static function class(): string
     {
         return ForeignKeyIdEntity::class;
     }
 
-    protected function getDefaults(): array
+    protected function defaults(): array
     {
         return ['id' => lazy(static fn () => new Entity1())];
     }

diff --git a/src/LiveComponent/tests/Fixtures/Kernel.php b/src/LiveComponent/tests/Fixtures/Kernel.php
@@ -51,14 +51,14 @@ public function index(): Response
         return new Response('index');
     }
 
-    public function renderTemplate(string $template, Environment $twig = null): Response
+    public function renderTemplate(string $template, ?Environment $twig = null): Response
     {
         $twig ??= $this->container->get('twig');
 
         return new Response($twig->render("{$template}.html.twig"));
     }
 
-    public function renderNamespacedTemplate(string $template, Environment $twig = null): Response
+    public function renderNamespacedTemplate(string $template, ?Environment $twig = null): Response
     {
         $twig ??= $this->container->get('twig');
 
@@ -171,6 +171,7 @@ protected function configureContainer(ContainerConfigurator $c): void
                 ],
             ],
         ];
+
         if (null !== $doctrineBundleVersion = InstalledVersions::getVersion('doctrine/doctrine-bundle')) {
             if (version_compare($doctrineBundleVersion, '2.8.0', '>=')) {
                 $doctrineConfig['orm']['enable_lazy_ghost_objects'] = true;
@@ -181,14 +182,13 @@ protected function configureContainer(ContainerConfigurator $c): void
                 $doctrineConfig['orm']['validate_xml_mapping'] = true;
                 $doctrineConfig['dbal']['schema_manager_factory'] = 'doctrine.dbal.default_schema_manager_factory';
             }
+            if (version_compare($doctrineBundleVersion, '2.12.0', '>=')) {
+                $doctrineConfig['orm']['controller_resolver']['auto_mapping'] = false;
+            }
         }
 
         $c->extension('doctrine', $doctrineConfig);
 
-        $c->extension('zenstruck_foundry', [
-            'auto_refresh_proxies' => false,
-        ]);
-
         $c->services()
             ->defaults()
             ->autowire()

diff --git a/src/LiveComponent/tests/Fixtures/Serializer/Entity2Normalizer.php b/src/LiveComponent/tests/Fixtures/Serializer/Entity2Normalizer.php
@@ -47,7 +47,7 @@ public function supportsNormalization(mixed $data, string $format = null, array
         return $data instanceof Entity2;
     }
 
-    public function getSupportedTypes(?string $format): array
+    public function getSupportedTypes(?string $format = null): array
     {
         return [Entity2::class => true];
     }

diff --git a/src/LiveComponent/tests/Fixtures/Serializer/MoneyNormalizer.php b/src/LiveComponent/tests/Fixtures/Serializer/MoneyNormalizer.php
@@ -37,7 +37,7 @@ public function supportsNormalization(mixed $data, string $format = null, array
         return $data instanceof Money;
     }
 
-    public function getSupportedTypes(?string $format): array
+    public function getSupportedTypes(string $format = null): array
     {
         return [Money::class => true];
     }

diff --git a/src/LiveComponent/tests/Functional/EventListener/LiveComponentSubscriberTest.php b/src/LiveComponent/tests/Functional/EventListener/LiveComponentSubscriberTest.php
@@ -22,7 +22,7 @@
 use Zenstruck\Foundry\Test\Factories;
 use Zenstruck\Foundry\Test\ResetDatabase;
 
-use function Zenstruck\Foundry\create;
+use function Zenstruck\Foundry\Persistence\persist;
 
 /**
  * @author Kevin Bond <[email protected]>
@@ -48,7 +48,7 @@ final class LiveComponentSubscriberTest extends KernelTestCase
     public function testCanRenderComponentAsHtml(): void
     {
         $component = $this->mountComponent('component1', [
-            'prop1' => $entity = create(Entity1::class)->object(),
+            'prop1' => $entity = persist(Entity1::class),
             'prop2' => $date = new \DateTime('2021-03-05 9:23'),
             'prop3' => 'value3',
             'prop4' => 'value4',

diff --git a/src/LiveComponent/tests/Functional/LiveResponderTest.php b/src/LiveComponent/tests/Functional/LiveResponderTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\UX\LiveComponent\Tests\Functional\EventListener;
+namespace Symfony\UX\LiveComponent\Tests\Functional;
 
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 use Symfony\UX\LiveComponent\Tests\LiveComponentTestHelper;

diff --git a/src/LiveComponent/tests/Functional/ValidatableComponentTraitTest.php b/src/LiveComponent/tests/Functional/ValidatableComponentTraitTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\UX\LiveComponent\Tests\Functional\Form;
+namespace Symfony\UX\LiveComponent\Tests\Functional;
 
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 use Symfony\UX\LiveComponent\Tests\LiveComponentTestHelper;

diff --git a/src/LiveComponent/tests/Integration/EventListener/DataModelPropsSubscriberTest.php b/src/LiveComponent/tests/Integration/EventListener/DataModelPropsSubscriberTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\UX\LiveComponent\Tests\Integration;
+namespace Symfony\UX\LiveComponent\Tests\Integration\EventListener;
 
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 use Symfony\Component\HttpFoundation\Request;

diff --git a/src/LiveComponent/tests/Integration/Hydration/DoctrineEntityHydrationExtensionTest.php b/src/LiveComponent/tests/Integration/Hydration/DoctrineEntityHydrationExtensionTest.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\UX\LiveComponent\Tests\Unit\Hydration;
+namespace Symfony\UX\LiveComponent\Tests\Integration\Hydration;
 
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 use Symfony\UX\LiveComponent\Hydration\DoctrineEntityHydrationExtension;
@@ -27,7 +27,7 @@ class DoctrineEntityHydrationExtensionTest extends KernelTestCase
 
     public function testCompositeId(): void
     {
-        $compositeIdEntity = CompositeIdEntityFactory::createOne()->save()->object();
+        $compositeIdEntity = CompositeIdEntityFactory::createOne()->_real();
 
         /** @var DoctrineEntityHydrationExtension $extension */
         $extension = self::getContainer()->get('ux.live_component.doctrine_entity_hydration_extension');
@@ -40,7 +40,7 @@ public function testCompositeId(): void
 
     public function testForeignKeyId(): void
     {
-        $foreignKeyIdEntity = ForeignKeyIdEntityFactory::createOne()->save()->object();
+        $foreignKeyIdEntity = ForeignKeyIdEntityFactory::createOne()->_real();
 
         /** @var DoctrineEntityHydrationExtension $extension */
         $extension = self::getContainer()->get('ux.live_component.doctrine_entity_hydration_extension');