TASK: Adjust to interface changes from neos/neos-development-collecti…

…on#4425
sitegeist · Sep 8, 2023 · ff57f98 · ff57f98
1 parent 5b33c35
commit ff57f98
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 21 deletions.
diff --git a/Classes/Aspects/FusionCachingAspect.php b/Classes/Aspects/FusionCachingAspect.php
@@ -16,6 +16,7 @@
 use Neos\Flow\Annotations as Flow;
 use Neos\Flow\Aop\JoinPointInterface;
 use Neos\Cache\Frontend\VariableFrontend;
+use Neos\Fusion\Core\FusionConfiguration;
 
 /**
  * @Flow\Scope("singleton")
@@ -30,22 +31,26 @@ class FusionCachingAspect
     protected $fusionCache;
 
     /**
-     * @Flow\Around("setting(Sitegeist.Monocle.fusion.enableObjectTreeCache) && method(Sitegeist\Monocle\Fusion\FusionService->getMergedFusionObjectTreeForSitePackage())")
+     * @Flow\Around("setting(Sitegeist.Monocle.fusion.enableObjectTreeCache) && method(Sitegeist\Monocle\Fusion\FusionService->getFusionConfigurationForPackageKey())")
      * @param JoinPointInterface $joinPoint The current join point
      * @return mixed
      */
-    public function cacheGetMergedFusionObjectTree(JoinPointInterface $joinPoint)
+    public function cacheFusionConfigurationForPackageKey(JoinPointInterface $joinPoint)
     {
-        $siteResourcesPackageKey = $joinPoint->getMethodArgument('siteResourcesPackageKey');
-        $cacheIdentifier = str_replace('.', '_', $siteResourcesPackageKey);
+        $packageKey = $joinPoint->getMethodArgument('packageKey');
+        $cacheIdentifier = str_replace('.', '_', $packageKey);
 
         if ($this->fusionCache->has($cacheIdentifier)) {
-            $fusionObjectTree = $this->fusionCache->get($cacheIdentifier);
+            $fusionConfigurationArray = $this->fusionCache->get($cacheIdentifier);
+            $fusionConfiguration = FusionConfiguration::fromArray($fusionConfigurationArray);
         } else {
-            $fusionObjectTree = $joinPoint->getAdviceChain()->proceed($joinPoint);
-            $this->fusionCache->set($cacheIdentifier, $fusionObjectTree);
+            /**
+             * @var FusionConfiguration $fusionConfiguration
+             */
+            $fusionConfiguration = $joinPoint->getAdviceChain()->proceed($joinPoint);
+            $this->fusionCache->set($cacheIdentifier, $fusionConfiguration->toArray());
         }
 
-        return $fusionObjectTree;
+        return $fusionConfiguration;
     }
 }
diff --git a/Classes/Domain/Fusion/PrototypeRepository.php b/Classes/Domain/Fusion/PrototypeRepository.php
@@ -14,6 +14,7 @@
  */
 
 use Neos\Flow\Annotations as Flow;
+use Neos\Fusion\Core\FusionConfiguration;
 use Neos\Fusion\Core\Runtime as FusionRuntime;
 use Neos\Fusion\Core\RuntimeFactory as FusionRuntimeFactory;
 use Sitegeist\Monocle\Fusion\FusionService;
