Merge pull request #19 from Flowpack/task/neos-7-8-compatibility

TASK: Stay compatible with Neos 7 + 8

Author: batabana

Classes/NodeRendering/Infrastructure/RedisContentCacheReader.php

@@ -6,11 +6,12 @@
 use Flowpack\DecoupledContentStore\NodeRendering\Dto\DocumentNodeCacheValues;
 use Flowpack\DecoupledContentStore\NodeRendering\Dto\RenderedDocumentFromContentCache;
 use Neos\Cache\Backend\AbstractBackend;
+use Neos\Cache\Backend\RedisBackend;
 use Neos\Cache\Frontend\StringFrontend;
 use Neos\Flow\Annotations as Flow;
-use Flowpack\DecoupledContentStore\Core\Infrastructure\RedisClientManager;
+use Neos\Flow\ObjectManagement\ObjectManagerInterface;
+use Neos\Flow\Package\PackageManager;
 use Neos\Fusion\Core\Cache\ContentCache;
-use Neos\Cache\Backend\RedisBackend;
 
 /**
  * @Flow\Scope("singleton")
@@ -20,15 +21,15 @@ class RedisContentCacheReader
 
     /**
      * @Flow\Inject
-     * @var RedisClientManager
+     * @var StringFrontend
      */
-    protected $redisClient;
+    protected $contentCache;
 
     /**
      * @Flow\Inject
-     * @var StringFrontend
+     * @var ObjectManagerInterface
      */
-    protected $contentCache;
+    protected $objectManager;
 
     /**
      * @Flow\InjectConfiguration(path="cache.applicationIdentifier", package="Neos.Flow")
@@ -47,14 +48,22 @@ public function tryToExtractRenderingForEnumeratedNodeFromContentCache(DocumentN
          */
         $identifierPrefix = md5($this->applicationIdentifier) . ':';
 
-        $redis = null;
+        $packageManager = $this->objectManager->get(PackageManager::class);
+        $flowPackage = $packageManager->getPackage('Neos.Flow');
+        preg_match('/^(\d+\.\d+)/', $flowPackage->getInstalledVersion(), $versionMatches);
+        $flowMajorVersion = (int)($versionMatches[1] ?? '0');
+
         $backend = $this->contentCache->getBackend();
-        if ($backend instanceof RedisBackend) {
+        if ($flowMajorVersion >= 8 && $backend instanceof RedisBackend) {
             $reflProp = new \ReflectionProperty(RedisBackend::class, 'redis');
             $reflProp->setAccessible(true);
             $redis = $reflProp->getValue($backend);
+        } elseif (get_class($backend) === 'Sandstorm\OptimizedRedisCacheBackend\OptimizedRedisCacheBackend') {
+            $reflProp = new \ReflectionProperty(\Sandstorm\OptimizedRedisCacheBackend\OptimizedRedisCacheBackend::class, 'redis');
+            $reflProp->setAccessible(true);
+            $redis = $reflProp->getValue($backend);
         } else {
-            throw new \RuntimeException('TODO: Cache backend must be OptimizedRedisCacheBackend.');
+            throw new \RuntimeException('The cache backend for "Neos_Fusion_Content" must be an OptimizedRedisCacheBackend, but is ' . get_class($backend), 1622570000);
         }
         $serializedCacheValues = $redis->get($documentNodeCacheKey->fullyQualifiedRedisKeyName($identifierPrefix));
         if ($serializedCacheValues === false) {

README.md

@@ -47,7 +47,7 @@ as the basis for orchestrating and executing a content release.
 ## Requirements
 
 - Redis
-- Sandstorm.OptimizedCacheBackend recommended
+- Sandstorm.OptimizedCacheBackend is required when this package is used with Neos 7.3 (Neos 8 already has an optimized Redis backend)
 - Prunner
 
 Start up prunner via the following command:

composer.json

@@ -3,11 +3,14 @@
   "type": "neos-package",
   "name": "flowpack/decoupledcontentstore",
   "require": {
-    "php": "^8.0",
-    "neos/neos": "^8.0",
+    "php": "^7.4 || ^8.0",
+    "neos/neos": "^7.3 || ^8.0",
     "albertofem/rsync-lib": "~1.0",
     "flowpack/prunner": "*"
   },
+  "suggest": {
+    "sandstorm/optimizedrediscachebackend": "This package is only needed when this package is being used with Neos 7.3"
+  },
   "autoload": {
     "psr-4": {
       "Flowpack\\DecoupledContentStore\\": "Classes/"