IBX-11826: Cleaned up http-cache ResponseTagger deprecations

src/contracts/ResponseTagger/ResponseTagger.php

@@ -13,6 +13,11 @@
  */
 interface ResponseTagger
 {
+    /**
+     * Checks if a value is supported by the tagger.
+     */
+    public function supports(mixed $value): bool;
+
     /**
      * Extracts tags from a value.
      *

src/lib/ResponseTagger/Delegator/ContentValueViewTagger.php

@@ -11,9 +11,8 @@
 use Ibexa\Contracts\Core\Repository\Values\Content\Content;
 use Ibexa\Contracts\HttpCache\ResponseTagger\ResponseTagger;
 use Ibexa\Core\MVC\Symfony\View\ContentValueView;
-use Ibexa\HttpCache\ResponseTagger\Value\AbstractValueTagger;
 
-class ContentValueViewTagger extends AbstractValueTagger
+class ContentValueViewTagger implements ResponseTagger
 {
     public function __construct(private readonly ResponseTagger $contentInfoTagger)
     {

src/lib/ResponseTagger/Delegator/DispatcherTagger.php

@@ -21,20 +21,15 @@ public function __construct(private iterable $taggers = [])
     {
     }
 
+    public function supports(mixed $value): bool
+    {
+        return true;
+    }
+
     public function tag(mixed $value): void
     {
         foreach ($this->taggers as $tagger) {
-            if (method_exists($tagger, 'supports')) {
-                if ($tagger->supports($value)) {
-                    $tagger->tag($value);
-                }
-            } else {
-                trigger_deprecation(
-                    'ibexa/http-cache',
-                    '5.0.7',
-                    '%s does not implement supports(). This will be required in 6.0, supports() will be a part of ResponseTagger interface',
-                    get_debug_type($tagger),
-                );
+            if ($tagger->supports($value)) {
                 $tagger->tag($value);
             }
         }

src/lib/ResponseTagger/Delegator/LocationValueViewTagger.php

@@ -11,9 +11,8 @@
 use Ibexa\Contracts\Core\Repository\Values\Content\Location;
 use Ibexa\Contracts\HttpCache\ResponseTagger\ResponseTagger;
 use Ibexa\Core\MVC\Symfony\View\LocationValueView;
-use Ibexa\HttpCache\ResponseTagger\Value\AbstractValueTagger;
 
-class LocationValueViewTagger extends AbstractValueTagger
+class LocationValueViewTagger implements ResponseTagger
 {
     public function __construct(private readonly ResponseTagger $locationTagger)
     {

src/lib/ResponseTagger/Value/ContentInfoTagger.php

@@ -8,14 +8,20 @@
 
 namespace Ibexa\HttpCache\ResponseTagger\Value;
 
+use FOS\HttpCache\ResponseTagger as FosResponseTagger;
 use Ibexa\Contracts\Core\Repository\Values\Content\ContentInfo;
 use Ibexa\Contracts\HttpCache\Handler\ContentTagInterface;
+use Ibexa\Contracts\HttpCache\ResponseTagger\ResponseTagger;
 
 /**
  * @final
  */
-class ContentInfoTagger extends AbstractValueTagger
+class ContentInfoTagger implements ResponseTagger
 {
+    public function __construct(private readonly FosResponseTagger $responseTagger)
+    {
+    }
+
     public function supports(mixed $value): bool
     {
         return $value instanceof ContentInfo;

src/lib/ResponseTagger/Value/LocationTagger.php

@@ -8,14 +8,20 @@
 
 namespace Ibexa\HttpCache\ResponseTagger\Value;
 
+use FOS\HttpCache\ResponseTagger as FosResponseTagger;
 use Ibexa\Contracts\Core\Repository\Values\Content\Location;
 use Ibexa\Contracts\HttpCache\Handler\ContentTagInterface;
+use Ibexa\Contracts\HttpCache\ResponseTagger\ResponseTagger;
 
 /**
  * @final
  */
-class LocationTagger extends AbstractValueTagger
+class LocationTagger implements ResponseTagger
 {
+    public function __construct(private readonly FosResponseTagger $responseTagger)
+    {
+    }
+
     public function supports(mixed $value): bool
     {
         return $value instanceof Location;

tests/lib/ResponseTagger/Delegator/DispatcherTaggerTest.php

@@ -82,7 +82,7 @@ public function testDoesNotCallTagWhenNoTaggerSupportsTheValue(): void
         $dispatcher->tag($location);
     }
 
-    public function testCustomResponseTaggerImplementationLackingSupportsMethodShouldTag(): void
+    public function testCallsCustomResponseTaggerWhenItSupportsTheValue(): void
     {
         $foo = new stdClass();
 
@@ -103,6 +103,11 @@ public function __construct(private bool &$wasCalled)
             {
             }
 
+            public function supports(mixed $value): bool
+            {
+                return true;
+            }
+
             public function tag(mixed $value): void
             {
                 $this->wasCalled = true;
@@ -111,23 +116,8 @@ public function tag(mixed $value): void
 
         $dispatcher = new DispatcherTagger([$contentInfoTagger, $customTagger]);
 
-        $deprecation = null;
-        set_error_handler(static function (int $errorCode, string $errorString) use (&$deprecation): bool {
-            if ($errorCode === E_USER_DEPRECATED) {
-                $deprecation = $errorString;
-            }
-
-            return true;
-        });
-
-        try {
-            $dispatcher->tag($foo);
-        } finally {
-            restore_error_handler();
-        }
-
+        $dispatcher->tag($foo);
         self::assertTrue($wasCalled, 'Custom ResponseTagger::tag() was not called by the dispatcher.');
-        self::assertStringContainsString('does not implement supports()', $deprecation);
     }
 
     public function testToStringWithNoTaggers(): void