Merge branch '5.4' into 6.3

* 5.4: 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

Author: nicolas-grekas

Button.php

@@ -81,7 +81,7 @@ public function offsetUnset(mixed $offset): void
  throw new BadMethodCallException('Buttons cannot have children.');
  }
 
- public function setParent(FormInterface $parent = null): static
+ public function setParent(?FormInterface $parent = null): static
  {
  if (1 > \func_num_args()) {
  trigger_deprecation('symfony/form', '6.2', 'Calling "%s()" without any arguments is deprecated, pass null explicitly instead.', __METHOD__);
@@ -107,7 +107,7 @@ public function getParent(): ?FormInterface
  *
  * @throws BadMethodCallException
  */
- public function add(string|FormInterface $child, string $type = null, array $options = []): static
+ public function add(string|FormInterface $child, ?string $type = null, array $options = []): static
  {
  throw new BadMethodCallException('Buttons cannot have children.');
  }
@@ -338,7 +338,7 @@ public function isRoot(): bool
  return null === $this->parent;
  }
 
- public function createView(FormView $parent = null): FormView
+ public function createView(?FormView $parent = null): FormView
  {
  if (null === $parent && $this->parent) {
  $parent = $this->parent->createView();

ButtonBuilder.php

@@ -56,7 +56,7 @@ public function __construct(?string $name, array $options = [])
  *
  * @throws BadMethodCallException
  */
- public function add(string|FormBuilderInterface $child, string $type = null, array $options = []): static
+ public function add(string|FormBuilderInterface $child, ?string $type = null, array $options = []): static
  {
  throw new BadMethodCallException('Buttons cannot have children.');
  }
@@ -68,7 +68,7 @@ public function add(string|FormBuilderInterface $child, string $type = null, arr
  *
  * @throws BadMethodCallException
  */
- public function create(string $name, string $type = null, array $options = []): FormBuilderInterface
+ public function create(string $name, ?string $type = null, array $options = []): FormBuilderInterface
  {
  throw new BadMethodCallException('Buttons cannot have children.');
  }
@@ -220,7 +220,7 @@ public function setAttributes(array $attributes): static
  *
  * @throws BadMethodCallException
  */
- public function setDataMapper(DataMapperInterface $dataMapper = null): static
+ public function setDataMapper(?DataMapperInterface $dataMapper = null): static
  {
  if (1 > \func_num_args()) {
  trigger_deprecation('symfony/form', '6.2', 'Calling "%s()" without any arguments is deprecated, pass null explicitly instead.', __METHOD__);

ChoiceList/ArrayChoiceList.php

@@ -57,7 +57,7 @@ class ArrayChoiceList implements ChoiceListInterface
  * incrementing integers are used as
  * values
  */
- public function __construct(iterable $choices, callable $value = null)
+ public function __construct(iterable $choices, ?callable $value = null)
  {
  if ($choices instanceof \Traversable) {
  $choices = iterator_to_array($choices);

ChoiceList/Factory/Cache/ChoiceLoader.php

@@ -26,17 +26,17 @@
  */
 final class ChoiceLoader extends AbstractStaticOption implements ChoiceLoaderInterface
 {
- public function loadChoiceList(callable $value = null): ChoiceListInterface
+ public function loadChoiceList(?callable $value = null): ChoiceListInterface
  {
  return $this->getOption()->loadChoiceList($value);
  }
 
- public function loadChoicesForValues(array $values, callable $value = null): array
+ public function loadChoicesForValues(array $values, ?callable $value = null): array
  {
  return $this->getOption()->loadChoicesForValues($values, $value);
  }
 
- public function loadValuesForChoices(array $choices, callable $value = null): array
+ public function loadValuesForChoices(array $choices, ?callable $value = null): array
  {
  return $this->getOption()->loadValuesForChoices($choices, $value);
  }

ChoiceList/Factory/ChoiceListFactoryInterface.php

@@ -33,7 +33,7 @@ interface ChoiceListFactoryInterface
  *
  * @param callable|null $filter The callable filtering the choices
  */
- public function createListFromChoices(iterable $choices, callable $value = null, callable $filter = null): ChoiceListInterface;
+ public function createListFromChoices(iterable $choices, ?callable $value = null, ?callable $filter = null): ChoiceListInterface;
 
  /**
  * Creates a choice list that is loaded with the given loader.
@@ -44,7 +44,7 @@ public function createListFromChoices(iterable $choices, callable $value = null,
  *
  * @param callable|null $filter The callable filtering the choices
  */
- public function createListFromLoader(ChoiceLoaderInterface $loader, callable $value = null, callable $filter = null): ChoiceListInterface;
+ public function createListFromLoader(ChoiceLoaderInterface $loader, ?callable $value = null, ?callable $filter = null): ChoiceListInterface;
 
  /**
  * Creates a view for the given choice list.
@@ -78,5 +78,5 @@ public function createListFromLoader(ChoiceLoaderInterface $loader, callable $va
  * @param array|callable|null $attr The callable generating the HTML attributes
  * @param array|callable $labelTranslationParameters The parameters used to translate the choice labels
  */
- public function createView(ChoiceListInterface $list, array|callable $preferredChoices = null, callable|false $label = null, callable $index = null, callable $groupBy = null, array|callable $attr = null, array|callable $labelTranslationParameters = []): ChoiceListView;
+ public function createView(ChoiceListInterface $list, array|callable|null $preferredChoices = null, callable|false|null $label = null, ?callable $index = null, ?callable $groupBy = null, array|callable|null $attr = null, array|callable $labelTranslationParameters = []): ChoiceListView;
 }

ChoiceList/Factory/DefaultChoiceListFactory.php

@@ -30,7 +30,7 @@
  */
 class DefaultChoiceListFactory implements ChoiceListFactoryInterface
 {
- public function createListFromChoices(iterable $choices, callable $value = null, callable $filter = null): ChoiceListInterface
+ public function createListFromChoices(iterable $choices, ?callable $value = null, ?callable $filter = null): ChoiceListInterface
  {
  if ($filter) {
  // filter the choice list lazily
@@ -43,7 +43,7 @@ public function createListFromChoices(iterable $choices, callable $value = null,
  return new ArrayChoiceList($choices, $value);
  }
 
- public function createListFromLoader(ChoiceLoaderInterface $loader, callable $value = null, callable $filter = null): ChoiceListInterface
+ public function createListFromLoader(ChoiceLoaderInterface $loader, ?callable $value = null, ?callable $filter = null): ChoiceListInterface
  {
  if ($filter) {
  $loader = new FilterChoiceLoaderDecorator($loader, $filter);
@@ -52,7 +52,7 @@ public function createListFromLoader(ChoiceLoaderInterface $loader, callable $va
  return new LazyChoiceList($loader, $value);
  }
 
- public function createView(ChoiceListInterface $list, array|callable $preferredChoices = null, callable|false $label = null, callable $index = null, callable $groupBy = null, array|callable $attr = null, array|callable $labelTranslationParameters = []): ChoiceListView
+ public function createView(ChoiceListInterface $list, array|callable|null $preferredChoices = null, callable|false|null $label = null, ?callable $index = null, ?callable $groupBy = null, array|callable|null $attr = null, array|callable $labelTranslationParameters = []): ChoiceListView
  {
  $preferredViews = [];
  $preferredViewsOrder = [];

ChoiceList/Factory/PropertyAccessDecorator.php

@@ -41,7 +41,7 @@ class PropertyAccessDecorator implements ChoiceListFactoryInterface
  private ChoiceListFactoryInterface $decoratedFactory;
  private PropertyAccessorInterface $propertyAccessor;
 
- public function __construct(ChoiceListFactoryInterface $decoratedFactory, PropertyAccessorInterface $propertyAccessor = null)
+ public function __construct(ChoiceListFactoryInterface $decoratedFactory, ?PropertyAccessorInterface $propertyAccessor = null)
  {
  $this->decoratedFactory = $decoratedFactory;
  $this->propertyAccessor = $propertyAccessor ?: PropertyAccess::createPropertyAccessor();

ChoiceList/LazyChoiceList.php

@@ -45,7 +45,7 @@ class LazyChoiceList implements ChoiceListInterface
  *
  * @param callable|null $value The callable generating the choice values
  */
- public function __construct(ChoiceLoaderInterface $loader, callable $value = null)
+ public function __construct(ChoiceLoaderInterface $loader, ?callable $value = null)
  {
  $this->loader = $loader;
  $this->value = null === $value ? null : $value(...);

ChoiceList/Loader/AbstractChoiceLoader.php

@@ -24,12 +24,12 @@ abstract class AbstractChoiceLoader implements ChoiceLoaderInterface
  /**
  * @final
  */
- public function loadChoiceList(callable $value = null): ChoiceListInterface
+ public function loadChoiceList(?callable $value = null): ChoiceListInterface
  {
  return new ArrayChoiceList($this->choices ??= $this->loadChoices(), $value);
  }
 
- public function loadChoicesForValues(array $values, callable $value = null): array
+ public function loadChoicesForValues(array $values, ?callable $value = null): array
  {
  if (!$values) {
  return [];
@@ -38,7 +38,7 @@ public function loadChoicesForValues(array $values, callable $value = null): arr
  return $this->doLoadChoicesForValues($values, $value);
  }
 
- public function loadValuesForChoices(array $choices, callable $value = null): array
+ public function loadValuesForChoices(array $choices, ?callable $value = null): array
  {
  if (!$choices) {
  return [];

ChoiceList/Loader/ChoiceLoaderInterface.php

@@ -34,7 +34,7 @@ interface ChoiceLoaderInterface
  * @param callable|null $value The callable which generates the values
  * from choices
  */
- public function loadChoiceList(callable $value = null): ChoiceListInterface;
+ public function loadChoiceList(?callable $value = null): ChoiceListInterface;
 
  /**
  * Loads the choices corresponding to the given values.
@@ -50,7 +50,7 @@ public function loadChoiceList(callable $value = null): ChoiceListInterface;
  * values in this array are ignored
  * @param callable|null $value The callable generating the choice values
  */
- public function loadChoicesForValues(array $values, callable $value = null): array;
+ public function loadChoicesForValues(array $values, ?callable $value = null): array;
 
  /**
  * Loads the values corresponding to the given choices.
@@ -68,5 +68,5 @@ public function loadChoicesForValues(array $values, callable $value = null): arr
  *
  * @return string[]
  */
- public function loadValuesForChoices(array $choices, callable $value = null): array;
+ public function loadValuesForChoices(array $choices, ?callable $value = null): array;
 }