Skip to content

Commit 76ba7d2

Browse files
Merge branch '6.4' into 7.0
* 6.4: [AssetMapper] Allow simple, relative paths in importmap.php [PropertyInfo] Make isWriteable() more consistent with isReadable() when checking snake_case properties [AssetMapper] Add support for CSS files in the importmap [Messenger] Add `--all` option to the `messenger:failed:remove` command Fix merge fix #51235 - fix the order of merging of serializationContext and self::CONTEXT_DENORMALIZE [HttpClient] Fix Static Code Analyzer issue with JsonMockResponse [Messenger] Fix exiting `FailedMessagesRetryCommand` [Serializer] Fix reindex normalizedData array in AbstractObjectNormalizer::denormalize() remove an unreachable code branch [Validator] Fix `File::$extensions`’ PHPDoc [Mime] Fix email (de)serialization issues [FrameworkBundle][WebProfilerBundle][Console][Form][HttpKernel][PropertyInfo][Validator] Remove optional before required param Replace usages of SkippedTestSuiteError with markTestSkipped() call Update InteractiveAuthenticatorInterface description wording to match documentation [Serializer] Fix parsing XML root node attributes fix parsing of payload timestamp to DateTimeImmutable Fix routing to multiple fallback transports Fix missing stamps in delayed message handling [DoctrineBridge] Ignore invalid stores in `LockStoreSchemaListener` raised by `StoreFactory`
2 parents d63dc64 + 9a7d14f commit 76ba7d2

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

Extension/DataCollector/FormDataCollector.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ private function &recursiveBuildPreliminaryFormTree(FormInterface $form, array &
259259
return $output;
260260
}
261261

262-
private function &recursiveBuildFinalFormTree(FormInterface $form = null, FormView $view, array &$outputByHash): array
262+
private function &recursiveBuildFinalFormTree(?FormInterface $form, FormView $view, array &$outputByHash): array
263263
{
264264
$viewHash = spl_object_hash($view);
265265
$formHash = null;

0 commit comments

Comments
 (0)