Bump minimum version of PHP to 8.1

Author: nicolas-grekas

CallbackTransformer.php

@@ -18,8 +18,8 @@ class CallbackTransformer implements DataTransformerInterface
 
     public function __construct(callable $transform, callable $reverseTransform)
     {
-        $this->transform = $transform instanceof \Closure ? $transform : \Closure::fromCallable($transform);
-        $this->reverseTransform = $reverseTransform instanceof \Closure ? $reverseTransform : \Closure::fromCallable($reverseTransform);
+        $this->transform = $transform(...);
+        $this->reverseTransform = $reverseTransform(...);
     }
 
     /**

ChoiceList/Factory/Cache/AbstractStaticOption.php

@@ -40,7 +40,7 @@ final public function __construct(FormTypeInterface|FormTypeExtensionInterface $
     {
         $hash = CachingFactoryDecorator::generateHash([static::class, $formType, $vary]);
 
-        $this->option = self::$options[$hash] ??= $option instanceof \Closure || !\is_callable($option) ? $option : \Closure::fromCallable($option);
+        $this->option = self::$options[$hash] ??= $option instanceof \Closure || \is_string($option) || \is_bool($option) || $option instanceof ChoiceLoaderInterface || !\is_callable($option) ? $option : $option(...);
     }
 
     final public function getOption(): mixed

ChoiceList/LazyChoiceList.php

@@ -48,7 +48,7 @@ class LazyChoiceList implements ChoiceListInterface
     public function __construct(ChoiceLoaderInterface $loader, callable $value = null)
     {
         $this->loader = $loader;
-        $this->value = null === $value || $value instanceof \Closure ? $value : \Closure::fromCallable($value);
+        $this->value = null === $value ? null : $value(...);
     }
 
     /**

ChoiceList/Loader/CallbackChoiceLoader.php

@@ -25,7 +25,7 @@ class CallbackChoiceLoader extends AbstractChoiceLoader
      */
     public function __construct(callable $callback)
     {
-        $this->callback = $callback instanceof \Closure ? $callback : \Closure::fromCallable($callback);
+        $this->callback = $callback(...);
     }
 
     protected function loadChoices(): iterable

ChoiceList/Loader/FilterChoiceLoaderDecorator.php

@@ -24,7 +24,7 @@ class FilterChoiceLoaderDecorator extends AbstractChoiceLoader
     public function __construct(ChoiceLoaderInterface $loader, callable $filter)
     {
         $this->decoratedLoader = $loader;
-        $this->filter = $filter instanceof \Closure ? $filter : \Closure::fromCallable($filter);
+        $this->filter = $filter(...);
     }
 
     protected function loadChoices(): iterable

Command/DebugCommand.php

@@ -209,7 +209,6 @@ private function getCoreTypes(): array
     {
         $coreExtension = new CoreExtension();
         $loadTypesRefMethod = (new \ReflectionObject($coreExtension))->getMethod('loadTypes');
-        $loadTypesRefMethod->setAccessible(true);
         $coreTypes = $loadTypesRefMethod->invoke($coreExtension);
         $coreTypes = array_map(function (FormTypeInterface $type) { return \get_class($type); }, $coreTypes);
         sort($coreTypes);

Console/Descriptor/TextDescriptor.php

@@ -45,18 +45,18 @@ protected function describeDefaults(array $options)
 
         if ($options['service_types']) {
             $this->output->section('Service form types');
-            $this->output->listing(array_map([$this, 'formatClassLink'], $options['service_types']));
+            $this->output->listing(array_map($this->formatClassLink(...), $options['service_types']));
         }
 
         if (!$options['show_deprecated']) {
             if ($options['extensions']) {
                 $this->output->section('Type extensions');
-                $this->output->listing(array_map([$this, 'formatClassLink'], $options['extensions']));
+                $this->output->listing(array_map($this->formatClassLink(...), $options['extensions']));
             }
 
             if ($options['guessers']) {
                 $this->output->section('Type guessers');
-                $this->output->listing(array_map([$this, 'formatClassLink'], $options['guessers']));
+                $this->output->listing(array_map($this->formatClassLink(...), $options['guessers']));
             }
         }
     }
@@ -92,12 +92,12 @@ protected function describeResolvedFormType(ResolvedFormTypeInterface $resolvedF
 
         if ($this->parents) {
             $this->output->section('Parent types');
-            $this->output->listing(array_map([$this, 'formatClassLink'], $this->parents));
+            $this->output->listing(array_map($this->formatClassLink(...), $this->parents));
         }
 
         if ($this->extensions) {
             $this->output->section('Type extensions');
-            $this->output->listing(array_map([$this, 'formatClassLink'], $this->extensions));
+            $this->output->listing(array_map($this->formatClassLink(...), $this->extensions));
         }
     }
 

Extension/Core/EventListener/ResizeFormListener.php

@@ -37,7 +37,7 @@ public function __construct(string $type, array $options = [], bool $allowAdd =
         $this->allowAdd = $allowAdd;
         $this->allowDelete = $allowDelete;
         $this->options = $options;
-        $this->deleteEmpty = $deleteEmpty instanceof \Closure || !\is_callable($deleteEmpty) ? $deleteEmpty : \Closure::fromCallable($deleteEmpty);
+        $this->deleteEmpty = \is_bool($deleteEmpty) ? $deleteEmpty : $deleteEmpty(...);
     }
 
     public static function getSubscribedEvents(): array

Extension/Core/Type/EnumType.php

@@ -27,7 +27,7 @@ public function configureOptions(OptionsResolver $resolver): void
         $resolver
             ->setRequired(['class'])
             ->setAllowedTypes('class', 'string')
-            ->setAllowedValues('class', \Closure::fromCallable('enum_exists'))
+            ->setAllowedValues('class', enum_exists(...))
             ->setDefault('choices', static function (Options $options): array {
                 return $options['class']::cases();
             })

FormConfigBuilder.php

@@ -729,7 +729,7 @@ public function getFormConfig(): FormConfigInterface
      */
     public function setIsEmptyCallback(?callable $isEmptyCallback): static
     {
-        $this->isEmptyCallback = null === $isEmptyCallback || $isEmptyCallback instanceof \Closure ? $isEmptyCallback : \Closure::fromCallable($isEmptyCallback);
+        $this->isEmptyCallback = null === $isEmptyCallback ? null : $isEmptyCallback(...);
 
         return $this;
     }