@@ -39,8 +40,8 @@ public function findOneByPrototypeNameInSitePackage(
         string $prototypeName,
         string $sitePackageKey
     ): ?Prototype {
-        $fusionObjectTree = $this->fusionService->getMergedFusionObjectTreeForSitePackage($sitePackageKey);
-
+        $fusionConfiguration = $this->fusionService->getFusionConfigurationForPackageKey($sitePackageKey);
+        $fusionObjectTree = $fusionConfiguration->toArray();
         if (isset($fusionObjectTree['__prototypes'][$prototypeName])) {
             $fusionAst =  $fusionObjectTree['__prototypes'][$prototypeName];
             $fusionRuntime = $this->fusionRuntimeFactory->create($fusionObjectTree);

diff --git a/Classes/Fusion/FusionService.php b/Classes/Fusion/FusionService.php
@@ -17,28 +17,41 @@
 use Neos\Flow\Package\PackageManager;
 use Neos\Fusion\Core\FusionConfiguration;
 use Neos\Fusion\Core\FusionSourceCodeCollection;
-use \Neos\Neos\Domain\Service\FusionService as NeosFusionService;
+use Neos\Fusion\Core\Parser;
+use Neos\Neos\Domain\Service\FusionSourceCodeFactory;
 
 /**
  * Class FusionService
  * @package Sitegeist\Monocle\Fusion
  */
-class FusionService extends NeosFusionService
+class FusionService
 {
     /**
      * @Flow\Inject
      * @var PackageManager
      */
     protected $packageManager;
 
+    /**
+     * @Flow\Inject
+     * @var Parser
+     */
+    protected $fusionParser;
+
+    /**
+     * @Flow\Inject
+     * @var FusionSourceCodeFactory
+     */
+    protected $fusionSourceCodeFactory;
+
     /**
      * Returns a merged fusion object tree in the context of the given site-package
      *
      * @param string $siteResourcesPackageKey
-     * @return array The merged object tree as of the given node
+     * @deprecated use getFusionConfigurationForPackageKey instead
      * @throws \Neos\Neos\Domain\Exception
      */
-    public function getMergedFusionObjectTreeForSitePackage($siteResourcesPackageKey)
+    public function getMergedFusionObjectTreeForSitePackage($siteResourcesPackageKey): array
     {
         return $this->getFusionConfigurationForPackageKey($siteResourcesPackageKey)->toArray();
     }
@@ -60,7 +73,7 @@ public function getFusionConfigurationForPackageKey(string $packageKey): FusionC
         $fusionCodeCollection = FusionSourceCodeCollection::tryFromFilePath('resource://Sitegeist.Monocle/Private/Fusion/Root.fusion');
 
         // use autoinclude for neos-site packages only as this is a neos specific behavior
-        if ($package->getComposerManifest('type') == 'neos-site') {
+        if ($package->getComposerManifest('type') === 'neos-site') {
             $fusionCodeCollection = $fusionCodeCollection->union(
                 $this->fusionSourceCodeFactory->createFromAutoIncludes()
             );
@@ -76,12 +89,13 @@ public function getFusionConfigurationForPackageKey(string $packageKey): FusionC
 
     /**
      * Get all styleguide objects for the given fusion-ast
-     *
-     * @param array $fusionAst
-     * @return array
      */
-    public function getStyleguideObjectsFromFusionAst($fusionAst)
+    public function getStyleguideObjectsFromFusionAst(array|FusionConfiguration $fusionAst): array
     {
+        if (is_object($fusionAst) && $fusionAst instanceof FusionConfiguration) {
+            $fusionAst = $fusionAst->toArray();
+        }
+
         $styleguideObjects = [];
         if ($fusionAst && $fusionAst['__prototypes']) {
             foreach ($fusionAst['__prototypes'] as $prototypeFullName => $prototypeObject) {

diff --git a/Classes/Fusion/FusionView.php b/Classes/Fusion/FusionView.php
@@ -14,6 +14,7 @@
  */
 
 use Neos\Flow\Annotations as Flow;
+use Neos\Fusion\Core\FusionConfiguration;
 use Neos\Fusion\View\FusionView as BaseFusionView;
 use Neos\Fusion\Core\Runtime as FusionRuntime;
 use Neos\Flow\I18n\Locale;
@@ -45,8 +46,15 @@ class FusionView extends BaseFusionView
      */
     protected function loadFusion()
     {
-        $fusionAst = $this->fusionService->getMergedFusionObjectTreeForSitePackage($this->getOption('packageKey'));
-        $this->parsedFusion = $fusionAst;
+        $parsedFusion = $this->fusionService->getFusionConfigurationForPackageKey($this->getOption('packageKey'));
+        /** @todo remove the switch after Neos 8 support is removed */
+        $r = new \ReflectionClass(static::class);
+        $parsedFusionType = $r->getProperty('parsedFusion')->getType();
+        if ($parsedFusionType?->getName() === FusionConfiguration::class) {
+            $this->parsedFusion = $parsedFusion;
+        } else {
+            $this->parsedFusion = $parsedFusion->toArray();
+        }
     }
 
     /**