Bump minimum version of PHP to 8.1

Author: nicolas-grekas

Error/ClassNotFoundError.php

@@ -26,7 +26,6 @@ public function __construct(string $message, \Throwable $previous)
             'trace' => $previous->getTrace(),
         ] as $property => $value) {
             $refl = new \ReflectionProperty(\Error::class, $property);
-            $refl->setAccessible(true);
             $refl->setValue($this, $value);
         }
     }

Error/FatalError.php

@@ -73,7 +73,6 @@ public function __construct(string $message, int $code, array $error, int $trace
         ] as $property => $value) {
             if (null !== $value) {
                 $refl = new \ReflectionProperty(\Error::class, $property);
-                $refl->setAccessible(true);
                 $refl->setValue($this, $value);
             }
         }

Error/UndefinedFunctionError.php

@@ -26,7 +26,6 @@ public function __construct(string $message, \Throwable $previous)
             'trace' => $previous->getTrace(),
         ] as $property => $value) {
             $refl = new \ReflectionProperty(\Error::class, $property);
-            $refl->setAccessible(true);
             $refl->setValue($this, $value);
         }
     }

Error/UndefinedMethodError.php

@@ -26,7 +26,6 @@ public function __construct(string $message, \Throwable $previous)
             'trace' => $previous->getTrace(),
         ] as $property => $value) {
             $refl = new \ReflectionProperty(\Error::class, $property);
-            $refl->setAccessible(true);
             $refl->setValue($this, $value);
         }
     }

ErrorHandler.php

@@ -185,7 +185,6 @@ public function __construct(BufferingLogger $bootstrappingLogger = null, bool $d
             $this->setDefaultLogger($bootstrappingLogger);
         }
         $traceReflector = new \ReflectionProperty(\Exception::class, 'trace');
-        $traceReflector->setAccessible(true);
         $this->configureException = \Closure::bind(static function ($e, $trace, $file = null, $line = null) use ($traceReflector) {
             $traceReflector->setValue($e, $trace);
             $e->file = $file ?? $e->file;

ErrorRenderer/HtmlErrorRenderer.php

@@ -48,11 +48,11 @@ class HtmlErrorRenderer implements ErrorRendererInterface
      */
     public function __construct(bool|callable $debug = false, string $charset = null, string|FileLinkFormatter $fileLinkFormat = null, string $projectDir = null, string|callable $outputBuffer = '', LoggerInterface $logger = null)
     {
-        $this->debug = \is_bool($debug) || $debug instanceof \Closure ? $debug : \Closure::fromCallable($debug);
+        $this->debug = \is_bool($debug) ? $debug : $debug(...);
         $this->charset = $charset ?: (ini_get('default_charset') ?: 'UTF-8');
         $this->fileLinkFormat = $fileLinkFormat ?: (ini_get('xdebug.file_link_format') ?: get_cfg_var('xdebug.file_link_format'));
         $this->projectDir = $projectDir;
-        $this->outputBuffer = \is_string($outputBuffer) || $outputBuffer instanceof \Closure ? $outputBuffer : \Closure::fromCallable($outputBuffer);
+        $this->outputBuffer = \is_string($outputBuffer) ? $outputBuffer : $outputBuffer(...);
         $this->logger = $logger;
     }
 

ErrorRenderer/SerializerErrorRenderer.php

@@ -37,9 +37,9 @@ class SerializerErrorRenderer implements ErrorRendererInterface
     public function __construct(SerializerInterface $serializer, string|callable $format, ErrorRendererInterface $fallbackErrorRenderer = null, bool|callable $debug = false)
     {
         $this->serializer = $serializer;
-        $this->format = \is_string($format) || $format instanceof \Closure ? $format : \Closure::fromCallable($format);
+        $this->format = \is_string($format) ? $format : $format(...);
         $this->fallbackErrorRenderer = $fallbackErrorRenderer ?? new HtmlErrorRenderer();
-        $this->debug = \is_bool($debug) || $debug instanceof \Closure ? $debug : \Closure::fromCallable($debug);
+        $this->debug = \is_bool($debug) ? $debug : $debug(...);
     }
 
     /**

Tests/DebugClassLoaderTest.php

@@ -50,7 +50,6 @@ public function testIdempotence()
             if (\is_array($function) && $function[0] instanceof DebugClassLoader) {
                 $reflClass = new \ReflectionClass($function[0]);
                 $reflProp = $reflClass->getProperty('classLoader');
-                $reflProp->setAccessible(true);
 
                 $this->assertNotInstanceOf(DebugClassLoader::class, $reflProp->getValue($function[0]));
 
@@ -439,9 +438,6 @@ class_exists(Fixtures\FinalConstant\OverrideFinalConstant::class, true);
         ], $deprecations);
     }
 
-    /**
-     * @requires PHP 8.1
-     */
     public function testOverrideFinalConstant81()
     {
         $deprecations = [];

Tests/phpt/fatal_with_nested_handlers.phpt

@@ -1,7 +1,5 @@
 --TEST--
 Test catching fatal errors when handlers are nested
---SKIPIF--
-<?php if (\PHP_VERSION_ID < 80100) echo 'skip' ?>
 --FILE--
 <?php
 

Tests/phpt/fatal_with_nested_handlers_pre81.phpt

@@ -16,7 +16,7 @@
         }
     ],
     "require": {
-        "php": ">=8.0.2",
+        "php": ">=8.1",
         "psr/log": "^1|^2|^3",
         "symfony/var-dumper": "^5.4|^6.0"
     },