Merge 5.x into 6.x

sonata-project · Mar 23, 2024 · 5dd2429 · 5dd2429
2 parents 46216fb + 1fe5aa8
commit 5dd2429
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 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/Form/Type/RolesMatrixTypeTest.php b/tests/Form/Type/RolesMatrixTypeTest.php
@@ -154,7 +154,7 @@ protected function getExtensions(): array
         $childType = new RolesMatrixType($this->roleBuilder);
 
         return [new PreloadedExtension([
-          $childType,
+            $childType,
         ], [])];
     }
 }