Bump minimum version of PHP to 8.1

nicolas-grekas · fabpot · commit da802b6efc7a · 2022-02-25T12:15:52.000+01:00
diff --git a/Controller/ArgumentResolver/ServiceValueResolver.php b/Controller/ArgumentResolver/ServiceValueResolver.php
@@ -84,7 +84,6 @@ public function resolve(Request $request, ArgumentMetadata $argument): iterable
             }
 
             $r = new \ReflectionProperty($e, 'message');
-            $r->setAccessible(true);
             $r->setValue($e, $message);
 
             throw $e;
diff --git a/EventListener/DebugHandlersListener.php b/EventListener/DebugHandlersListener.php
@@ -55,7 +55,7 @@ public function __construct(callable $exceptionHandler = null, LoggerInterface $
         $this->earlyHandler = \is_array($handler) ? $handler[0] : null;
         restore_exception_handler();
 
-        $this->exceptionHandler = null === $exceptionHandler || $exceptionHandler instanceof \Closure ? $exceptionHandler : \Closure::fromCallable($exceptionHandler);
+        $this->exceptionHandler = null === $exceptionHandler ? null : $exceptionHandler(...);
         $this->logger = $logger;
         $this->levels = $levels ?? \E_ALL;
         $this->throwAt = \is_int($throwAt) ? $throwAt : (null === $throwAt ? null : ($throwAt ? \E_ALL : null));
diff --git a/EventListener/ErrorListener.php b/EventListener/ErrorListener.php
@@ -96,7 +96,6 @@ public function onKernelException(ExceptionEvent $event)
             } while ($prev = $wrapper->getPrevious());
 
             $prev = new \ReflectionProperty($wrapper instanceof \Exception ? \Exception::class : \Error::class, 'previous');
-            $prev->setAccessible(true);
             $prev->setValue($wrapper, $throwable);
 
             throw $e;
@@ -124,7 +123,7 @@ public function onControllerArguments(ControllerArgumentsEvent $event)
             return;
         }
 
