From c4f3701ed23af283ed80b6d3668051f92a1eab34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Fromme?= <fromme@dreipunktnull.com>
Date: Thu, 14 May 2020 11:29:41 +0200
Subject: [PATCH] Apply patch to fix form-editor issue

---
 composer.json        |   8 ++
 composer.lock        |  49 ++++++-
 patches/54471d5.diff | 333 +++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 388 insertions(+), 2 deletions(-)
 create mode 100644 patches/54471d5.diff

diff --git a/composer.json b/composer.json
index ddf8db20..d612573b 100644
--- a/composer.json
+++ b/composer.json
@@ -14,6 +14,7 @@
     "ext-pdo": "*",
     "ext-simplexml": "*",
     "christophlehmann/imageoptimizer": "^2.0",
+    "cweagans/composer-patches": "^1.6",
     "fab/media": "^5.0",
     "fab/vidi": "^3.2",
     "fluidtypo3/vhs": "^5.2",
@@ -92,5 +93,12 @@
     "platform": {
       "php": "7.3.10"
     }
+  },
+  "extra": {
+    "patches": {
+      "typo3/cms-form": {
+        "Fix form finisher handling": "patches/54471d5.diff"
+      }
+    }
   }
 }
diff --git a/composer.lock b/composer.lock
index 3439ba8f..427d9e67 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "9e1be2cab97408fbcbe09fa4a4286a55",
+    "content-hash": "11f56c210e3ec1f453a60223e59d17fe",
     "packages": [
         {
             "name": "christophlehmann/imageoptimizer",
@@ -98,6 +98,50 @@
             ],
             "time": "2014-05-19T10:25:02+00:00"
         },
+        {
+            "name": "cweagans/composer-patches",
+            "version": "1.6.7",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/cweagans/composer-patches.git",
+                "reference": "2e6f72a2ad8d59cd7e2b729f218bf42adb14f590"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/cweagans/composer-patches/zipball/2e6f72a2ad8d59cd7e2b729f218bf42adb14f590",
+                "reference": "2e6f72a2ad8d59cd7e2b729f218bf42adb14f590",
+                "shasum": ""
+            },
+            "require": {
+                "composer-plugin-api": "^1.0",
+                "php": ">=5.3.0"
+            },
+            "require-dev": {
+                "composer/composer": "~1.0",
+                "phpunit/phpunit": "~4.6"
+            },
+            "type": "composer-plugin",
+            "extra": {
+                "class": "cweagans\\Composer\\Patches"
+            },
+            "autoload": {
+                "psr-4": {
+                    "cweagans\\Composer\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Cameron Eagans",
+                    "email": "me@cweagans.net"
+                }
+            ],
+            "description": "Provides a way to patch Composer packages.",
+            "time": "2019-08-29T20:11:49+00:00"
+        },
         {
             "name": "doctrine/annotations",
             "version": "1.10.2",
@@ -5063,7 +5107,8 @@
                         "partOfFactoryDefault": true
                     },
                     "extension-key": "form"
