fix: cache headers

Author: soyuka

src/HttpCache/EventListener/AddHeadersListener.php

@@ -14,6 +14,8 @@
 namespace ApiPlatform\HttpCache\EventListener;
 
 use ApiPlatform\Core\Metadata\Resource\Factory\ResourceMetadataFactoryInterface;
+use ApiPlatform\Metadata\Resource\Factory\ResourceMetadataCollectionFactoryInterface;
+use ApiPlatform\Util\OperationRequestInitiatorTrait;
 use ApiPlatform\Util\RequestAttributesExtractor;
 use Symfony\Component\HttpKernel\Event\ResponseEvent;
 
@@ -26,6 +28,8 @@
  */
 final class AddHeadersListener
 {
+ use OperationRequestInitiatorTrait;
+
  private $etag;
  private $maxAge;
  private $sharedMaxAge;
@@ -35,7 +39,10 @@ final class AddHeadersListener
  private $staleWhileRevalidate;
  private $staleIfError;
 
- public function __construct(bool $etag = false, int $maxAge = null, int $sharedMaxAge = null, array $vary = null, bool $public = null, ResourceMetadataFactoryInterface $resourceMetadataFactory = null, int $staleWhileRevalidate = null, int $staleIfError = null)
+ /**
+ * @param ResourceMetadataFactoryInterface|ResourceMetadataCollectionFactoryInterface $resourceMetadataFactory
+ */
+ public function __construct(bool $etag = false, int $maxAge = null, int $sharedMaxAge = null, array $vary = null, bool $public = null, $resourceMetadataFactory = null, int $staleWhileRevalidate = null, int $staleIfError = null)
  {
  $this->etag = $etag;
  $this->maxAge = $maxAge;
@@ -65,13 +72,14 @@ public function onKernelResponse(ResponseEvent $event): void
  return;
  }
 
- $resourceCacheHeaders = [];
+ $operation = $this->initializeOperation($request);
+ $resourceCacheHeaders = $attributes['cache_headers'] ?? [];
 
- if ($this->resourceMetadataFactory) {
+ if ($this->resourceMetadataFactory instanceof ResourceMetadataFactoryInterface) {
  $resourceMetadata = $this->resourceMetadataFactory->create($attributes['resource_class']);
  $resourceCacheHeaders = $resourceMetadata->getOperationAttribute($attributes, 'cache_headers', [], true);
- } else {
- $resourceCacheHeaders = $attributes['cache_headers'] ?? [];
+ } elseif ($operation) {
+ $resourceCacheHeaders = $operation->getCacheHeaders();
  }
 
  if ($this->etag && !$response->getEtag()) {

src/Symfony/Bundle/Resources/config/http_cache.xml

@@ -11,7 +11,7 @@
  <argument>%api_platform.http_cache.shared_max_age%</argument>
  <argument>%api_platform.http_cache.vary%</argument>
  <argument>%api_platform.http_cache.public%</argument>
- <argument>null</argument>
+ <argument>api_platform.metadata.resource.metadata_collection_factory.retro_compatible</argument>
 
  <tag name="kernel.event_listener" event="kernel.response" method="onKernelResponse" priority="-1" />
  </service>