-        $r = new \ReflectionFunction(\Closure::fromCallable($event->getController()));
+        $r = new \ReflectionFunction($event->getController()(...));
         $r = $r->getParameters()[$k] ?? null;
 
         if ($r && (!($r = $r->getType()) instanceof \ReflectionNamedType || \in_array($r->getName(), [FlattenException::class, LegacyFlattenException::class], true))) {
diff --git a/Exception/ControllerDoesNotReturnResponseException.php b/Exception/ControllerDoesNotReturnResponseException.php
@@ -27,7 +27,6 @@ public function __construct(string $message, callable $controller, string $file,
         $this->file = $controllerDefinition['file'];
         $this->line = $controllerDefinition['line'];
         $r = new \ReflectionProperty(\Exception::class, 'trace');
-        $r->setAccessible(true);
         $r->setValue($this, array_merge([
             [
                 'line' => $line,
diff --git a/HttpCache/HttpCache.php b/HttpCache/HttpCache.php
@@ -86,7 +86,7 @@ public function __construct(HttpKernelInterface $kernel, StoreInterface $store,
         $this->surrogate = $surrogate;
 
         // needed in case there is a fatal error because the backend is too slow to respond
-        register_shutdown_function([$this->store, 'cleanup']);
+        register_shutdown_function($this->store->cleanup(...));
 
         $this->options = array_merge([
             'debug' => false,
diff --git a/Log/Logger.php b/Log/Logger.php
@@ -62,7 +62,7 @@ public function __construct(string $minLevel = null, $output = null, callable $f
         }
 
         $this->minLevelIndex = self::LEVELS[$minLevel];
-        $this->formatter = $formatter instanceof \Closure ? $formatter : \Closure::fromCallable($formatter ?? [$this, 'format']);
+        $this->formatter = null !== $formatter ? $formatter(...) : $this->format(...);
         if ($output && false === $this->handle = \is_resource($output) ? $output : @fopen($output, 'a')) {
             throw new InvalidArgumentException(sprintf('Unable to open "%s".', $output));
         }
diff --git a/Tests/Controller/ArgumentResolver/BackedEnumValueResolverTest.php b/Tests/Controller/ArgumentResolver/BackedEnumValueResolverTest.php
@@ -18,9 +18,6 @@
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 use Symfony\Component\HttpKernel\Tests\Fixtures\Suit;
 
-/**
- * @requires PHP 8.1
- */
 class BackedEnumValueResolverTest extends TestCase
 {
     /**
diff --git a/Tests/Controller/ArgumentResolverTest.php b/Tests/Controller/ArgumentResolverTest.php
@@ -186,15 +186,15 @@ public function testGetArgumentWithoutArray()
         $request = Request::create('/');
         $request->attributes->set('foo', 'foo');
         $request->attributes->set('bar', 'foo');
-        $controller = [$this, 'controllerWithFooAndDefaultBar'];
+        $controller = $this->controllerWithFooAndDefaultBar(...);
         $resolver->getArguments($request, $controller);
     }
 
     public function testIfExceptionIsThrownWhenMissingAnArgument()
     {
         $this->expectException(\RuntimeException::class);
         $request = Request::create('/');
-        $controller = [$this, 'controllerWithFoo'];
+        $controller = $this->controllerWithFoo(...);
 
         self::$resolver->getArguments($request, $controller);
     }
@@ -224,7 +224,7 @@ public function testGetSessionArguments()
         $session = new Session(new MockArraySessionStorage());
         $request = Request::create('/');
         $request->setSession($session);
-        $controller = [$this, 'controllerWithSession'];
+        $controller = $this->controllerWithSession(...);
 
         $this->assertEquals([$session], self::$resolver->getArguments($request, $controller));
     }
@@ -234,7 +234,7 @@ public function testGetSessionArgumentsWithExtendedSession()
         $session = new ExtendingSession(new MockArraySessionStorage());
         $request = Request::create('/');
         $request->setSession($session);
-        $controller = [$this, 'controllerWithExtendingSession'];
+        $controller = $this->controllerWithExtendingSession(...);
 
         $this->assertEquals([$session], self::$resolver->getArguments($request, $controller));
     }
@@ -244,7 +244,7 @@ public function testGetSessionArgumentsWithInterface()
         $session = $this->createMock(SessionInterface::class);
         $request = Request::create('/');
         $request->setSession($session);
-        $controller = [$this, 'controllerWithSessionInterface'];
+        $controller = $this->controllerWithSessionInterface(...);
 
         $this->assertEquals([$session], self::$resolver->getArguments($request, $controller));
     }
@@ -255,7 +255,7 @@ public function testGetSessionMissMatchWithInterface()
         $session = $this->createMock(SessionInterface::class);
         $request = Request::create('/');
         $request->setSession($session);
-        $controller = [$this, 'controllerWithExtendingSession'];
+        $controller = $this->controllerWithExtendingSession(...);
 
         self::$resolver->getArguments($request, $controller);
     }
@@ -266,7 +266,7 @@ public function testGetSessionMissMatchWithImplementation()
         $session = new Session(new MockArraySessionStorage());
         $request = Request::create('/');
         $request->setSession($session);
-        $controller = [$this, 'controllerWithExtendingSession'];
+        $controller = $this->controllerWithExtendingSession(...);
 
         self::$resolver->getArguments($request, $controller);
     }
@@ -275,7 +275,7 @@ public function testGetSessionMissMatchOnNull()
     {
         $this->expectException(\RuntimeException::class);
         $request = Request::create('/');
-        $controller = [$this, 'controllerWithExtendingSession'];
+        $controller = $this->controllerWithExtendingSession(...);
 
         self::$resolver->getArguments($request, $controller);
     }
diff --git a/Tests/ControllerMetadata/ArgumentMetadataFactoryTest.php b/Tests/ControllerMetadata/ArgumentMetadataFactoryTest.php
@@ -109,7 +109,7 @@ public function testBasicTypesSignature()
 
     public function testNamedClosure()
     {
-        $arguments = $this->factory->createArgumentMetadata(\Closure::fromCallable([$this, 'signature1']));
+        $arguments = $this->factory->createArgumentMetadata($this->signature1(...));
 
         $this->assertEquals([
             new ArgumentMetadata('foo', self::class, false, false, null),
diff --git a/Tests/DataCollector/MemoryDataCollectorTest.php b/Tests/DataCollector/MemoryDataCollectorTest.php
@@ -33,7 +33,6 @@ public function testBytesConversion($limit, $bytes)
     {
         $collector = new MemoryDataCollector();
         $method = new \ReflectionMethod($collector, 'convertToBytes');
-        $method->setAccessible(true);
         $this->assertEquals($bytes, $method->invoke($collector, $limit));
     }
 
diff --git a/Tests/DependencyInjection/AddAnnotatedClassesToCachePassTest.php b/Tests/DependencyInjection/AddAnnotatedClassesToCachePassTest.php
@@ -21,7 +21,6 @@ public function testExpandClasses()
         $r = new \ReflectionClass(AddAnnotatedClassesToCachePass::class);
         $pass = $r->newInstanceWithoutConstructor();
         $r = new \ReflectionMethod(AddAnnotatedClassesToCachePass::class, 'expandClasses');
-        $r->setAccessible(true);
         $expand = $r->getClosure($pass);
 
         $this->assertSame('Foo', $expand(['Foo'], [])[0]);
diff --git a/Tests/DependencyInjection/RegisterControllerArgumentLocatorsPassTest.php b/Tests/DependencyInjection/RegisterControllerArgumentLocatorsPassTest.php
@@ -401,9 +401,6 @@ public function testAlias()
         $this->assertEqualsCanonicalizing([RegisterTestController::class.'::fooAction', 'foo::fooAction'], array_keys($locator));
     }
 
-    /**
-     * @requires PHP 8.1
-     */
     public function testEnumArgumentIsIgnored()
     {
         $container = new ContainerBuilder();
diff --git a/Tests/EventListener/ErrorListenerTest.php b/Tests/EventListener/ErrorListenerTest.php
@@ -41,9 +41,7 @@ public function testConstruct()
         $l = new ErrorListener('foo', $logger);
 
         $_logger = new \ReflectionProperty(\get_class($l), 'logger');
-        $_logger->setAccessible(true);
         $_controller = new \ReflectionProperty(\get_class($l), 'controller');
-        $_controller->setAccessible(true);
 
         $this->assertSame($logger, $_logger->getValue($l));
         $this->assertSame('foo', $_controller->getValue($l));
diff --git a/Tests/EventListener/SessionListenerTest.php b/Tests/EventListener/SessionListenerTest.php
@@ -76,13 +76,11 @@ public function testSessionCookieOptions(array $phpSessionOptions, array $sessio
 
     public function provideSessionOptions(): \Generator
     {
-        if (\PHP_VERSION_ID > 70300) {
-            yield 'set_samesite_by_php' => [
-                'phpSessionOptions' => ['samesite' => Cookie::SAMESITE_STRICT],
-                'sessionOptions' => ['cookie_path' => '/test/', 'cookie_domain' => '', 'cookie_secure' => true, 'cookie_httponly' => true],
-                'expectedSessionOptions' => ['cookie_path' => '/test/', 'cookie_domain' => '', 'cookie_secure' => true, 'cookie_httponly' => true, 'cookie_samesite' => Cookie::SAMESITE_STRICT],
-            ];
-        }
+        yield 'set_samesite_by_php' => [
+            'phpSessionOptions' => ['samesite' => Cookie::SAMESITE_STRICT],
+            'sessionOptions' => ['cookie_path' => '/test/', 'cookie_domain' => '', 'cookie_secure' => true, 'cookie_httponly' => true],
+            'expectedSessionOptions' => ['cookie_path' => '/test/', 'cookie_domain' => '', 'cookie_secure' => true, 'cookie_httponly' => true, 'cookie_samesite' => Cookie::SAMESITE_STRICT],
+        ];
 
         yield 'set_cookie_path_by_php' => [
             'phpSessionOptions' => ['path' => '/prod/'],
@@ -678,7 +676,7 @@ public function testSessionUsageCallbackWhenDebugAndStateless()
 
         $container = new Container();
         $container->set('request_stack', $requestStack);
-        $container->set('session_collector', \Closure::fromCallable([$collector, 'collectSessionUsage']));
+        $container->set('session_collector', $collector->collectSessionUsage(...));
 
         $this->expectException(UnexpectedSessionUsageException::class);
         (new SessionListener($container, true))->onSessionUsage();
diff --git a/Tests/Fragment/RoutableFragmentRendererTest.php b/Tests/Fragment/RoutableFragmentRendererTest.php
@@ -78,7 +78,6 @@ private function callGenerateFragmentUriMethod(ControllerReference $reference, R
         $renderer = $this->getMockForAbstractClass(RoutableFragmentRenderer::class);
         $r = new \ReflectionObject($renderer);
         $m = $r->getMethod('generateFragmentUri');
-        $m->setAccessible(true);
 
         return $m->invoke($renderer, $reference, $request, $absolute);
     }
diff --git a/Tests/HttpCache/HttpCacheTest.php b/Tests/HttpCache/HttpCacheTest.php
@@ -696,7 +696,6 @@ public function testAssignsDefaultTtlWhenResponseHasNoFreshnessInformationAndAft
         $tmp[0][1]['date'] = $time->format(\DATE_RFC2822);
         $r = new \ReflectionObject($this->store);
         $m = $r->getMethod('save');
-        $m->setAccessible(true);
         $m->invoke($this->store, 'md'.hash('sha256', 'http://localhost/'), serialize($tmp));
 
         $this->request('GET', '/');
@@ -746,7 +745,6 @@ public function testAssignsDefaultTtlWhenResponseHasNoFreshnessInformationAndAft
         $tmp[0][1]['date'] = $time->format(\DATE_RFC2822);
         $r = new \ReflectionObject($this->store);
         $m = $r->getMethod('save');
-        $m->setAccessible(true);
         $m->invoke($this->store, 'md'.hash('sha256', 'http://localhost/'), serialize($tmp));
 
         $this->request('GET', '/');
@@ -806,7 +804,6 @@ public function testFetchesFullResponseWhenCacheStaleAndNoValidatorsPresent()
         $tmp[0][1]['expires'] = $time->format(\DATE_RFC2822);
         $r = new \ReflectionObject($this->store);
         $m = $r->getMethod('save');
-        $m->setAccessible(true);
         $m->invoke($this->store, 'md'.hash('sha256', 'http://localhost/'), serialize($tmp));
 
         // build subsequent request; should be found but miss due to freshness
diff --git a/Tests/HttpCache/StoreTest.php b/Tests/HttpCache/StoreTest.php
@@ -333,11 +333,9 @@ protected function getStoreMetadata($key)
     {
         $r = new \ReflectionObject($this->store);
         $m = $r->getMethod('getMetadata');
-        $m->setAccessible(true);
 
         if ($key instanceof Request) {
             $m1 = $r->getMethod('getCacheKey');
-            $m1->setAccessible(true);
             $key = $m1->invoke($this->store, $key);
         }
 
@@ -348,7 +346,6 @@ protected function getStorePath($key)
     {
         $r = new \ReflectionObject($this->store);
         $m = $r->getMethod('getPath');
-        $m->setAccessible(true);
 
         return $m->invoke($this->store, $key);
     }
diff --git a/Tests/HttpCache/TestHttpKernel.php b/Tests/HttpCache/TestHttpKernel.php
@@ -69,7 +69,7 @@ public function isCatchingExceptions()
 
     public function getController(Request $request): callable|false
     {
-        return [$this, 'callController'];
+        return $this->callController(...);
     }
 
     public function getArguments(Request $request, callable $controller): array
diff --git a/Tests/HttpCache/TestMultipleHttpKernel.php b/Tests/HttpCache/TestMultipleHttpKernel.php
@@ -52,7 +52,7 @@ public function handle(Request $request, $type = HttpKernelInterface::MAIN_REQUE
 
     public function getController(Request $request): callable|false
     {
-        return [$this, 'callController'];
+        return $this->callController(...);
     }
 
     public function getArguments(Request $request, callable $controller): array
diff --git a/Tests/HttpKernelBrowserTest.php b/Tests/HttpKernelBrowserTest.php
@@ -59,7 +59,6 @@ public function testFilterResponseConvertsCookies()
 
         $r = new \ReflectionObject($client);
         $m = $r->getMethod('filterResponse');
-        $m->setAccessible(true);
 
         $response = new Response();
         $response->headers->setCookie($cookie1 = new Cookie('foo', 'bar', \DateTime::createFromFormat('j-M-Y H:i:s T', '15-Feb-2009 20:00:00 GMT')->format('U'), '/foo', 'http://example.com', true, true, false, null));
@@ -80,7 +79,6 @@ public function testFilterResponseSupportsStreamedResponses()
 
         $r = new \ReflectionObject($client);
         $m = $r->getMethod('filterResponse');
-        $m->setAccessible(true);
 
         $response = new StreamedResponse(function () {
             echo 'foo';
diff --git a/Tests/Profiler/FileProfilerStorageTest.php b/Tests/Profiler/FileProfilerStorageTest.php
@@ -348,8 +348,6 @@ public function testReadLineFromFile()
     {
         $r = new \ReflectionMethod($this->storage, 'readLineFromFile');
 
-        $r->setAccessible(true);
-
         $h = tmpfile();
 
         fwrite($h, "line1\n\n\nline2\n");
diff --git a/Tests/TestHttpKernel.php b/Tests/TestHttpKernel.php
@@ -27,7 +27,7 @@ public function __construct()
 
     public function getController(Request $request): callable|false
     {
-        return [$this, 'callController'];
+        return $this->callController(...);
     }
 
     public function getArguments(Request $request, callable $controller): array
diff --git a/composer.json b/composer.json
@@ -16,7 +16,7 @@
         }
     ],
     "require": {
-        "php": ">=8.0.2",
+        "php": ">=8.1",
         "symfony/error-handler": "^5.4|^6.0",
         "symfony/event-dispatcher": "^5.4|^6.0",
         "symfony/http-foundation": "^5.4|^6.0",

Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,6 @@ public function resolve(Request $request, ArgumentMetadata $argument): iterable`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`$r = new \ReflectionProperty($e, 'message');`
`87`		`- $r->setAccessible(true);`
`88`	`87`	`$r->setValue($e, $message);`
`89`	`88`
`90`	`89`	`throw $e;`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,6 @@ public function __construct(string $message, callable $controller, string $file,`
`27`	`27`	`$this->file = $controllerDefinition['file'];`
`28`	`28`	`$this->line = $controllerDefinition['line'];`
`29`	`29`	`$r = new \ReflectionProperty(\Exception::class, 'trace');`
`30`		`- $r->setAccessible(true);`
`31`	`30`	`$r->setValue($this, array_merge([`
`32`	`31`	`[`
`33`	`32`	`'line' => $line,`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ public function __construct(string $minLevel = null, $output = null, callable $f`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`$this->minLevelIndex = self::LEVELS[$minLevel];`
`65`		`- $this->formatter = $formatter instanceof \Closure ? $formatter : \Closure::fromCallable($formatter ?? [$this, 'format']);`
	`65`	`+ $this->formatter = null !== $formatter ? $formatter(...) : $this->format(...);`
`66`	`66`	`if ($output && false === $this->handle = \is_resource($output) ? $output : @fopen($output, 'a')) {`
`67`	`67`	`throw new InvalidArgumentException(sprintf('Unable to open "%s".', $output));`
`68`	`68`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,9 +18,6 @@`
`18`	`18`	`use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;`
`19`	`19`	`use Symfony\Component\HttpKernel\Tests\Fixtures\Suit;`
`20`	`20`
`21`		`-/**`
`22`		`- * @requires PHP 8.1`
`23`		`- */`
`24`	`21`	`class BackedEnumValueResolverTest extends TestCase`
`25`	`22`	`{`
`26`	`23`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ public function testBasicTypesSignature()`
`109`	`109`
`110`	`110`	`public function testNamedClosure()`
`111`	`111`	`{`
`112`		`- $arguments = $this->factory->createArgumentMetadata(\Closure::fromCallable([$this, 'signature1']));`
	`112`	`+ $arguments = $this->factory->createArgumentMetadata($this->signature1(...));`
`113`	`113`
`114`	`114`	`$this->assertEquals([`
`115`	`115`	`new ArgumentMetadata('foo', self::class, false, false, null),`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,6 @@ public function testBytesConversion($limit, $bytes)`
`33`	`33`	`{`
`34`	`34`	`$collector = new MemoryDataCollector();`
`35`	`35`	`$method = new \ReflectionMethod($collector, 'convertToBytes');`
`36`		`- $method->setAccessible(true);`
`37`	`36`	`$this->assertEquals($bytes, $method->invoke($collector, $limit));`
`38`	`37`	`}`
`39`	`38`