Merge pull request #42 from bwaidelich/41-fix-43-compatibility

BUGFIX: Fix Neos 4.3 compatibility
neos · Apr 26, 2019 · 3a1c912 · 3a1c912
2 parents 5730117 + d490734
commit 3a1c912
Show file tree

Hide file tree

Showing 5 changed files with 49 additions and 7 deletions.
diff --git a/Classes/Fusion/Helper/NodeHelper.php b/Classes/Fusion/Helper/NodeHelper.php
@@ -0,0 +1,39 @@
+<?php
+namespace Neos\Form\Builder\Fusion\Helper;
+
+use Neos\ContentRepository\Domain\Model\NodeInterface;
+use Neos\Eel\ProtectedContextAwareInterface;
+
+/**
+ * Custom Eel Helper for node related functions
+ */
+class NodeHelper implements ProtectedContextAwareInterface
+{
+
+    /**
+     * Merge properties of the specified $node to the given $properties (with precedence to node properties)
+     *
+     * Note: This is required since NodeInterface::getProperties() does no longer return an array but an instance of PropertyCollectionInterface
+     *
+     * @param array $properties
+     * @param NodeInterface $node
+     * @return array
+     */
+    public function mergeProperties(array $properties, NodeInterface $node): array
+    {
+        $nodeProperties = $node->getProperties();
+        if ($nodeProperties instanceof \Traversable) {
+            $nodeProperties = iterator_to_array($nodeProperties);
+        }
+        return array_merge($properties, $nodeProperties);
+    }
+
+    /**
+     * @param string $methodName
+     * @return boolean
+     */
+    public function allowsCallOfMethod($methodName): bool
+    {
+        return true;
+    }
+}
diff --git a/Configuration/Settings.yaml b/Configuration/Settings.yaml
@@ -1,4 +1,7 @@
 Neos:
+  Fusion:
+    defaultContext:
+      Neos.Form.Builder.Node: 'Neos\Form\Builder\Fusion\Helper\NodeHelper'
   Neos:
     fusion:
       autoInclude:
@@ -34,4 +37,4 @@ Neos:
           collapsed: false
         'form.selectOptions':
           label: 'Select options'
-          collapsed: false
+          collapsed: false
diff --git a/Resources/Private/Fusion/NodeBased/NodeBasedFinisher.fusion b/Resources/Private/Fusion/NodeBased/NodeBasedFinisher.fusion
@@ -1,7 +1,7 @@
 prototype(Neos.Form.Builder:NodeBasedFinisher) < prototype(Neos.Fusion:Renderer) {
     element {
         @context.finisher = ${this}
-        [email protected] = ${Array.concat(value, finisherNode.properties)}
+        [email protected] = ${Neos.Form.Builder.Node.mergeProperties(value, finisherNode)}
     }
 }
 
@@ -23,4 +23,4 @@ prototype(Neos.Form.Builder:NodeBasedFinisherCollection) < prototype(Neos.Fusion
             }
         }
     }
-}
+}
diff --git a/Resources/Private/Fusion/NodeBased/NodeBasedFormElement.fusion b/Resources/Private/Fusion/NodeBased/NodeBasedFormElement.fusion
@@ -5,7 +5,7 @@ prototype(Neos.Form.Builder:NodeBasedFormElement) < prototype(Neos.Fusion:Render
         label = ${elementNode.properties.label}
         required = ${elementNode.properties.required}
         defaultValue = ${elementNode.properties.defaultValue}
-        [email protected] = ${Array.concat(value, elementNode.properties)}
+        [email protected] = ${Neos.Form.Builder.Node.mergeProperties(value, elementNode)}
         validators = Neos.Form.Builder:NodeBasedValidatorCollection {
             collection = ${q(elementNode).children('validators').children()}
         }
@@ -43,4 +43,4 @@ prototype(Neos.Form.Builder:NodeBasedElementCollection) < prototype(Neos.Fusion:
             }
         }
     }
-}
+}
diff --git a/Resources/Private/Fusion/NodeBased/NodeBasedValidator.fusion b/Resources/Private/Fusion/NodeBased/NodeBasedValidator.fusion
@@ -1,7 +1,7 @@
 prototype(Neos.Form.Builder:NodeBasedValidator) < prototype(Neos.Fusion:Renderer) {
     element {
         @context.validator = ${this}
-        [email protected] = ${Array.concat(value, validatorNode.properties)}
+        [email protected] = ${Neos.Form.Builder.Node.mergeProperties(value, validatorNode)}
     }
 }
 
@@ -23,4 +23,4 @@ prototype(Neos.Form.Builder:NodeBasedValidatorCollection) < prototype(Neos.Fusio
             }
         }
     }
-}
+}