Merge pull request #13 from Flowpack/remove-optimized-redis-cache-backend

TASK: Update to Neos 8, remove OptimizedRedisCacheBackend

Author: batabana

Classes/NodeRendering/Infrastructure/RedisContentCacheReader.php

@@ -10,7 +10,7 @@
 use Neos\Flow\Annotations as Flow;
 use Flowpack\DecoupledContentStore\Core\Infrastructure\RedisClientManager;
 use Neos\Fusion\Core\Cache\ContentCache;
-use Sandstorm\OptimizedRedisCacheBackend\OptimizedRedisCacheBackend;
+use Neos\Cache\Backend\RedisBackend;
 
 /**
  * @Flow\Scope("singleton")
@@ -49,8 +49,8 @@ public function tryToExtractRenderingForEnumeratedNodeFromContentCache(DocumentN
 
         $redis = null;
         $backend = $this->contentCache->getBackend();
-        if ($backend instanceof OptimizedRedisCacheBackend) {
-            $reflProp = new \ReflectionProperty(OptimizedRedisCacheBackend::class, 'redis');
+        if ($backend instanceof RedisBackend) {
+            $reflProp = new \ReflectionProperty(RedisBackend::class, 'redis');
             $reflProp->setAccessible(true);
             $redis = $reflProp->getValue($backend);
         } else {

Configuration/Testing/Behat/Caches.yaml

@@ -1,3 +1,3 @@
 Neos_Fusion_Content:
   frontend: Neos\Cache\Frontend\StringFrontend
-  backend: Sandstorm\OptimizedRedisCacheBackend\OptimizedRedisCacheBackend
+  backend: Neos\Cache\Backend\RedisBackend

Tests/Behavior/Features/Bootstrap/FeatureContext.php

@@ -3,6 +3,7 @@
 use Behat\Behat\Context\Context;
 use Behat\Gherkin\Node\PyStringNode;
 use Flowpack\DecoupledContentStore\ContentReleaseManager;
+use Flowpack\DecoupledContentStore\Core\ConcurrentBuildLockService;
 use Flowpack\DecoupledContentStore\Core\Domain\ValueObject\ContentReleaseIdentifier;
 use Flowpack\DecoupledContentStore\Core\Domain\ValueObject\PrunnerJobId;
 use Flowpack\DecoupledContentStore\Core\RedisKeyService;
@@ -40,7 +41,6 @@
 use Neos\Utility\Arrays;
 use Neos\Utility\ObjectAccess;
 use PHPUnit\Framework\Assert;
-use Psr\Log\Test\TestLogger;
 use Symfony\Component\Console\Output\BufferedOutput;
 use Symfony\Component\Yaml\Yaml;
 
@@ -153,6 +153,8 @@ public function iCreateAContentRelease($contentReleaseIdentifier)
         $prunnerJobId = PrunnerJobId::fromString("...");
         $logger = ContentReleaseLogger::fromSymfonyOutput($bufferedOutput, $contentReleaseIdentifier);
         $redisContentReleaseService->createContentRelease($contentReleaseIdentifier, $prunnerJobId, $logger);
+        $concurrentBuildLockService = $this->getObjectManager()->get(ConcurrentBuildLockService::class);
+        $concurrentBuildLockService->ensureAllOtherInProgressContentReleasesWillBeTerminated($contentReleaseIdentifier);
         echo $bufferedOutput->fetch();
     }
 
@@ -406,13 +408,8 @@ public function iFlushTheContentCacheDependingOnTheModifiedNodes()
     {
         $contentCacheFlusher = $this->getObjectManager()->get(ContentCacheFlusher::class);
 
-        $testLogger = new TestLogger();
-        ObjectAccess::setProperty($contentCacheFlusher, 'systemLogger', $testLogger, true);
         $contentCacheFlusher->shutdownObject();
         ObjectAccess::setProperty($contentCacheFlusher, 'tagsToFlush', [], true);
-        foreach ($testLogger->records as $record) {
-            echo $record['message'] . "\n";
-        }
     }
 
     /**

composer.json

@@ -3,11 +3,10 @@
   "type": "neos-package",
   "name": "flowpack/decoupledcontentstore",
   "require": {
-    "php": "^7.1 || ^8.0",
-    "neos/neos": "^7.0",
+    "php": "^8.0",
+    "neos/neos": "^8.0",
     "albertofem/rsync-lib": "~1.0",
-    "sandstorm/optimizedrediscachebackend": "^1.1.4",
-    "flowpack/prunner": "^0.2"
+    "flowpack/prunner": "*"
   },
   "autoload": {
     "psr-4": {