-                }
+                },
+                "patches_applied": []
             },
             "autoload": {
                 "psr-4": {
diff --git a/patches/54471d5.diff b/patches/54471d5.diff
new file mode 100644
index 00000000..e4bb6b08
--- /dev/null
+++ b/patches/54471d5.diff
@@ -0,0 +1,333 @@
+From 54471d5187a952c55d41d5b9399b433e6c725f73 Mon Sep 17 00:00:00 2001
+From: Oliver Hader <oliver@typo3.org>
+Date: Tue, 12 May 2020 22:11:27 +0200
+Subject: [PATCH] [BUGFIX] Use correctly terminated HTML block elements
+
+Using `<div />` as template to be used in jQuery worked previously,
+but is not supported with jQuery 3.5.x anymore. Occurences are now
+using correct expanded tags like `<div></div>`.
+
+Resolves: #91367
+Releases: master, 9.5
+Change-Id: I088481e607b4621e28550f79f065496c89b409d1
+---
+
+diff --git a/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/CheckboxEditor.html b/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/CheckboxEditor.html
+index 45566d1..746833e 100644
+--- a/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/CheckboxEditor.html
++++ b/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/CheckboxEditor.html
+@@ -2,12 +2,12 @@
+ <div class="form-editor">
+     <div class="t3-form-control-group form-group">
+         <label data-random-id data-random-id-attribute="for" data-random-id-number="1">
+-            <span data-template-property="label" />
++            <span data-template-property="label"></span>
+             <div class="t3-form-controls" data-identifier="inspectorEditorControlsWrapper">
+                 <input data-random-id data-random-id-attribute="id" data-random-id-number="1" type="checkbox" />
+             </div>
+         </label>
+-        <span class="inspector-editor-hint" data-template-property="fieldExplanationText" />
++        <span class="inspector-editor-hint" data-template-property="fieldExplanationText"></span>
+     </div>
+ </div>
+ </html>
+diff --git a/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/CollectionElementHeaderEditor.html b/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/CollectionElementHeaderEditor.html
+index 579e647..799be42 100644
+--- a/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/CollectionElementHeaderEditor.html
++++ b/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/CollectionElementHeaderEditor.html
+@@ -1,7 +1,7 @@
+ <html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" xmlns:formvh="http://typo3.org/ns/TYPO3/CMS/Form/ViewHelpers" data-namespace-typo3-fluid="true">
+ <div class="t3-form-validator-editor">
+     <h4 data-template-property="header-label">
+-        <span data-template-property="label" />
++        <span data-template-property="label"></span>
+     </h4>
+ </div>
+ </html>
+diff --git a/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/FinishersEditor.html b/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/FinishersEditor.html
+index 5584791..c375a6e 100644
+--- a/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/FinishersEditor.html
++++ b/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/FinishersEditor.html
+@@ -2,10 +2,10 @@
+ <div class="form-editor">
+     <div class="t3-form-control-group form-group">
+         <label data-random-id data-random-id-attribute="for" data-random-id-number="1">
+-            <span data-template-property="label" />
++            <span data-template-property="label"></span>
+         </label>
+         <div id="t3-form-add-finisher" class="t3-form-add-collection-element">
+-            <select data-random-id data-random-id-attribute="id" data-random-id-number="1" data-template-property="selectOptions" class="form-control" />
++            <select data-random-id data-random-id-attribute="id" data-random-id-number="1" data-template-property="selectOptions" class="form-control"></select>
+         </div>
+     </div>
+ </div>
+diff --git a/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/GridColumnViewPortConfigurationEditor.html b/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/GridColumnViewPortConfigurationEditor.html
+index 13e34e1..10d35f6 100644
+--- a/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/GridColumnViewPortConfigurationEditor.html
++++ b/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/GridColumnViewPortConfigurationEditor.html
+@@ -1,17 +1,17 @@
+ <html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" xmlns:formvh="http://typo3.org/ns/TYPO3/CMS/Form/ViewHelpers" data-namespace-typo3-fluid="true">
+ <div class="form-editor">
+     <div class="t3-form-control-group form-group" data-identifier="editorWrapper">
+-        <label data-random-id data-random-id-attribute="for" data-random-id-number="1"><span data-template-property="label" /></label><br>
++        <label data-random-id data-random-id-attribute="for" data-random-id-number="1"><span data-template-property="label"></span></label><br>
+         <div class="t3-form-controls btn-group" data-identifier="inspectorEditorControlsWrapper">
+             <button type="button" class="btn btn-default" data-identifier="viewportButton"></button>
+         </div>
+     </div>
+     <div class="t3-form-control-group form-group" data-template-property="numbersOfColumnsToUse">
+-        <label data-random-id data-random-id-attribute="for" data-random-id-number="1"><span data-template-property="numbersOfColumnsToUse-label" /></label>
++        <label data-random-id data-random-id-attribute="for" data-random-id-number="1"><span data-template-property="numbersOfColumnsToUse-label"></span></label>
+         <div class="t3-form-controls" data-identifier="numbersOfColumnsToUse-inspectorEditorControlsWrapper">
+             <input data-random-id data-random-id-attribute="id" data-random-id-number="1" type="number" value="" data-template-property="numbersOfColumnsToUse-propertyPath" class="form-control">
+         </div>
+-        <span data-template-property="numbersOfColumnsToUse-fieldExplanationText" />
++        <span data-template-property="numbersOfColumnsToUse-fieldExplanationText"></span>
+     </div>
+ </div>
+ </html>
+diff --git a/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/MaximumFileSizeEditor.html b/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/MaximumFileSizeEditor.html
+index 972e210..4f43b86 100644
+--- a/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/MaximumFileSizeEditor.html
++++ b/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/MaximumFileSizeEditor.html
+@@ -5,7 +5,7 @@
+ <f:if condition="{formvh:be.maximumFileSize()} > 0">
+     <div class="t3-form-validator-editor">
+         <div data-template-property="header-label" class="t3-form-control-group">
+-            <span data-template-property="label" data-maximumFileSize="{formvh:be.maximumFileSize()}" class="inspector-editor-hint" />
++            <span data-template-property="label" data-maximumFileSize="{formvh:be.maximumFileSize()}" class="inspector-editor-hint"></span>
+         </div>
+     </div>
+ </f:if>
+diff --git a/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/MultiSelectEditor.html b/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/MultiSelectEditor.html
+index 6f00359..031ffc6 100644
+--- a/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/MultiSelectEditor.html
++++ b/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/MultiSelectEditor.html
+@@ -1,8 +1,8 @@
+ <html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" xmlns:formvh="http://typo3.org/ns/TYPO3/CMS/Form/ViewHelpers" data-namespace-typo3-fluid="true">
+ <div class="t3-form-control-group form-group">
+-    <label data-random-id data-random-id-attribute="for" data-random-id-number="1"><span data-template-property="label" /></label>
++    <label data-random-id data-random-id-attribute="for" data-random-id-number="1"><span data-template-property="label"></span></label>
+     <div class="t3-form-controls" data-identifier="inspectorEditorControlsWrapper">
+-        <select data-random-id data-random-id-attribute="id" data-random-id-number="1" data-template-property="selectOptions" class="form-control" multiple="multiple" />
++        <select data-random-id data-random-id-attribute="id" data-random-id-number="1" data-template-property="selectOptions" class="form-control" multiple="multiple"></select>
+     </div>
+ </div>
+ </html>
+diff --git a/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/PropertyGridEditor.html b/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/PropertyGridEditor.html
+index 355a9e1..ee99f7e 100644
+--- a/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/PropertyGridEditor.html
++++ b/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/PropertyGridEditor.html
+@@ -1,7 +1,7 @@
+ <html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" xmlns:formvh="http://typo3.org/ns/TYPO3/CMS/Form/ViewHelpers" data-namespace-typo3-fluid="true">
+ <div class="form-editor">
+     <div class="t3-form-control-group form-group property-grid">
+-        <label data-random-id data-random-id-attribute="for" data-random-id-number="1"><span data-template-property="label" /></label>
++        <label data-random-id data-random-id-attribute="for" data-random-id-number="1"><span data-template-property="label"></span></label>
+         <div data-editor="new-property-grid" data-template-property="newPropertyPath">
+             <table class="table table-hover" data-identifier="propertyGridContainer">
+                 <thead>
+@@ -39,9 +39,9 @@
+                 </tbody>
+             </table>
+         </div>
+-        <div data-editor="property-grid" data-template-property="propertyPath" class="t3-form-grid" />
+-        <span class="inspector-editor-hint" data-template-property="fieldExplanationText" />
+-        <span data-template-property="validationErrors" />
++        <div data-editor="property-grid" data-template-property="propertyPath" class="t3-form-grid"></div>
++        <span class="inspector-editor-hint" data-template-property="fieldExplanationText"></span>
++        <span data-template-property="validationErrors"></span>
+     </div>
+ </div>
+ </html>
+diff --git a/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/RequiredValidatorEditor.html b/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/RequiredValidatorEditor.html
+index 31a2d16..aca4e01 100644
+--- a/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/RequiredValidatorEditor.html
++++ b/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/RequiredValidatorEditor.html
+@@ -2,18 +2,18 @@
+ <div class="form-editor">
+     <div class="t3-form-control-group form-group" data-identifier="editorWrapper">
+         <label data-random-id data-random-id-attribute="for" data-random-id-number="1">
+-            <span data-template-property="label" />
++            <span data-template-property="label"></span>
+             <div class="t3-form-controls" data-identifier="inspectorEditorControlsWrapper">
+                 <input data-random-id data-random-id-attribute="id" data-random-id-number="1" type="checkbox" />
+             </div>
+         </label>
+     </div>
+     <div class="t3-form-control-group form-group" data-template-property="validationErrorMessage">
+-        <label data-random-id data-random-id-attribute="for" data-random-id-number="2"><span data-template-property="validationErrorMessage-label" /></label>
++        <label data-random-id data-random-id-attribute="for" data-random-id-number="2"><span data-template-property="validationErrorMessage-label"></span></label>
+         <div class="t3-form-controls" data-identifier="inspectorEditorControlsWrapper">
+             <input data-random-id data-random-id-attribute="id" data-random-id-number="2" type="text" value="" data-template-property="validationErrorMessage-propertyPath" class="form-control">
+         </div>
+-        <span data-template-property="validationErrorMessage-fieldExplanationText" class="inspector-editor-hint" />
++        <span data-template-property="validationErrorMessage-fieldExplanationText" class="inspector-editor-hint"></span>
+     </div>
+ </div>
+ </html>
+diff --git a/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/SingleSelectEditor.html b/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/SingleSelectEditor.html
+index 78bfc16..b4fcb59 100644
+--- a/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/SingleSelectEditor.html
++++ b/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/SingleSelectEditor.html
+@@ -1,8 +1,8 @@
+ <html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" xmlns:formvh="http://typo3.org/ns/TYPO3/CMS/Form/ViewHelpers" data-namespace-typo3-fluid="true">
+ <div class="t3-form-control-group form-group">
+-    <label data-random-id data-random-id-attribute="for" data-random-id-number="1"><span data-template-property="label" /></label>
++    <label data-random-id data-random-id-attribute="for" data-random-id-number="1"><span data-template-property="label"></span></label>
+     <div class="t3-form-controls" data-identifier="inspectorEditorControlsWrapper">
+-        <select data-random-id data-random-id-attribute="id" data-random-id-number="1" data-template-property="selectOptions" class="form-control" />
++        <select data-random-id data-random-id-attribute="id" data-random-id-number="1" data-template-property="selectOptions" class="form-control"></select>
+     </div>
+ </div>
+ </html>
+diff --git a/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/TextEditor.html b/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/TextEditor.html
+index 791bdba..c1288ee 100644
+--- a/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/TextEditor.html
++++ b/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/TextEditor.html
+@@ -1,7 +1,7 @@
+ <html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" xmlns:formvh="http://typo3.org/ns/TYPO3/CMS/Form/ViewHelpers" data-namespace-typo3-fluid="true">
+ <div class="form-editor">
+     <div class="t3-form-control-group form-group">
+-        <label data-random-id data-random-id-attribute="for" data-random-id-number="1"><span data-template-property="label" /></label>
++        <label data-random-id data-random-id-attribute="for" data-random-id-number="1"><span data-template-property="label"></span></label>
+         <div class="input-group" data-identifier="inspectorEditorControlsGroup">
+             <div class="t3-form-controls" data-identifier="inspectorEditorControlsWrapper">
+                 <input data-random-id data-random-id-attribute="id" data-random-id-number="1" type="text" value="" data-template-property="propertyPath" class="form-control">
+@@ -17,8 +17,8 @@
+                 </span>
+             </span>
+         </div>
+-        <span class="inspector-editor-hint" data-template-property="fieldExplanationText" />
+-        <span data-template-property="validationErrors" />
++        <span class="inspector-editor-hint" data-template-property="fieldExplanationText"></span>
++        <span data-template-property="validationErrors"></span>
+     </div>
+ </div>
+ </html>
+diff --git a/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/TextareaEditor.html b/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/TextareaEditor.html
+index 070c38e..1ea6c54 100644
+--- a/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/TextareaEditor.html
++++ b/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/TextareaEditor.html
+@@ -1,11 +1,11 @@
+ <html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" xmlns:formvh="http://typo3.org/ns/TYPO3/CMS/Form/ViewHelpers" data-namespace-typo3-fluid="true">
+ <div class="form-editor">
+     <div class="t3-form-control-group form-group">
+-        <label data-random-id data-random-id-attribute="for" data-random-id-number="1"><span data-template-property="label" /></label>
++        <label data-random-id data-random-id-attribute="for" data-random-id-number="1"><span data-template-property="label"></span></label>
+         <div class="t3-form-controls" data-identifier="inspectorEditorControlsWrapper">
+-            <textarea data-random-id data-random-id-attribute="id" data-random-id-number="1" data-template-property="propertyPath" class="form-control" />
++            <textarea data-random-id data-random-id-attribute="id" data-random-id-number="1" data-template-property="propertyPath" class="form-control"></textarea>
+         </div>
+-        <span class="inspector-editor-hint" data-template-property="fieldExplanationText" />
++        <span class="inspector-editor-hint" data-template-property="fieldExplanationText"></span>
+     </div>
+ </div>
+ </html>
+diff --git a/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/Typo3WinBrowserEditor.html b/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/Typo3WinBrowserEditor.html
+index e2deef3..5f74057 100644
+--- a/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/Typo3WinBrowserEditor.html
++++ b/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/Typo3WinBrowserEditor.html
+@@ -1,18 +1,18 @@
+ <html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" xmlns:formvh="http://typo3.org/ns/TYPO3/CMS/Form/ViewHelpers" data-namespace-typo3-fluid="true">
+ <div class="form-editor">
+     <div class="t3-form-control-group form-group">
+-        <label data-random-id data-random-id-attribute="for" data-random-id-number="1"><span data-template-property="label" /></label>
++        <label data-random-id data-random-id-attribute="for" data-random-id-number="1"><span data-template-property="label"></span></label>
+         <div class="t3-form-controls" data-identifier="inspectorEditorControlsWrapper">
+             <input data-random-id data-random-id-attribute="id" data-random-id-number="1" type="text" value="" data-template-property="propertyPath" class="form-control" data-insert-target="">
+             <div class="help-block">
+                 <a href="#" data-template-property="onclick" class="btn btn-default">
+                     <span class="t3js-icon icon icon-size-small icon-state-default icon-mimetypes-x-content-text" data-identifier="mimetypes-x-content-text">
+-                        <span class="icon-markup" data-template-property="image" />
+-                    </span> <span data-template-property="buttonLabel" />
++                        <span class="icon-markup" data-template-property="image"></span>
++                    </span> <span data-template-property="buttonLabel"></span>
+                 </a>
+             </div>
+-            <span class="inspector-editor-hint" data-template-property="fieldExplanationText" />
+-            <span data-template-property="validationErrors" />
++            <span class="inspector-editor-hint" data-template-property="fieldExplanationText"></span>
++            <span data-template-property="validationErrors"></span>
+         </div>
+     </div>
+ </div>
+diff --git a/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/ValidationErrorMessageEditor.html b/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/ValidationErrorMessageEditor.html
+index 92af367..170d318 100644
+--- a/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/ValidationErrorMessageEditor.html
++++ b/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/ValidationErrorMessageEditor.html
+@@ -1,13 +1,13 @@
+ <html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" xmlns:formvh="http://typo3.org/ns/TYPO3/CMS/Form/ViewHelpers" data-namespace-typo3-fluid="true">
+ <div class="form-editor">
+     <div class="t3-form-control-group form-group">
+-        <label data-random-id data-random-id-attribute="for" data-random-id-number="1"><span data-template-property="label" /></label>
++        <label data-random-id data-random-id-attribute="for" data-random-id-number="1"><span data-template-property="label"></span></label>
+         <div data-identifier="inspectorEditorControlsGroup">
+             <div class="t3-form-controls" data-identifier="inspectorEditorControlsWrapper">
+                 <input data-random-id data-random-id-attribute="id" data-random-id-number="1" type="text" value="" data-template-property="propertyPath" class="form-control">
+             </div>
+         </div>
+-        <span class="inspector-editor-hint" data-template-property="fieldExplanationText" />
++        <span class="inspector-editor-hint" data-template-property="fieldExplanationText"></span>
+     </div>
+ </div>
+ </html>
+diff --git a/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/ValidatorsEditor.html b/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/ValidatorsEditor.html
+index 67c2012..606bd3c 100644
+--- a/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/ValidatorsEditor.html
++++ b/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Inspector/ValidatorsEditor.html
+@@ -2,10 +2,10 @@
+ <div class="form-editor">
+     <div class="t3-form-control-group form-group">
+         <label data-random-id data-random-id-attribute="for" data-random-id-number="1">
+-            <span data-template-property="label" />
++            <span data-template-property="label"></span>
+         </label>
+         <div id="t3-form-add-validator" class="t3-form-add-collection-element" data-template-property="selectOptionsContainer">
+-            <select data-random-id data-random-id-attribute="id" data-random-id-number="1" data-template-property="selectOptions" class="form-control" />
++            <select data-random-id data-random-id-attribute="id" data-random-id-number="1" data-template-property="selectOptions" class="form-control"></select>
+         </div>
+     </div>
+ </div>
+diff --git a/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Stage/ContentElement.html b/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Stage/ContentElement.html
+index 188e8f3..0452a00 100644
+--- a/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Stage/ContentElement.html
++++ b/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Stage/ContentElement.html
+@@ -14,7 +14,7 @@
+             </div>
+         </div>
+         <div class="element-content">
+-            <div data-template-property="properties.contentElementUid" />
++            <div data-template-property="properties.contentElementUid"></div>
+         </div>
+     </div>
+     <div class="t3-form-validator-info" data-identifier="validators">
+diff --git a/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Stage/FileUploadTemplate.html b/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Stage/FileUploadTemplate.html
+index 36064f4..0936a78 100644
+--- a/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Stage/FileUploadTemplate.html
++++ b/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Stage/FileUploadTemplate.html
+@@ -14,9 +14,9 @@
+             </div>
+         </div>
+         <div class="element-content">
+-            <div data-template-property="properties.saveToFileMount" />
++            <div data-template-property="properties.saveToFileMount"></div>
+             <div data-identifier="multiValueContainer" data-template-property="properties.allowedMimeTypes">
+-                <div data-template-property="_value" />
++                <div data-template-property="_value"></div>
+             </div>
+         </div>
+     </div>
+diff --git a/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Stage/StaticText.html b/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Stage/StaticText.html
+index 0294a30..28cbda3 100644
+--- a/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Stage/StaticText.html
++++ b/typo3/sysext/form/Resources/Private/Backend/Partials/FormEditor/Stage/StaticText.html
+@@ -14,7 +14,7 @@
+             </div>
+         </div>
+         <div class="element-content">
+-            <div data-template-property="properties.text" />
++            <div data-template-property="properties.text"></div>
+         </div>
+     </div>
+     <div class="t3-form-validator-info" data-identifier="validators">