Merge branch '7.2' into 7.3

* 7.2:
  -
  -
  CS fixes

Author: nicolas-grekas

EventListener/ErrorListener.php

@@ -164,13 +164,13 @@ public static function getSubscribedEvents(): array
      *
      * @param ?string $logChannel
      */
-    protected function logException(\Throwable $exception, string $message, ?string $logLevel = null, /* ?string $logChannel = null */): void
+    protected function logException(\Throwable $exception, string $message, ?string $logLevel = null/* , ?string $logChannel = null */): void
     {
-        $logChannel = (3 < \func_num_args() ? \func_get_arg(3) : null) ?? $this->resolveLogChannel($exception);
+        $logChannel = (3 < \func_num_args() ? func_get_arg(3) : null) ?? $this->resolveLogChannel($exception);
 
         $logLevel ??= $this->resolveLogLevel($exception);
 
-        if(!$logger = $this->getLogger($logChannel)) {
+        if (!$logger = $this->getLogger($logChannel)) {
             return;
         }
 

Tests/EventListener/RouterListenerTest.php

@@ -354,7 +354,7 @@ public static function provideRouteMapping(): iterable
                 '_route_mapping' => [
                     'id' => [
                         'article',
-                        'id'
+                        'id',
                     ],
                     'date' => [
                         'article',

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');
     }
 }