Merge 2.x into 3.x

sonata-project · Apr 4, 2024 · 282abbf · 282abbf
2 parents 6f8566b + 4b4bcaa
commit 282abbf
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
@@ -45,7 +45,7 @@
     'no_useless_return' => true,
     'no_superfluous_elseif' => true,
     'no_superfluous_phpdoc_tags' => ['allow_mixed' => true, 'remove_inheritdoc' => true],
-    'nullable_type_declaration_for_default_null_value' => ['use_nullable_type_declaration' => true],
+    'nullable_type_declaration_for_default_null_value' => true,
     'ordered_class_elements' => true,
     'ordered_imports' => ['sort_algorithm' => 'alpha', 'imports_order' => ['class', 'function', 'const']],
     'phpdoc_order' => ['order' => ['var', 'param', 'throws', 'return', 'phpstan-var', 'psalm-var', 'phpstan-param', 'psalm-param', 'phpstan-return', 'psalm-return']],

diff --git a/tests/Mapper/Builder/OptionsBuilderTest.php b/tests/Mapper/Builder/OptionsBuilderTest.php
@@ -141,16 +141,18 @@ public function testAddJoin(): void
         static::assertSame([
             'fieldName' => 'groups',
             'targetEntity' => 'App\Entity\Group',
-            'joinColumns' => [[
-                'name' => 'parent_id',
-                'referencedColumnName' => 'id',
-                'onDelete' => 'CASCADE',
+            'joinColumns' => [
+                [
+                    'name' => 'parent_id',
+                    'referencedColumnName' => 'id',
+                    'onDelete' => 'CASCADE',
+                ],
+                [
+                    'name' => 'another_parent_id',
+                    'referencedColumnName' => 'id',
+                    'onDelete' => 'CASCADE',
+                ],
             ],
-            [
-                'name' => 'another_parent_id',
-                'referencedColumnName' => 'id',
-                'onDelete' => 'CASCADE',
-            ], ],
         ], $builder->getOptions());
     }