Merge pull request #13 from Flowpack/bugfix-cache-segment-aspect

BUGFIX: Allow ContentCacheSegmentAspect to fetch context variables in Neos 9

Author: Sebobo

Classes/Aspect/ContentCacheSegmentAspect.php

@@ -84,7 +84,6 @@ public function wrapEvaluateUncached(JoinPointInterface $joinPoint): mixed
             'renderTime' => round(($end - $start) * 1000, 2) . ' ms',
             'fusionPath' => $joinPoint->getMethodArgument('path'),
             'contextVariables' => array_keys($joinPoint->getMethodArgument('contextArray')),
-            ''
         ]);
     }
 
@@ -93,10 +92,18 @@ public function wrapUncachedSegment(JoinPointInterface $joinPoint): string
     {
         $segment = $joinPoint->getAdviceChain()->proceed($joinPoint);
 
+        if ($joinPoint->isMethodArgument('contextVariables')) {
+            // Neos 8.x
+            $contextVariables = $joinPoint->getMethodArgument('contextVariables');
+        } else {
+            // Neos 9.x
+            $contextVariables = $joinPoint->getMethodArgument('serializedContext');
+        }
+
         return $this->renderCacheInfoIntoSegment($segment, [
             'mode' => static::MODE_UNCACHED,
             'fusionPath' => $joinPoint->getMethodArgument('fusionPath'),
-            'contextVariables' => array_keys($joinPoint->getMethodArgument('contextVariables')),
+            'contextVariables' => array_keys($contextVariables),
         ]);
     }
 
@@ -105,13 +112,21 @@ public function wrapDynamicSegment(JoinPointInterface $joinPoint): string
     {
         $segment = $joinPoint->getAdviceChain()->proceed($joinPoint);
 
+        if ($joinPoint->isMethodArgument('contextVariables')) {
+            // Neos 8.x
+            $contextVariables = $joinPoint->getMethodArgument('contextVariables');
+        } else {
+            // Neos 9.x
+            $contextVariables = $joinPoint->getMethodArgument('serializedContext');
+        }
+
         return $this->renderCacheInfoIntoSegment($segment, [
             'mode' => static::MODE_DYNAMIC,
             'fusionPath' => $joinPoint->getMethodArgument('fusionPath'),
             'entryIdentifier' => $this->interceptedCacheEntryValues,
             'entryTags' => $joinPoint->getMethodArgument('tags'),
             'lifetime' => $joinPoint->getMethodArgument('lifetime'),
-            'contextVariables' => array_keys($joinPoint->getMethodArgument('contextVariables')),
+            'contextVariables' => array_keys($contextVariables),
             'entryDiscriminator' => $joinPoint->getMethodArgument('cacheDiscriminator'),
         ]);
     }