8000 Merge branch '7.2' into 7.3 · symfony/form@9ee0a68 · GitHub
[go: up one dir, main page]

Skip to content

Commit 9ee0a68

Browse files
committed
Merge branch '7.2' into 7.3
* 7.2: fix EmojiTransliterator return type compatibility with PHP 8.5 Bump Symfony version to 7.2.7 Update VERSION for 7.2.6 Update CHANGELOG for 7.2.6 Bump Symfony version to 6.4.22 Update VERSION for 6.4.21 Update CONTRIBUTORS for 6.4.21 Update CHANGELOG for 6.4.21 Fix return type is non-nullable Fix overwriting an array element
2 parents d20f61d + 59b6c45 commit 9ee0a68

File tree

2 files changed

+1
-2
lines changed

2 files changed

+1
-2
lines changed

Extension/Core/Type/WeekType.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
3939
} else {
4040
$yearOptions = $weekOptions = [
4141
'error_bubbling' => true,
42-
'empty_data' => '',
4342
];
4443
// when the form is compound the entries of the array are ignored in favor of children data
4544
// so we need to handle the cascade setting here

Tests/Fixtures/TestExtension.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public function addType(FormTypeInterface $type)
3434

3535
public function getType($name): FormTypeInterface
3636
{
37-
return $this->types[$name] ?? null;
37+
return $this->types[$name];
3838
}
3939

4040
public function hasType($name): bool

0 commit comments

Comments
 (0)
163C
0