Apply php-cs-fixer fix --rules nullable_type_declaration_for_default_null_value

Author: nicolas-grekas

Button.php

@@ -114,7 +114,7 @@ public function offsetUnset($offset)
     /**
      * {@inheritdoc}
      */
-    public function setParent(FormInterface $parent = null)
+    public function setParent(?FormInterface $parent = null)
     {
         if ($this->submitted) {
             throw new AlreadySubmittedException('You cannot set the parent of a submitted button.');
@@ -140,7 +140,7 @@ public function getParent()
      *
      * @throws BadMethodCallException
      */
-    public function add($child, string $type = null, array $options = [])
+    public function add($child, ?string $type = null, array $options = [])
     {
         throw new BadMethodCallException('Buttons cannot have children.');
     }
@@ -414,7 +414,7 @@ public function isRoot()
     /**
      * {@inheritdoc}
      */
-    public function createView(FormView $parent = null)
+    public function createView(?FormView $parent = null)
     {
         if (null === $parent && $this->parent) {
             $parent = $this->parent->createView();

ButtonBuilder.php

@@ -71,7 +71,7 @@ public function __construct(?string $name, array $options = [])
      *
      * @throws BadMethodCallException
      */
-    public function add($child, string $type = null, array $options = [])
+    public function add($child, ?string $type = null, array $options = [])
     {
         throw new BadMethodCallException('Buttons cannot have children.');
     }
@@ -81,7 +81,7 @@ public function add($child, string $type = null, array $options = [])
      *
      * @throws BadMethodCallException
      */
-    public function create(string $name, string $type = null, array $options = [])
+    public function create(string $name, ?string $type = null, array $options = [])
     {
         throw new BadMethodCallException('Buttons cannot have children.');
     }
@@ -221,7 +221,7 @@ public function setAttributes(array $attributes)
      *
      * @throws BadMethodCallException
      */
-    public function setDataMapper(DataMapperInterface $dataMapper = null)
+    public function setDataMapper(?DataMapperInterface $dataMapper = null)
     {
         throw new BadMethodCallException('Buttons do not support data mappers.');
     }

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

@@ -29,23 +29,23 @@ final class ChoiceLoader extends AbstractStaticOption implements ChoiceLoaderInt
     /**
      * {@inheritdoc}
      */
-    public function loadChoiceList(callable $value = null): ChoiceListInterface
+    public function loadChoiceList(?callable $value = null): ChoiceListInterface
     {
         return $this->getOption()->loadChoiceList($value);
     }
 
     /**
      * {@inheritdoc}
      */
-    public function loadChoicesForValues(array $values, callable $value = null): array
+    public function loadChoicesForValues(array $values, ?callable $value = null): array
     {
         return $this->getOption()->loadChoicesForValues($values, $value);
     }
 
     /**
      * {@inheritdoc}
      */
-    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

@@ -35,7 +35,7 @@ interface ChoiceListFactoryInterface
      *
      * @return ChoiceListInterface
      */
-    public function createListFromChoices(iterable $choices, callable $value = null/* , callable $filter = null */);
+    public function createListFromChoices(iterable $choices, ?callable $value = null/* , callable $filter = null */);
 
     /**
      * Creates a choice list that is loaded with the given loader.
@@ -48,7 +48,7 @@ public function createListFromChoices(iterable $choices, callable $value = null/
      *
      * @return ChoiceListInterface
      */
-    public function createListFromLoader(ChoiceLoaderInterface $loader, callable $value = null/* , callable $filter = null */);
+    public function createListFromLoader(ChoiceLoaderInterface $loader, ?callable $value = null/* , callable $filter = null */);
 
     /**
      * Creates a view for the given choice list.
@@ -84,5 +84,5 @@ public function createListFromLoader(ChoiceLoaderInterface $loader, callable $va
      *
      * @return ChoiceListView
      */
-    public function createView(ChoiceListInterface $list, $preferredChoices = null, $label = null, callable $index = null, callable $groupBy = null, $attr = null/* , $labelTranslationParameters = [] */);
+    public function createView(ChoiceListInterface $list, $preferredChoices = null, $label = null, ?callable $index = null, ?callable $groupBy = null, $attr = null/* , $labelTranslationParameters = [] */);
 }

ChoiceList/Factory/DefaultChoiceListFactory.php

@@ -35,7 +35,7 @@ class DefaultChoiceListFactory implements ChoiceListFactoryInterface
      *
      * @param callable|null $filter
      */
-    public function createListFromChoices(iterable $choices, callable $value = null/* , callable $filter = null */)
+    public function createListFromChoices(iterable $choices, ?callable $value = null/* , callable $filter = null */)
     {
         $filter = \func_num_args() > 2 ? func_get_arg(2) : null;
 
@@ -56,7 +56,7 @@ public function createListFromChoices(iterable $choices, callable $value = null/
      *
      * @param callable|null $filter
      */
-    public function createListFromLoader(ChoiceLoaderInterface $loader, callable $value = null/* , callable $filter = null */)
+    public function createListFromLoader(ChoiceLoaderInterface $loader, ?callable $value = null/* , callable $filter = null */)
     {
         $filter = \func_num_args() > 2 ? func_get_arg(2) : null;
 
@@ -72,7 +72,7 @@ public function createListFromLoader(ChoiceLoaderInterface $loader, callable $va
      *
      * @param array|callable $labelTranslationParameters The parameters used to translate the choice labels
      */
-    public function createView(ChoiceListInterface $list, $preferredChoices = null, $label = null, callable $index = null, callable $groupBy = null, $attr = null/* , $labelTranslationParameters = [] */)
+    public function createView(ChoiceListInterface $list, $preferredChoices = null, $label = null, ?callable $index = null, ?callable $groupBy = null, $attr = null/* , $labelTranslationParameters = [] */)
     {
         $labelTranslationParameters = \func_num_args() > 6 ? func_get_arg(6) : [];
         $preferredViews = [];

ChoiceList/Factory/PropertyAccessDecorator.php

@@ -41,7 +41,7 @@ class PropertyAccessDecorator implements ChoiceListFactoryInterface
     private $decoratedFactory;
     private $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

@@ -47,7 +47,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 = $value;

ChoiceList/Loader/AbstractChoiceLoader.php

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

ChoiceList/Loader/ChoiceLoaderInterface.php

@@ -36,7 +36,7 @@ interface ChoiceLoaderInterface
      *
      * @return ChoiceListInterface
      */
-    public function loadChoiceList(callable $value = null);
+    public function loadChoiceList(?callable $value = null);
 
     /**
      * Loads the choices corresponding to the given values.
@@ -54,7 +54,7 @@ public function loadChoiceList(callable $value = null);
      *
      * @return array
      */
-    public function loadChoicesForValues(array $values, callable $value = null);
+    public function loadChoicesForValues(array $values, ?callable $value = null);
 
     /**
      * Loads the values corresponding to the given choices.
@@ -72,5 +72,5 @@ public function loadChoicesForValues(array $values, callable $value = null);
      *
      * @return string[]
      */
-    public function loadValuesForChoices(array $choices, callable $value = null);
+    public function loadValuesForChoices(array $choices, ?callable $value = null);
 }