Adapt CacheInvalidation classes according to code review

Author: netwarex

src/SymfonyCache/CacheInvalidation.php

@@ -11,14 +11,21 @@
 
 namespace FOS\HttpCache\SymfonyCache;
 
+use Symfony\Component\HttpKernel\Kernel;
 use Symfony\Component\HttpKernel\HttpKernelInterface;
 
 use function class_alias;
 use function class_exists;
 
-if (! interface_exists(CacheInvalidation::class) && 
- class_exists('Symfony\Component\HttpKernel\Kernel') &&
- \Symfony\Component\HttpKernel\Kernel::MAJOR_VERSION >= 6) {
+if (interface_exists(CacheInvalidation::class)) {
+ return;
+}
+
+/*
+ * Symfony 6 introduced a BC break in the signature of the protected method HttpKernelInterface::fetch. 
+ * Load the correct interface to match the signature.
+ */
+if (class_exists(Kernel::class) && Kernel::MAJOR_VERSION >= 6) {
  // Load class for Symfony >=6.0
  class_alias(
  Compatibility\CacheInvalidationS6::class,

src/SymfonyCache/Compatibility/CacheInvalidationLegacy.php

@@ -18,6 +18,8 @@
 
 /**
  * Interface for a HttpCache that supports active cache invalidation.
+ * 
+ * Method signature of `fetch` and `getStore` compatible with Symfony 5 and older.
  */
 interface CacheInvalidationLegacy extends HttpKernelInterface
 {

src/SymfonyCache/Compatibility/CacheInvalidationS6.php

@@ -18,6 +18,8 @@
 
 /**
  * Interface for a HttpCache that supports active cache invalidation.
+ * 
+ * Method signature of `fetch` and `getStore` compatible with Symfony 6 or newer.
  */
 interface CacheInvalidationS6 extends HttpKernelInterface
 {