Merge branch '6.4' into 7.2

* 6.4:
  -
  CS fixes

Author: nicolas-grekas

DataCollector/ConfigDataCollector.php

@@ -57,11 +57,11 @@ public function collect(Request $request, Response $response, ?\Throwable $excep
             'php_intl_locale' => class_exists(\Locale::class, false) && \Locale::getDefault() ? \Locale::getDefault() : 'n/a',
             'php_timezone' => date_default_timezone_get(),
             'xdebug_enabled' => \extension_loaded('xdebug'),
-            'xdebug_status' => \extension_loaded('xdebug') ? ($xdebugMode && 'off' !== $xdebugMode ? 'Enabled (' . $xdebugMode . ')' : 'Not enabled') : 'Not installed',
+            'xdebug_status' => \extension_loaded('xdebug') ? ($xdebugMode && 'off' !== $xdebugMode ? 'Enabled ('.$xdebugMode.')' : 'Not enabled') : 'Not installed',
             'apcu_enabled' => \extension_loaded('apcu') && filter_var(\ini_get('apc.enabled'), \FILTER_VALIDATE_BOOL),
-            'apcu_status' => \extension_loaded('apcu') ? (filter_var(\ini_get('apc.enabled'), FILTER_VALIDATE_BOOLEAN) ? 'Enabled' : 'Not enabled') : 'Not installed',
+            'apcu_status' => \extension_loaded('apcu') ? (filter_var(\ini_get('apc.enabled'), \FILTER_VALIDATE_BOOLEAN) ? 'Enabled' : 'Not enabled') : 'Not installed',
             'zend_opcache_enabled' => \extension_loaded('Zend OPcache') && filter_var(\ini_get('opcache.enable'), \FILTER_VALIDATE_BOOL),
-            'zend_opcache_status' => \extension_loaded('Zend OPcache') ? (filter_var(\ini_get('opcache.enable'), FILTER_VALIDATE_BOOLEAN) ? 'Enabled' : 'Not enabled') : 'Not installed',
+            'zend_opcache_status' => \extension_loaded('Zend OPcache') ? (filter_var(\ini_get('opcache.enable'), \FILTER_VALIDATE_BOOLEAN) ? 'Enabled' : 'Not enabled') : 'Not installed',
             'bundles' => [],
             'sapi_name' => \PHP_SAPI,
         ];

HttpCache/ResponseCacheStrategy.php

@@ -222,7 +222,7 @@ private function storeRelativeAgeDirective(string $directive, ?int $value, ?int
         }
 
         if (false !== $this->ageDirectives[$directive]) {
-            $value = min($value ?? PHP_INT_MAX, $expires ?? PHP_INT_MAX);
+            $value = min($value ?? \PHP_INT_MAX, $expires ?? \PHP_INT_MAX);
             $value -= $age;
             $this->ageDirectives[$directive] = null !== $this->ageDirectives[$directive] ? min($this->ageDirectives[$directive], $value) : $value;
         }

Tests/Controller/ArgumentResolver/RequestPayloadValueResolverTest.php

@@ -420,7 +420,7 @@ public function testQueryStringParameterTypeMismatch()
 
         try {
             $resolver->onKernelControllerArguments($event);
-            $this->fail(sprintf('Expected "%s" to be thrown.', HttpException::class));
+            $this->fail(\sprintf('Expected "%s" to be thrown.', HttpException::class));
         } catch (HttpException $e) {
             $validationFailedException = $e->getPrevious();
             $this->assertInstanceOf(ValidationFailedException::class, $validationFailedException);
@@ -514,7 +514,7 @@ public function testRequestInputTypeMismatch()
 
         try {
             $resolver->onKernelControllerArguments($event);
-            $this->fail(sprintf('Expected "%s" to be thrown.', HttpException::class));
+            $this->fail(\sprintf('Expected "%s" to be thrown.', HttpException::class));
         } catch (HttpException $e) {
             $validationFailedException = $e->getPrevious();
             $this->assertInstanceOf(ValidationFailedException::class, $validationFailedException);

Tests/HttpCache/HttpCacheTest.php

@@ -714,7 +714,7 @@ public function testHitBackendOnlyOnceWhenCacheWasLocked()
         $this->request('GET', '/'); // warm the cache
 
         // Use a store that simulates a cache entry being locked upon first attempt
-        $this->store = new class(sys_get_temp_dir() . '/http_cache') extends Store {
+        $this->store = new class(sys_get_temp_dir().'/http_cache') extends Store {
             private bool $hasLock = false;
 
             public function lock(Request $request): bool

Tests/HttpCache/HttpCacheTestCase.php

@@ -115,7 +115,7 @@ public function request($method, $uri = '/', $server = [], $cookies = [], $esi =
 
         $this->kernel->reset();
 
-        if (! $this->store) {
+        if (!$this->store) {
             $this->store = $this->createStore();
         }
 
@@ -188,6 +188,6 @@ public static function clearDirectory($directory)
 
     protected function createStore(): Store
     {
-        return new Store(sys_get_temp_dir() . '/http_cache');
+        return new Store(sys_get_temp_dir().'/http_cache');
     }
 }