Merge branch '2.x' into 3.x

* 2.x:
  Fix highest jobs with Doctrine ^3.0
  [LiveComponent] Fix new URL generation when using `LiveProp` with custom `fieldName`

# Conflicts:
#	src/LiveComponent/composer.json
#	src/Turbo/composer.json

Author: Kocal

src/LiveComponent/composer.json

@@ -35,10 +35,10 @@
         "twig/twig": "^3.10.3"
     },
     "require-dev": {
-        "doctrine/annotations": "^1.0",
+        "doctrine/annotations": "^1.0|^2.0",
         "doctrine/collections": "^1.6.8|^2.0",
         "doctrine/doctrine-bundle": "^2.14",
-        "doctrine/orm": "^2.9.4",
+        "doctrine/orm": "^2.9.4|^3.0",
         "doctrine/persistence": "^2.5.2|^3.0",
         "phpdocumentor/reflection-docblock": "5.x-dev",
         "symfony/dependency-injection": "^6.4|^7.0|^8.0",

src/LiveComponent/src/Metadata/LiveComponentMetadata.php

@@ -75,7 +75,7 @@ public function getAllUrlMappings(object $component): array
 
         foreach ($this->getAllLivePropsMetadata($component) as $livePropMetadata) {
             if ($livePropMetadata->urlMapping()) {
-                $urlMappings[$livePropMetadata->getName()] = $livePropMetadata->urlMapping();
+                $urlMappings[$livePropMetadata->calculateFieldName($component, $livePropMetadata->getName())] = $livePropMetadata->urlMapping();
             }
         }
 

src/LiveComponent/tests/Fixtures/Component/ComponentWithUrlBoundProps.php

@@ -33,6 +33,12 @@ class ComponentWithUrlBoundProps
     #[LiveProp(url: true)]
     public array $arrayProp = [];
 
+    #[LiveProp(url: new UrlMapping(as: 'arr_alias'))]
+    public array $arrayPropAlias = [];
+
+    #[LiveProp(writable: true, fieldName: 'getArrayFieldName()', url: true)]
+    public array $arrayPropFieldName = [];
+
     #[LiveProp]
     public ?string $unboundProp = null;
 
@@ -113,4 +119,9 @@ public function updateLiveProp(#[LiveArg] string $propName, #[LiveArg] mixed $pr
 
         $this->{$propName} = $propValue;
     }
+
+    public function getArrayFieldName(): string
+    {
+        return 'arr_field_name';
+    }
 }

src/LiveComponent/tests/Functional/EventListener/AddLiveAttributesSubscriberTest.php

@@ -144,6 +144,8 @@ public function testQueryStringMappingAttribute()
             'objectPropWithSerializerForHydration' => ['name' => 'objectPropWithSerializerForHydration'],
             'propertyWithModifierAndAlias' => ['name' => 'alias_p'],
             'pathPropForAnotherController' => ['name' => 'pathPropForAnotherController'],
+            'arrayPropAlias' => ['name' => 'arr_alias'],
+            'arr_field_name' => ['name' => 'arr_field_name'],
         ];
 
         $this->assertEquals($expected, $queryMapping);

src/LiveComponent/tests/Functional/EventListener/LiveUrlSubscriberTest.php

@@ -118,6 +118,7 @@ public function getTestData(): iterable
                 'propValue' => 'bar',
             ],
         ];
+
         yield 'Changes in prop, with two path params but only one prop' => [
             'previousLocation' => '/route_with_two_path_params_but_one_prop/foo/30',
             'expectedLocation' => '/route_with_two_path_params_but_one_prop/bar/30',
@@ -140,6 +141,42 @@ public function getTestData(): iterable
             ],
         ];
 
+        yield 'Change in query (array)' => [
+            'previousLocation' => '/route_with_prop/foo',
+            'expectedLocation' => '/route_with_prop/foo?arrayProp%5B0%5D=hello&arrayProp%5B1%5D=world',
+            'initialComponentData' => [
+                'pathProp' => 'foo',
+            ],
+            'args' => [
+                'propName' => 'arrayProp',
+                'propValue' => ['hello', 'world'],
+            ],
+        ];
+
+        yield 'Change in query (array & alias)' => [
+            'previousLocation' => '/route_with_prop/foo',
+            'expectedLocation' => '/route_with_prop/foo?arr_alias%5B0%5D=hello&arr_alias%5B1%5D=world',
+            'initialComponentData' => [
+                'pathProp' => 'foo',
+            ],
+            'args' => [
+                'propName' => 'arrayPropAlias',
+                'propValue' => ['hello', 'world'],
+            ],
+        ];
+
+        yield 'Change in query (array & field name)' => [
+            'previousLocation' => '/route_with_prop/foo',
+            'expectedLocation' => '/route_with_prop/foo?arr_field_name%5B0%5D=hello&arr_field_name%5B1%5D=world',
+            'initialComponentData' => [
+                'pathProp' => 'foo',
+            ],
+            'args' => [
+                'propName' => 'arrayPropFieldName',
+                'propValue' => ['hello', 'world'],
+            ],
+        ];
+
         yield 'Changes in props and query' => [
             'previousLocation' => '/route_with_prop/foo',
             'expectedLocation' => '/route_with_prop/baz?q=foo+bar',

src/Turbo/composer.json

@@ -39,7 +39,7 @@
     },
     "require-dev": {
         "doctrine/doctrine-bundle": "^2.14",
-        "doctrine/orm": "^2.8 | 3.0",
+        "doctrine/orm": "^2.8|^3.0",
         "phpstan/phpstan": "^2.1.17",
         "symfony/asset-mapper": "^6.4|^7.0|^8.0",
         "symfony/debug-bundle": "^6.4|^7.0|^8.0",

src/Turbo/tests/app/Kernel.php

@@ -106,6 +106,10 @@ protected function configureContainer(ContainerConfigurator $container): void
             if (version_compare($doctrineBundleVersion, '2.9.0', '>=')) {
                 $doctrineConfig['orm']['report_fields_where_declared'] = true;
             }
+
+            if (\PHP_VERSION_ID >= 80400 && version_compare($doctrineBundleVersion, '2.15.0', '>=')) {
+                $doctrineConfig['orm']['enable_native_lazy_objects'] = true;
+            }
         }
 
         $container