Skip to content
/ form Public

Commit 624d1aa

Browse files
committedJan 23, 2024
Merge branch '7.0' into 7.1
* 7.0: List CS fix in .git-blame-ignore-revs 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 8a2b584 + 76bfa17 commit 624d1aa

File tree

61 files changed

+89
-89
lines changed

Some content is hidden

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

61 files changed

+89
-89
lines changed
 

‎Button.php

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

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

‎ButtonBuilder.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public function __construct(
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)