From 3fc09386d57dd08c7978fdcb248e1983c950f326 Mon Sep 17 00:00:00 2001 From: Christian Flothmann Date: Tue, 1 Oct 2024 10:40:48 +0200 Subject: [PATCH 1/2] fix merge --- Tests/DependencyInjection/WebProfilerExtensionTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tests/DependencyInjection/WebProfilerExtensionTest.php b/Tests/DependencyInjection/WebProfilerExtensionTest.php index 22612cec..f4e5fe97 100644 --- a/Tests/DependencyInjection/WebProfilerExtensionTest.php +++ b/Tests/DependencyInjection/WebProfilerExtensionTest.php @@ -242,7 +242,7 @@ public function match(string $pathinfo): array class NullProfilerStorage implements ProfilerStorageInterface { - public function find(?string $ip, ?string $url, ?int $limit, ?string $method, ?int $start = null, ?int $end = null): array + public function find(?string $ip, ?string $url, ?int $limit, ?string $method, ?int $start = null, ?int $end = null, string $statusCode = null, \Closure $filter = null): array { return []; } From 646bf712f64d56763d0a00a11da72c5c0e4cf617 Mon Sep 17 00:00:00 2001 From: Christian Flothmann Date: Tue, 1 Oct 2024 10:47:05 +0200 Subject: [PATCH 2/2] fix merge --- Tests/DependencyInjection/WebProfilerExtensionTest.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Tests/DependencyInjection/WebProfilerExtensionTest.php b/Tests/DependencyInjection/WebProfilerExtensionTest.php index f4e5fe97..cc2c19d7 100644 --- a/Tests/DependencyInjection/WebProfilerExtensionTest.php +++ b/Tests/DependencyInjection/WebProfilerExtensionTest.php @@ -242,7 +242,7 @@ public function match(string $pathinfo): array class NullProfilerStorage implements ProfilerStorageInterface { - public function find(?string $ip, ?string $url, ?int $limit, ?string $method, ?int $start = null, ?int $end = null, string $statusCode = null, \Closure $filter = null): array + public function find(?string $ip, ?string $url, ?int $limit, ?string $method, ?int $start = null, ?int $end = null, ?string $statusCode = null, ?\Closure $filter = null): array { return []; } @@ -257,7 +257,7 @@ public function write(Profile $profile): bool return true; } - public function purge() + public function purge(): void { } }