Bump minimum version of PHP to 8.1

Author: nicolas-grekas

Argument/RewindableGenerator.php

@@ -21,8 +21,8 @@ class RewindableGenerator implements \IteratorAggregate, \Countable
 
     public function __construct(callable $generator, int|callable $count)
     {
-        $this->generator = $generator instanceof \Closure ? $generator : \Closure::fromCallable($generator);
-        $this->count = \is_callable($count) && !$count instanceof \Closure ? \Closure::fromCallable($count) : $count;
+        $this->generator = $generator(...);
+        $this->count = \is_int($count) ? $count : $count(...);
     }
 
     public function getIterator(): \Traversable
@@ -34,7 +34,7 @@ public function getIterator(): \Traversable
 
     public function count(): int
     {
-        if (\is_callable($count = $this->count)) {
+        if (!\is_int($count = $this->count)) {
             $this->count = $count();
         }
 

Compiler/AttributeAutoconfigurationPass.php

@@ -34,7 +34,7 @@ public function process(ContainerBuilder $container): void
         }
 
         foreach ($container->getAutoconfiguredAttributes() as $attributeName => $callable) {
-            $callableReflector = new \ReflectionFunction(\Closure::fromCallable($callable));
+            $callableReflector = new \ReflectionFunction($callable(...));
             if ($callableReflector->getNumberOfParameters() <= 2) {
                 $this->classAttributeConfigurators[$attributeName] = $callable;
                 continue;

Compiler/AutowirePass.php

@@ -205,7 +205,7 @@ private function autowireCalls(\ReflectionClass $reflectionClass, bool $isRoot,
                     continue;
                 }
 
-                if (\PHP_VERSION_ID >= 80100 && (\is_array($value->value) ? $value->value : \is_object($value->value))) {
+                if (\is_array($value->value) ? $value->value : \is_object($value->value)) {
                     unset($arguments[$j]);
                     $namedArguments = $value->names;
                 } else {

Compiler/Compiler.php

@@ -81,7 +81,6 @@ public function compile(ContainerBuilder $container)
 
                 if ($msg !== $resolvedMsg = $container->resolveEnvPlaceholders($msg, null, $usedEnvs)) {
                     $r = new \ReflectionProperty($prev, 'message');
-                    $r->setAccessible(true);
                     $r->setValue($prev, $resolvedMsg);
                 }
             } while ($prev = $prev->getPrevious());

Compiler/RegisterAutoconfigureAttributesPass.php

@@ -57,7 +57,6 @@ private static function registerForAutoconfiguration(ContainerBuilder $container
         }
 
         $parseDefinitions = new \ReflectionMethod(YamlFileLoader::class, 'parseDefinitions');
-        $parseDefinitions->setAccessible(true);
         $yamlLoader = $parseDefinitions->getDeclaringClass()->newInstanceWithoutConstructor();
 
         self::$registerForAutoconfiguration = static function (ContainerBuilder $container, \ReflectionClass $class, \ReflectionAttribute $attribute) use ($parseDefinitions, $yamlLoader) {

Compiler/ResolveChildDefinitionsPass.php

@@ -63,7 +63,6 @@ private function resolveDefinition(ChildDefinition $definition): Definition
             throw $e;
         } catch (ExceptionInterface $e) {
             $r = new \ReflectionProperty($e, 'message');
-            $r->setAccessible(true);
             $r->setValue($e, sprintf('Service "%s": %s', $this->currentId, $e->getMessage()));
 
             throw $e;

Container.php

@@ -194,7 +194,7 @@ public function get(string $id, int $invalidBehavior = self::EXCEPTION_ON_INVALI
     {
         return $this->services[$id]
             ?? $this->services[$id = $this->aliases[$id] ?? $id]
-            ?? ('service_container' === $id ? $this : ($this->factories[$id] ?? [$this, 'make'])($id, $invalidBehavior));
+            ?? ('service_container' === $id ? $this : ($this->factories[$id] ?? $this->make(...))($id, $invalidBehavior));
     }
 
     /**
@@ -345,7 +345,7 @@ protected function getEnv(string $name): mixed
         if (!$this->has($id = 'container.env_var_processors_locator')) {
             $this->set($id, new ServiceLocator([]));
         }
-        $this->getEnv ??= \Closure::fromCallable([$this, 'getEnv']);
+        $this->getEnv ??= $this->getEnv(...);
         $processors = $this->get($id);
 
         if (false !== $i = strpos($name, ':')) {

ContainerBuilder.php

@@ -1154,7 +1154,7 @@ private function doResolveServices(mixed $value, array &$inlineServices = [], bo
                     $types[$k] = $v instanceof TypedReference ? $v->getType() : '?';
                 }
             }
-            $value = new ServiceLocator(\Closure::fromCallable([$this, 'resolveServices']), $refs, $types);
+            $value = new ServiceLocator($this->resolveServices(...), $refs, $types);
         } elseif ($value instanceof Reference) {
             $value = $this->doGet((string) $value, $value->getInvalidBehavior(), $inlineServices, $isConstructorArgument);
         } elseif ($value instanceof Definition) {
@@ -1586,7 +1586,7 @@ private function getExpressionLanguage(): ExpressionLanguage
             if (!class_exists(\Symfony\Component\ExpressionLanguage\ExpressionLanguage::class)) {
                 throw new LogicException('Unable to use expressions as the Symfony ExpressionLanguage component is not installed.');
             }
-            $this->expressionLanguage = new ExpressionLanguage(null, $this->expressionLanguageProviders, null, \Closure::fromCallable([$this, 'getEnv']));
+            $this->expressionLanguage = new ExpressionLanguage(null, $this->expressionLanguageProviders, null, $this->getEnv(...));
         }
 
         return $this->expressionLanguage;

Dumper/PhpDumper.php

@@ -226,7 +226,7 @@ public function dump(array $options = []): string|array
         if ($this->addGetService) {
             $code = preg_replace(
                 "/(\r?\n\r?\n    public function __construct.+?\\{\r?\n)/s",
-                "\n    protected \$getService;$1        \$this->getService = \\Closure::fromCallable([\$this, 'getService']);\n",
+                "\n    protected \Closure \$getService;$1        \$this->getService = \$this->getService(...);\n",
                 $code,
                 1
             );
@@ -334,7 +334,7 @@ class %s extends {$options['class']}
                     if (!$class || str_contains($class, '$') || \in_array($class, ['int', 'float', 'string', 'bool', 'resource', 'object', 'array', 'null', 'callable', 'iterable', 'mixed', 'void'], true)) {
                         continue;
                     }
-                    if (!(class_exists($class, false) || interface_exists($class, false) || trait_exists($class, false)) || ((new \ReflectionClass($class))->isUserDefined() && !\in_array($class, ['Attribute', 'JsonException', 'ReturnTypeWillChange', 'Stringable', 'UnhandledMatchError', 'ValueError'], true))) {
+                    if (!(class_exists($class, false) || interface_exists($class, false) || trait_exists($class, false)) || (new \ReflectionClass($class))->isUserDefined()) {
                         $code[$options['class'].'.preload.php'] .= sprintf("\$classes[] = '%s';\n", $class);
                     }
                 }
@@ -891,7 +891,7 @@ protected function {$methodName}($lazyInitialization)
                         $code .= "            return self::do(\$container);\n";
                         $code .= "        };\n\n";
                     } else {
-                        $code .= sprintf("\\Closure::fromCallable([\$this, '%s']);\n\n", $methodName);
+                        $code .= sprintf("\$this->%s(...);\n\n", $methodName);
                     }
                 }
 

ExpressionLanguageProvider.php

@@ -32,7 +32,7 @@ class ExpressionLanguageProvider implements ExpressionFunctionProviderInterface
 
     public function __construct(callable $serviceCompiler = null, \Closure $getEnv = null)
     {
-        $this->serviceCompiler = null !== $serviceCompiler && !$serviceCompiler instanceof \Closure ? \Closure::fromCallable($serviceCompiler) : $serviceCompiler;
+        $this->serviceCompiler = null === $serviceCompiler ? null : $serviceCompiler(...);
         $this->getEnv = $getEnv;
     }