diff --git a/EventListener/ErrorListener.php b/EventListener/ErrorListener.php index 2599b27de0..81f5dfb7fc 100644 --- a/EventListener/ErrorListener.php +++ b/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; } diff --git a/Kernel.php b/Kernel.php index 4829bfb7de..7bc59a9e68 100644 --- a/Kernel.php +++ b/Kernel.php @@ -73,12 +73,12 @@ abstract class Kernel implements KernelInterface, RebootableInterface, Terminabl */ private static array $freshCache = []; - public const VERSION = '7.3.1'; - public const VERSION_ID = 70301; + public const VERSION = '7.3.2-DEV'; + public const VERSION_ID = 70302; public const MAJOR_VERSION = 7; public const MINOR_VERSION = 3; - public const RELEASE_VERSION = 1; - public const EXTRA_VERSION = ''; + public const RELEASE_VERSION = 2; + public const EXTRA_VERSION = 'DEV'; public const END_OF_MAINTENANCE = '01/2026'; public const END_OF_LIFE = '01/2026'; diff --git a/Tests/EventListener/RouterListenerTest.php b/Tests/EventListener/RouterListenerTest.php index ca7bb1b1f6..f980984943 100644 --- a/Tests/EventListener/RouterListenerTest.php +++ b/Tests/EventListener/RouterListenerTest.php @@ -354,7 +354,7 @@ public static function provideRouteMapping(): iterable '_route_mapping' => [ 'id' => [ 'article', - 'id' + 'id', ], 'date' => [ 'article', diff --git a/Tests/HttpCache/HttpCacheTest.php b/Tests/HttpCache/HttpCacheTest.php index 240b201306..9f03f6d8e8 100644 --- a/Tests/HttpCache/HttpCacheTest.php +++ b/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 diff --git a/Tests/HttpCache/HttpCacheTestCase.php b/Tests/HttpCache/HttpCacheTestCase.php index 88f6bed56f..b05d913666 100644 --- a/Tests/HttpCache/HttpCacheTestCase.php +++ b/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'); } }