Skip to content
/ form Public

Commit 76bfa17

Browse files
committedJan 23, 2024
Merge branch '6.4' into 7.0
* 6.4: Fix implicitly-required parameters minor #53524 [Messenger] [AmazonSqs] Allow `async-aws/sqs` version 2 (smoench) Fix bad merge List CS fix in .git-blame-ignore-revs Fix implicitly-required parameters List CS fix in .git-blame-ignore-revs Apply php-cs-fixer fix --rules nullable_type_declaration_for_default_null_value [Messenger][AmazonSqs] Allow async-aws/sqs version 2
2 parents 02b2a2a + dabf7e9 commit 76bfa17

File tree

77 files changed

+97
-97
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+97
-97
lines changed
 

‎Button.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ public function getParent(): ?FormInterface
104104
*
105105
* @throws BadMethodCallException
106106
*/
107-
public function add(string|FormInterface $child, string $type = null, array $options = []): static
107+
public function add(string|FormInterface $child, ?string $type = null, array $options = []): static
108108
{
109109
throw new BadMethodCallException('Buttons cannot have children.');
110110
}
@@ -335,7 +335,7 @@ public function isRoot(): bool
335335
return null === $this->parent;
336336
}
337337

338-
public function createView(FormView $parent = null): FormView
338+
public function createView(?FormView $parent = null): FormView
339339
{
340340
if (null === $parent && $this->parent) {
341341
$parent = $this->parent->createView();

‎ButtonBuilder.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public function __construct(?string $name, array $options = [])
5353
*
5454
* @throws BadMethodCallException
5555
*/
56-
public function add(string|FormBuilderInterface $child, string $type = null, array $options = []): never
56+
public function add(string|FormBuilderInterface $child, ?string $type = null, array $options = []): never
5757
{
5858
throw new BadMethodCallException('Buttons cannot have children.');
5959
}
@@ -63,7 +63,7 @@ public function add(string|FormBuilderInterface $child, string $type = null, arr
6363
*
6464
* @throws BadMethodCallException
6565
*/
66-
public function create(string $name, string $type = null, array $options = []): never
66+
public function create(string $name, ?string $type = null, array $options = []): never
6767
{
6868
throw new BadMethodCallException('Buttons cannot have children.');
6969
}

0 commit comments

Comments
 (0)
Please sign in to comment.