Bump minimum version of PHP to 8.1

nicolas-grekas · fabpot · commit 6e2e2085987f · 2022-02-25T12:15:52.000+01:00
diff --git a/GenericRuntime.php b/GenericRuntime.php
@@ -88,10 +88,7 @@ public function __construct(array $options = [])
      */
     public function getResolver(callable $callable, \ReflectionFunction $reflector = null): ResolverInterface
     {
-        if (!$callable instanceof \Closure) {
-            $callable = \Closure::fromCallable($callable);
-        }
-
+        $callable = $callable(...);
         $parameters = ($reflector ?? new \ReflectionFunction($callable))->getParameters();
         $arguments = function () use ($parameters) {
             $arguments = [];
@@ -139,7 +136,7 @@ public function getRunner(?object $application): RunnerInterface
                 throw new \LogicException(sprintf('"%s" doesn\'t know how to handle apps of type "%s".', get_debug_type($this), get_debug_type($application)));
             }
 
-            $application = \Closure::fromCallable($application);
+            $application = $application(...);
         }
 
         if ($_SERVER[$this->options['debug_var_name']] && ($r = new \ReflectionFunction($application)) && $r->getNumberOfRequiredParameters()) {
diff --git a/composer.json b/composer.json
@@ -15,7 +15,7 @@
         }
     ],
     "require": {
-        "php": ">=8.0.2",
+        "php": ">=8.1",
         "composer-plugin-api": "^1.0|^2.0"
     },
     "require-dev": {

Original file line number	Diff line number	Diff line change
`@@ -88,10 +88,7 @@ public function __construct(array $options = [])`
`88`	`88`	`*/`
`89`	`89`	`public function getResolver(callable $callable, \ReflectionFunction $reflector = null): ResolverInterface`
`90`	`90`	`{`
`91`		`- if (!$callable instanceof \Closure) {`
`92`		`- $callable = \Closure::fromCallable($callable);`
`93`		`- }`
`94`		`-`
	`91`	`+ $callable = $callable(...);`
`95`	`92`	`$parameters = ($reflector ?? new \ReflectionFunction($callable))->getParameters();`
`96`	`93`	`$arguments = function () use ($parameters) {`
`97`	`94`	`$arguments = [];`
`@@ -139,7 +136,7 @@ public function getRunner(?object $application): RunnerInterface`
`139`	`136`	`throw new \LogicException(sprintf('"%s" doesn\'t know how to handle apps of type "%s".', get_debug_type($this), get_debug_type($application)));`
`140`	`137`	`}`
`141`	`138`
`142`		`- $application = \Closure::fromCallable($application);`
	`139`	`+ $application = $application(...);`
`143`	`140`	`}`
`144`	`141`
`145`	`142`	`if ($_SERVER[$this->options['debug_var_name']] && ($r = new \ReflectionFunction($application)) && $r->getNumberOfRequiredParameters()) {`