MERGE: Merge branch '2.3' into 3.0

muensmedia · Sep 21, 2017 · fd90ff7 · fd90ff7
2 parents d0bd94c + 2071580
commit fd90ff7
Showing 1 changed file with 12 additions and 8 deletions.
diff --git a/Neos.ContentRepository/Resources/Private/Schema/NodeTypes.schema.yaml b/Neos.ContentRepository/Resources/Private/Schema/NodeTypes.schema.yaml
@@ -35,14 +35,18 @@ additionalProperties:
     'childNodes':
       type: dictionary
       additionalProperties:
-        type: [dictionary, 'null']
-        additionalProperties: FALSE
-        properties:
-          'type': { type: string, description: "Node Type of this child node." }
-          'position':
-            type: ['string', 'null']
-            description: "Position of this child node."
-          'constraints': *constraints
+        type:
+          -
+            type: 'null'
+          -
+            type: dictionary
+            additionalProperties: FALSE
+            properties:
+              'type': { type: string, description: "Node Type of this child node." }
+              'position':
+                type: ['string', 'null']
+                description: "Position of this child node."
+              'constraints': *constraints
 
     'properties':
       type: dictionary