From 5258a318b82ea6aa08cbddb5b658a278c722af8e Mon Sep 17 00:00:00 2001 From: Andrew Longosz Date: Mon, 12 May 2025 14:56:23 +0200 Subject: [PATCH 1/2] Dropped an obsolete interfaces list announced by abstract Varnish class Interfaces are already announced in '\FOS\HttpCache\ProxyClient\Varnish' --- src/lib/ProxyClient/Varnish.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/ProxyClient/Varnish.php b/src/lib/ProxyClient/Varnish.php index 47657dc..0dbb3e3 100644 --- a/src/lib/ProxyClient/Varnish.php +++ b/src/lib/ProxyClient/Varnish.php @@ -19,7 +19,7 @@ use Psr\Http\Message\RequestFactoryInterface; use Psr\Http\Message\UriInterface; -final class Varnish extends FosVarnish implements BanCapable, PurgeCapable, RefreshCapable, TagCapable +final class Varnish extends FosVarnish { private ConfigResolverInterface $configResolver; From 88a26727c87990cca3982c38034a00d62543af27 Mon Sep 17 00:00:00 2001 From: Andrew Longosz Date: Mon, 12 May 2025 14:58:44 +0200 Subject: [PATCH 2/2] Fixed Varnish::queueRequest implementation after SF 7 upgrade --- src/lib/ProxyClient/Varnish.php | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/lib/ProxyClient/Varnish.php b/src/lib/ProxyClient/Varnish.php index 0dbb3e3..18c04c2 100644 --- a/src/lib/ProxyClient/Varnish.php +++ b/src/lib/ProxyClient/Varnish.php @@ -9,10 +9,6 @@ namespace Ibexa\HttpCache\ProxyClient; use FOS\HttpCache\ProxyClient\Dispatcher; -use FOS\HttpCache\ProxyClient\Invalidation\BanCapable; -use FOS\HttpCache\ProxyClient\Invalidation\PurgeCapable; -use FOS\HttpCache\ProxyClient\Invalidation\RefreshCapable; -use FOS\HttpCache\ProxyClient\Invalidation\TagCapable; use FOS\HttpCache\ProxyClient\Varnish as FosVarnish; use Ibexa\Bundle\HttpCache\Controller\InvalidateTokenController; use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface; @@ -59,6 +55,6 @@ protected function queueRequest( bool $validateHost = true, $body = null ): void { - parent::queueRequest($method, $url, $this->fetchAndMergeAuthHeaders($headers), body: $body); + parent::queueRequest($method, $url, $this->fetchAndMergeAuthHeaders($headers), $validateHost, $body); } }