From ab9e34020d83b526bfcea13c2517e8c4898478a6 Mon Sep 17 00:00:00 2001
From: Martin Ficzel <ficzel@sitegeist.de>
Date: Thu, 30 Jan 2020 08:55:22 +0100
Subject: [PATCH] BUGFIX: Add `Form` key to configuration schema of fusion
 package

When the package Neos.Fusion.Form is installed which it is by default since Neos 5.1 the key `Form` is
automatically created in the `Neos.Fusion` setting namespace. Since the schema for this namespace only
allows predefined key this yields an error message in the Configuration module.

In addition the schema file is renamed and shortened to only validate inside Neos.Fusion. That ensures that the file
is picked up by the command ./flow configuration:validate --type Settings. This will avoid things like this slipping trough
inf future.
---
 .../Schema/Settings.Neos.Fusion.schema.yaml   | 36 ++++++++++++++++
 Resources/Private/Schema/Settings.schema.yaml | 41 -------------------
 2 files changed, 36 insertions(+), 41 deletions(-)
 create mode 100644 Resources/Private/Schema/Settings.Neos.Fusion.schema.yaml
 delete mode 100644 Resources/Private/Schema/Settings.schema.yaml

diff --git a/Resources/Private/Schema/Settings.Neos.Fusion.schema.yaml b/Resources/Private/Schema/Settings.Neos.Fusion.schema.yaml
new file mode 100644
index 00000000..d5b52594
--- /dev/null
+++ b/Resources/Private/Schema/Settings.Neos.Fusion.schema.yaml
@@ -0,0 +1,36 @@
+type: dictionary
+additionalProperties: false
+properties:
+  rendering:
+    type: dictionary
+    additionalProperties: false
+    properties:
+      exceptionHandler:
+        type: string
+        format: class-name
+      innerExceptionHandler:
+        type: string
+        format: class-name
+  debugMode:
+    type: boolean
+  enableObjectTreeCache:
+    type: boolean
+  enableContentCache:
+    type: boolean
+  defaultContext:
+    type: dictionary
+    additionalProperties:
+      type:
+        - type: string
+          format: class-name
+        - type: string
+          pattern: '/^[a-zA-Z_\x80-\xff][a-zA-Z0-9_\x80-\xff\\]*::[a-zA-Z_\x7f-\xff]*$/u'
+  dsl:
+    type: dictionary
+    additionalProperties:
+      type: string
+      format: class-name
+  Afx:
+    type: dictionary
+  Form:
+    type: dictionary
diff --git a/Resources/Private/Schema/Settings.schema.yaml b/Resources/Private/Schema/Settings.schema.yaml
deleted file mode 100644
index 964c36c0..00000000
--- a/Resources/Private/Schema/Settings.schema.yaml
+++ /dev/null
@@ -1,41 +0,0 @@
-type: dictionary
-properties:
-  Neos:
-    type: dictionary
-    properties:
-      Fusion:
-        type: dictionary
-        additionalProperties: false
-        properties:
-          rendering:
-            type: dictionary
-            additionalProperties: false
-            properties:
-              exceptionHandler:
-                type: string
-                format: class-name
-              innerExceptionHandler:
-                type: string
-                format: class-name
-          debugMode:
-            type: boolean
-          enableObjectTreeCache:
-            type: boolean
-          enableContentCache:
-            type: boolean
-          defaultContext:
-            type: dictionary
-            additionalProperties:
-              type:
-                - type: string
-                  format: class-name
-                - type: string
-                  pattern: '/^[a-zA-Z_\x80-\xff][a-zA-Z0-9_\x80-\xff\\]*::[a-zA-Z_\x7f-\xff]*$/u'
-          dsl:
-            type: dictionary
-            additionalProperties:
-              type: string
-              format: class-name
-          Afx:
-            type: dictionary
-