Merge branch '6.4' into 7.1

* 6.4:
  fix merge
  fix merge

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 [];
     }
@@ -257,7 +257,7 @@ public function write(Profile $profile): bool
         return true;
     }
 
-    public function purge()
+    public function purge(): void
     {
     }
 }