Merge branch '7.1' into 7.2

xabbuh · xabbuh · commit 9a3e33b70239 · 2024-10-01T10:54:42.000+02:00
* 7.1:
  fix merge
  fix merge
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Tests/DependencyInjection/WebProfilerExtensionTest.php b/src/Symfony/Bundle/WebProfilerBundle/Tests/DependencyInjection/WebProfilerExtensionTest.php
@@ -238,7 +238,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 [];
     }
@@ -253,7 +253,7 @@ public function write(Profile $profile): bool
         return true;
     }
 
-    public function purge()
+    public function purge(): void
     {
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -238,7 +238,7 @@ public function match(string $pathinfo): array`
`238`	`238`
`239`	`239`	`class NullProfilerStorage implements ProfilerStorageInterface`
`240`	`240`	`{`
`241`		`- public function find(?string $ip, ?string $url, ?int $limit, ?string $method, ?int $start = null, ?int $end = null): array`
	`241`	`+ public function find(?string $ip, ?string $url, ?int $limit, ?string $method, ?int $start = null, ?int $end = null, ?string $statusCode = null, ?\Closure $filter = null): array`
`242`	`242`	`{`
`243`	`243`	`return [];`
`244`	`244`	`}`
`@@ -253,7 +253,7 @@ public function write(Profile $profile): bool`
`253`	`253`	`return true;`
`254`	`254`	`}`
`255`	`255`
`256`		`- public function purge()`
	`256`	`+ public function purge(): void`
`257`	`257`	`{`
`258`	`258`	`}`
`259`	`259`	`}`