From 84001bcd98ee86a1907d6f061a907aa375e2d694 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bjo=CC=88rn=20Fromme?= <fromme@dreipunktnull.com>
Date: Tue, 19 May 2020 16:25:58 +0200
Subject: [PATCH] Update to TYPO3 9.5.18, remove obsolete patch (which didn't
 work anyway)

---
 composer.json        |   8 -
 composer.lock        | 442 ++++++++++++++++++++-----------------------
 patches/54471d5.diff | 333 --------------------------------
 3 files changed, 206 insertions(+), 577 deletions(-)
 delete mode 100644 patches/54471d5.diff

diff --git a/composer.json b/composer.json
index d612573b..ddf8db20 100644
--- a/composer.json
+++ b/composer.json
@@ -14,7 +14,6 @@
     "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",
@@ -93,12 +92,5 @@
     "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 427d9e67..6eb59806 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": "11f56c210e3ec1f453a60223e59d17fe",
+    "content-hash": "9e1be2cab97408fbcbe09fa4a4286a55",
     "packages": [
         {
             "name": "christophlehmann/imageoptimizer",
@@ -98,50 +98,6 @@
             ],
             "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",
@@ -2724,16 +2680,16 @@
         },
         {
             "name": "symfony/http-client-contracts",
-            "version": "v2.0.1",
+            "version": "v2.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/http-client-contracts.git",
-                "reference": "378868b61b85c5cac6822d4f84e26999c9f2e881"
+                "reference": "e3ba2688594d8ef284f40348f7efb72cba4edec4"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/http-client-contracts/zipball/378868b61b85c5cac6822d4f84e26999c9f2e881",
-                "reference": "378868b61b85c5cac6822d4f84e26999c9f2e881",
+                "url": "https://api.github.com/repos/symfony/http-client-contracts/zipball/e3ba2688594d8ef284f40348f7efb72cba4edec4",
+                "reference": "e3ba2688594d8ef284f40348f7efb72cba4edec4",
                 "shasum": ""
             },
             "require": {
@@ -2745,7 +2701,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.0-dev"
+                    "dev-master": "2.1-dev"
                 }
             },
             "autoload": {
@@ -2777,7 +2733,21 @@
                 "interoperability",
                 "standards"
             ],
-            "time": "2019-11-26T23:25:11+00:00"
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2020-05-09T18:37:03+00:00"
         },
         {
             "name": "symfony/http-foundation",
@@ -4272,26 +4242,26 @@
         },
         {
             "name": "typo3/cms-adminpanel",
-            "version": "v9.5.17",
+            "version": "v9.5.18",
             "source": {
                 "type": "git",
                 "url": "https://github.com/TYPO3-CMS/adminpanel.git",
-                "reference": "17da5a44d4e8573d3104c623764284018da3a622"
+                "reference": "45a841829d5c5c3ba5f68748ede1ec4de5201ccf"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/TYPO3-CMS/adminpanel/zipball/17da5a44d4e8573d3104c623764284018da3a622",
-                "reference": "17da5a44d4e8573d3104c623764284018da3a622",
+                "url": "https://api.github.com/repos/TYPO3-CMS/adminpanel/zipball/45a841829d5c5c3ba5f68748ede1ec4de5201ccf",
+                "reference": "45a841829d5c5c3ba5f68748ede1ec4de5201ccf",
                 "shasum": ""
             },
             "require": {
                 "psr/http-message": "~1.0",
                 "psr/http-server-handler": "^1.0",
                 "psr/http-server-middleware": "^1.0",
-                "typo3/cms-backend": "9.5.17",
-                "typo3/cms-core": "9.5.17",
-                "typo3/cms-fluid": "9.5.17",
-                "typo3/cms-frontend": "9.5.17",
+                "typo3/cms-backend": "9.5.18",
+                "typo3/cms-core": "9.5.18",
+                "typo3/cms-fluid": "9.5.18",
+                "typo3/cms-frontend": "9.5.18",
                 "typo3fluid/fluid": "^2.6.8"
             },
             "conflict": {
@@ -4330,25 +4300,25 @@
             ],
             "description": "The TYPO3 admin panel provides a panel with additional functionality in the frontend (Debugging, Caching, Preview...)",
             "homepage": "https://typo3.org",
-            "time": "2020-05-12T10:36:00+00:00"
+            "time": "2020-05-19T13:10:50+00:00"
         },
         {
             "name": "typo3/cms-backend",
-            "version": "v9.5.17",
+            "version": "v9.5.18",
             "source": {
                 "type": "git",
                 "url": "https://github.com/TYPO3-CMS/backend.git",
-                "reference": "e3226b81145e7fdb308eb57cffce0cbdd88d80ae"
+                "reference": "8059a593a283cd0106383116a3758c5e92f45efe"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/TYPO3-CMS/backend/zipball/e3226b81145e7fdb308eb57cffce0cbdd88d80ae",
-                "reference": "e3226b81145e7fdb308eb57cffce0cbdd88d80ae",
+                "url": "https://api.github.com/repos/TYPO3-CMS/backend/zipball/8059a593a283cd0106383116a3758c5e92f45efe",
+                "reference": "8059a593a283cd0106383116a3758c5e92f45efe",
                 "shasum": ""
             },
             "require": {
-                "typo3/cms-core": "9.5.17",
-                "typo3/cms-recordlist": "9.5.17"
+                "typo3/cms-core": "9.5.18",
+                "typo3/cms-recordlist": "9.5.18"
             },
             "conflict": {
                 "typo3/cms": "*"
@@ -4397,24 +4367,24 @@
             ],
             "description": "Classes for the TYPO3 backend.",
             "homepage": "https://typo3.org",
-            "time": "2020-05-12T10:36:00+00:00"
+            "time": "2020-05-19T13:10:50+00:00"
         },
         {
             "name": "typo3/cms-belog",
-            "version": "v9.5.17",
+            "version": "v9.5.18",
             "source": {
                 "type": "git",
                 "url": "https://github.com/TYPO3-CMS/belog.git",
-                "reference": "2412f684b6f9482a07ac3bf3013aba99747cd8b1"
+                "reference": "57b79bdebcaad476aa0a82b8be7e5e5f010f6869"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/TYPO3-CMS/belog/zipball/2412f684b6f9482a07ac3bf3013aba99747cd8b1",
-                "reference": "2412f684b6f9482a07ac3bf3013aba99747cd8b1",
+                "url": "https://api.github.com/repos/TYPO3-CMS/belog/zipball/57b79bdebcaad476aa0a82b8be7e5e5f010f6869",
+                "reference": "57b79bdebcaad476aa0a82b8be7e5e5f010f6869",
                 "shasum": ""
             },
             "require": {
-                "typo3/cms-core": "9.5.17"
+                "typo3/cms-core": "9.5.18"
             },
             "conflict": {
                 "typo3/cms": "*"
@@ -4446,24 +4416,24 @@
             ],
             "description": "Displays backend log, both per page and system wide. Available as the module Tools>Log (system wide overview) and Web>Info/Log (page relative overview).",
             "homepage": "https://typo3.org",
-            "time": "2020-05-12T10:36:00+00:00"
+            "time": "2020-05-19T13:10:50+00:00"
         },
         {
             "name": "typo3/cms-beuser",
-            "version": "v9.5.17",
+            "version": "v9.5.18",
             "source": {
                 "type": "git",
                 "url": "https://github.com/TYPO3-CMS/beuser.git",
-                "reference": "f186b0f991c521e9730c92bd4df1d1e541dffa6a"
+                "reference": "d22660665eaaccd3b0985efbdced7f527ee29a81"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/TYPO3-CMS/beuser/zipball/f186b0f991c521e9730c92bd4df1d1e541dffa6a",
-                "reference": "f186b0f991c521e9730c92bd4df1d1e541dffa6a",
+                "url": "https://api.github.com/repos/TYPO3-CMS/beuser/zipball/d22660665eaaccd3b0985efbdced7f527ee29a81",
+                "reference": "d22660665eaaccd3b0985efbdced7f527ee29a81",
                 "shasum": ""
             },
             "require": {
-                "typo3/cms-core": "9.5.17"
+                "typo3/cms-core": "9.5.18"
             },
             "conflict": {
                 "typo3/cms": "*"
@@ -4495,7 +4465,7 @@
             ],
             "description": "Backend user administration and overview. Allows you to compare the settings of users and verify their permissions and see who is online.",
             "homepage": "https://typo3.org",
-            "time": "2020-05-12T10:36:00+00:00"
+            "time": "2020-05-19T13:10:50+00:00"
         },
         {
             "name": "typo3/cms-cli",
@@ -4595,16 +4565,16 @@
         },
         {
             "name": "typo3/cms-core",
-            "version": "v9.5.17",
+            "version": "v9.5.18",
             "source": {
                 "type": "git",
                 "url": "https://github.com/TYPO3-CMS/core.git",
-                "reference": "4ecdf459027eb96c6423f7cb8dfd9616027b2b18"
+                "reference": "96a3fe773ed42a8362bf8e86ab66632015418037"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/TYPO3-CMS/core/zipball/4ecdf459027eb96c6423f7cb8dfd9616027b2b18",
-                "reference": "4ecdf459027eb96c6423f7cb8dfd9616027b2b18",
+                "url": "https://api.github.com/repos/TYPO3-CMS/core/zipball/96a3fe773ed42a8362bf8e86ab66632015418037",
+                "reference": "96a3fe773ed42a8362bf8e86ab66632015418037",
                 "shasum": ""
             },
             "require": {
@@ -4711,24 +4681,24 @@
             ],
             "description": "The core library of TYPO3.",
             "homepage": "https://typo3.org",
-            "time": "2020-05-12T10:36:00+00:00"
+            "time": "2020-05-19T13:10:50+00:00"
         },
         {
             "name": "typo3/cms-extbase",
-            "version": "v9.5.17",
+            "version": "v9.5.18",
             "source": {
                 "type": "git",
                 "url": "https://github.com/TYPO3-CMS/extbase.git",
-                "reference": "069554fe3dee2471c80f36f3047d7c5bd0f44bc6"
+                "reference": "388fed86aa9c665ecb2678c1d26206170c2b0eea"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/TYPO3-CMS/extbase/zipball/069554fe3dee2471c80f36f3047d7c5bd0f44bc6",
-                "reference": "069554fe3dee2471c80f36f3047d7c5bd0f44bc6",
+                "url": "https://api.github.com/repos/TYPO3-CMS/extbase/zipball/388fed86aa9c665ecb2678c1d26206170c2b0eea",
+                "reference": "388fed86aa9c665ecb2678c1d26206170c2b0eea",
                 "shasum": ""
             },
             "require": {
-                "typo3/cms-core": "9.5.17"
+                "typo3/cms-core": "9.5.18"
             },
             "conflict": {
                 "typo3/cms": "*"
@@ -4770,24 +4740,24 @@
             ],
             "description": "A framework to build extensions for TYPO3 CMS.",
             "homepage": "https://typo3.org",
-            "time": "2020-05-12T10:36:00+00:00"
+            "time": "2020-05-19T13:10:50+00:00"
         },
         {
             "name": "typo3/cms-extensionmanager",
-            "version": "v9.5.17",
+            "version": "v9.5.18",
             "source": {
                 "type": "git",
                 "url": "https://github.com/TYPO3-CMS/extensionmanager.git",
-                "reference": "47bf5583854cad701ea57d5a3a090bb95417f3df"
+                "reference": "1f9ff5194470d737ff9c1555e0fcf6d67f731f49"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/TYPO3-CMS/extensionmanager/zipball/47bf5583854cad701ea57d5a3a090bb95417f3df",
-                "reference": "47bf5583854cad701ea57d5a3a090bb95417f3df",
+                "url": "https://api.github.com/repos/TYPO3-CMS/extensionmanager/zipball/1f9ff5194470d737ff9c1555e0fcf6d67f731f49",
+                "reference": "1f9ff5194470d737ff9c1555e0fcf6d67f731f49",
                 "shasum": ""
             },
             "require": {
-                "typo3/cms-core": "9.5.17"
+                "typo3/cms-core": "9.5.18"
             },
             "conflict": {
                 "typo3/cms": "*"
@@ -4821,24 +4791,24 @@
             ],
             "description": "TYPO3 Extension Manager",
             "homepage": "https://typo3.org",
-            "time": "2020-05-12T10:36:00+00:00"
+            "time": "2020-05-19T13:10:50+00:00"
         },
         {
             "name": "typo3/cms-felogin",
-            "version": "v9.5.17",
+            "version": "v9.5.18",
             "source": {
                 "type": "git",
                 "url": "https://github.com/TYPO3-CMS/felogin.git",
-                "reference": "a357b1873d2039079787c369881954137ccc637f"
+                "reference": "ebf447d799067b009ebc4c7108f515436c0b7864"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/TYPO3-CMS/felogin/zipball/a357b1873d2039079787c369881954137ccc637f",
-                "reference": "a357b1873d2039079787c369881954137ccc637f",
+                "url": "https://api.github.com/repos/TYPO3-CMS/felogin/zipball/ebf447d799067b009ebc4c7108f515436c0b7864",
+                "reference": "ebf447d799067b009ebc4c7108f515436c0b7864",
                 "shasum": ""
             },
             "require": {
-                "typo3/cms-core": "9.5.17"
+                "typo3/cms-core": "9.5.18"
             },
             "conflict": {
                 "typo3/cms": "*"
@@ -4870,24 +4840,24 @@
             ],
             "description": "A template-based plugin to log in Website Users in the Frontend",
             "homepage": "https://typo3.org",
-            "time": "2020-05-12T10:36:00+00:00"
+            "time": "2020-05-19T13:10:50+00:00"
         },
         {
             "name": "typo3/cms-filelist",
-            "version": "v9.5.17",
+            "version": "v9.5.18",
             "source": {
                 "type": "git",
                 "url": "https://github.com/TYPO3-CMS/filelist.git",
-                "reference": "9b7aa5fa7aef2052859a12be89065178370357d2"
+                "reference": "466e8066b25bb25799e85a7d7c06f379240aa67d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/TYPO3-CMS/filelist/zipball/9b7aa5fa7aef2052859a12be89065178370357d2",
-                "reference": "9b7aa5fa7aef2052859a12be89065178370357d2",
+                "url": "https://api.github.com/repos/TYPO3-CMS/filelist/zipball/466e8066b25bb25799e85a7d7c06f379240aa67d",
+                "reference": "466e8066b25bb25799e85a7d7c06f379240aa67d",
                 "shasum": ""
             },
             "require": {
-                "typo3/cms-core": "9.5.17"
+                "typo3/cms-core": "9.5.18"
             },
             "conflict": {
                 "typo3/cms": "*"
@@ -4921,24 +4891,24 @@
             ],
             "description": "Listing of files in the directory",
             "homepage": "https://typo3.org",
-            "time": "2020-05-12T10:36:00+00:00"
+            "time": "2020-05-19T13:10:50+00:00"
         },
         {
             "name": "typo3/cms-filemetadata",
-            "version": "v9.5.17",
+            "version": "v9.5.18",
             "source": {
                 "type": "git",
                 "url": "https://github.com/TYPO3-CMS/filemetadata.git",
-                "reference": "33e9da705be6c6f07edbef933000822d01884e2b"
+                "reference": "573b17114c0e0457faa84e7465c577835520b30e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/TYPO3-CMS/filemetadata/zipball/33e9da705be6c6f07edbef933000822d01884e2b",
-                "reference": "33e9da705be6c6f07edbef933000822d01884e2b",
+                "url": "https://api.github.com/repos/TYPO3-CMS/filemetadata/zipball/573b17114c0e0457faa84e7465c577835520b30e",
+                "reference": "573b17114c0e0457faa84e7465c577835520b30e",
                 "shasum": ""
             },
             "require": {
-                "typo3/cms-core": "9.5.17"
+                "typo3/cms-core": "9.5.18"
             },
             "conflict": {
                 "typo3/cms": "*"
@@ -4962,25 +4932,25 @@
             ],
             "description": "Add advanced metadata to File.",
             "homepage": "https://typo3.org",
-            "time": "2020-05-12T10:36:00+00:00"
+            "time": "2020-05-19T13:10:50+00:00"
         },
         {
             "name": "typo3/cms-fluid",
-            "version": "v9.5.17",
+            "version": "v9.5.18",
             "source": {
                 "type": "git",
                 "url": "https://github.com/TYPO3-CMS/fluid.git",
-                "reference": "0c6c1e03a6bbb42229bed7d440a546e2d14a6c3e"
+                "reference": "909231d38605db32d7497b69da504ed36deceed8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/TYPO3-CMS/fluid/zipball/0c6c1e03a6bbb42229bed7d440a546e2d14a6c3e",
-                "reference": "0c6c1e03a6bbb42229bed7d440a546e2d14a6c3e",
+                "url": "https://api.github.com/repos/TYPO3-CMS/fluid/zipball/909231d38605db32d7497b69da504ed36deceed8",
+                "reference": "909231d38605db32d7497b69da504ed36deceed8",
                 "shasum": ""
             },
             "require": {
-                "typo3/cms-core": "9.5.17",
-                "typo3/cms-extbase": "9.5.17",
+                "typo3/cms-core": "9.5.18",
+                "typo3/cms-extbase": "9.5.18",
                 "typo3fluid/fluid": "^2.6.8"
             },
             "conflict": {
@@ -5021,26 +4991,26 @@
             ],
             "description": "Fluid is a next-generation templating engine which makes the life of extension authors a lot easier!",
             "homepage": "https://typo3.org",
-            "time": "2020-05-12T10:36:00+00:00"
+            "time": "2020-05-19T13:10:50+00:00"
         },
         {
             "name": "typo3/cms-fluid-styled-content",
-            "version": "v9.5.17",
+            "version": "v9.5.18",
             "source": {
                 "type": "git",
                 "url": "https://github.com/TYPO3-CMS/fluid_styled_content.git",
-                "reference": "84eca0128c9d3126d856b6e4f8358c7e27149394"
+                "reference": "bf3d033e29feb0e38c4adca93930f2bdc4fdfe2f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/TYPO3-CMS/fluid_styled_content/zipball/84eca0128c9d3126d856b6e4f8358c7e27149394",
-                "reference": "84eca0128c9d3126d856b6e4f8358c7e27149394",
+                "url": "https://api.github.com/repos/TYPO3-CMS/fluid_styled_content/zipball/bf3d033e29feb0e38c4adca93930f2bdc4fdfe2f",
+                "reference": "bf3d033e29feb0e38c4adca93930f2bdc4fdfe2f",
                 "shasum": ""
             },
             "require": {
-                "typo3/cms-core": "9.5.17",
-                "typo3/cms-fluid": "9.5.17",
-                "typo3/cms-frontend": "9.5.17"
+                "typo3/cms-core": "9.5.18",
+                "typo3/cms-fluid": "9.5.18",
+                "typo3/cms-frontend": "9.5.18"
             },
             "conflict": {
                 "typo3/cms": "*"
@@ -5072,26 +5042,26 @@
             ],
             "description": "A set of common content elements based on Fluid for Frontend output.",
             "homepage": "https://typo3.org",
-            "time": "2020-05-12T10:36:00+00:00"
+            "time": "2020-05-19T13:10:50+00:00"
         },
         {
             "name": "typo3/cms-form",
-            "version": "v9.5.17",
+            "version": "v9.5.18",
             "source": {
                 "type": "git",
                 "url": "https://github.com/TYPO3-CMS/form.git",
-                "reference": "1520fef1476df6d91afc0c7ab60ef9794e678291"
+                "reference": "9229ec13a25bfb22d66bd6e79d8e39d64bb527cc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/TYPO3-CMS/form/zipball/1520fef1476df6d91afc0c7ab60ef9794e678291",
-                "reference": "1520fef1476df6d91afc0c7ab60ef9794e678291",
+                "url": "https://api.github.com/repos/TYPO3-CMS/form/zipball/9229ec13a25bfb22d66bd6e79d8e39d64bb527cc",
+                "reference": "9229ec13a25bfb22d66bd6e79d8e39d64bb527cc",
                 "shasum": ""
             },
             "require": {
                 "psr/http-message": "~1.0",
                 "symfony/expression-language": "^4.1",
-                "typo3/cms-core": "9.5.17"
+                "typo3/cms-core": "9.5.18"
             },
             "conflict": {
                 "typo3/cms": "*"
@@ -5128,24 +5098,24 @@
             ],
             "description": "Form Library, Plugin and Editor",
             "homepage": "https://typo3.org",
-            "time": "2020-05-12T10:36:00+00:00"
+            "time": "2020-05-19T13:10:50+00:00"
         },
         {
             "name": "typo3/cms-frontend",
-            "version": "v9.5.17",
+            "version": "v9.5.18",
             "source": {
                 "type": "git",
                 "url": "https://github.com/TYPO3-CMS/frontend.git",
-                "reference": "54bc2b778e822a22f4b58d1cb19b29ae793ba476"
+                "reference": "06a03d5b864a55b9687cc60895a5155b1428739a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/TYPO3-CMS/frontend/zipball/54bc2b778e822a22f4b58d1cb19b29ae793ba476",
-                "reference": "54bc2b778e822a22f4b58d1cb19b29ae793ba476",
+                "url": "https://api.github.com/repos/TYPO3-CMS/frontend/zipball/06a03d5b864a55b9687cc60895a5155b1428739a",
+                "reference": "06a03d5b864a55b9687cc60895a5155b1428739a",
                 "shasum": ""
             },
             "require": {
-                "typo3/cms-core": "9.5.17"
+                "typo3/cms-core": "9.5.18"
             },
             "conflict": {
                 "typo3/cms": "*"
@@ -5182,24 +5152,24 @@
             ],
             "description": "Classes for the frontend of TYPO3.",
             "homepage": "https://typo3.org",
-            "time": "2020-05-12T10:36:00+00:00"
+            "time": "2020-05-19T13:10:50+00:00"
         },
         {
             "name": "typo3/cms-info",
-            "version": "v9.5.17",
+            "version": "v9.5.18",
             "source": {
                 "type": "git",
                 "url": "https://github.com/TYPO3-CMS/info.git",
-                "reference": "65a07b47913e0935fd7b1f316ffbd6993d2feb04"
+                "reference": "2a39f9ce747fcf4941dc19ab0299585bf3a343b0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/TYPO3-CMS/info/zipball/65a07b47913e0935fd7b1f316ffbd6993d2feb04",
-                "reference": "65a07b47913e0935fd7b1f316ffbd6993d2feb04",
+                "url": "https://api.github.com/repos/TYPO3-CMS/info/zipball/2a39f9ce747fcf4941dc19ab0299585bf3a343b0",
+                "reference": "2a39f9ce747fcf4941dc19ab0299585bf3a343b0",
                 "shasum": ""
             },
             "require": {
-                "typo3/cms-core": "9.5.17"
+                "typo3/cms-core": "9.5.18"
             },
             "conflict": {
                 "typo3/cms": "*"
@@ -5240,28 +5210,28 @@
             ],
             "description": "Shows various infos",
             "homepage": "https://typo3.org",
-            "time": "2020-05-12T10:36:00+00:00"
+            "time": "2020-05-19T13:10:50+00:00"
         },
         {
             "name": "typo3/cms-install",
-            "version": "v9.5.17",
+            "version": "v9.5.18",
             "source": {
                 "type": "git",
                 "url": "https://github.com/TYPO3-CMS/install.git",
-                "reference": "d17bcb9762d58179805b7596e500feddf6b7bbbb"
+                "reference": "3ff3dc06faa6b02d79cded9e9176d8c4f4335921"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/TYPO3-CMS/install/zipball/d17bcb9762d58179805b7596e500feddf6b7bbbb",
-                "reference": "d17bcb9762d58179805b7596e500feddf6b7bbbb",
+                "url": "https://api.github.com/repos/TYPO3-CMS/install/zipball/3ff3dc06faa6b02d79cded9e9176d8c4f4335921",
+                "reference": "3ff3dc06faa6b02d79cded9e9176d8c4f4335921",
                 "shasum": ""
             },
             "require": {
                 "nikic/php-parser": "^4.2",
                 "symfony/finder": "^4.1",
-                "typo3/cms-core": "9.5.17",
-                "typo3/cms-extbase": "9.5.17",
-                "typo3/cms-fluid": "9.5.17"
+                "typo3/cms-core": "9.5.18",
+                "typo3/cms-extbase": "9.5.18",
+                "typo3/cms-fluid": "9.5.18"
             },
             "conflict": {
                 "typo3/cms": "*"
@@ -5295,24 +5265,24 @@
             ],
             "description": "The Install Tool mounted as the module Tools>Install in TYPO3.",
             "homepage": "https://typo3.org",
-            "time": "2020-05-12T10:36:00+00:00"
+            "time": "2020-05-19T13:10:50+00:00"
         },
         {
             "name": "typo3/cms-lowlevel",
-            "version": "v9.5.17",
+            "version": "v9.5.18",
             "source": {
                 "type": "git",
                 "url": "https://github.com/TYPO3-CMS/lowlevel.git",
-                "reference": "08c126ac76db24276f6a05fc14eee8dee38f1a62"
+                "reference": "ab0a07f9157b62762a6b21819cdd6744876def79"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/TYPO3-CMS/lowlevel/zipball/08c126ac76db24276f6a05fc14eee8dee38f1a62",
-                "reference": "08c126ac76db24276f6a05fc14eee8dee38f1a62",
+                "url": "https://api.github.com/repos/TYPO3-CMS/lowlevel/zipball/ab0a07f9157b62762a6b21819cdd6744876def79",
+                "reference": "ab0a07f9157b62762a6b21819cdd6744876def79",
                 "shasum": ""
             },
             "require": {
-                "typo3/cms-core": "9.5.17"
+                "typo3/cms-core": "9.5.18"
             },
             "conflict": {
                 "typo3/cms": "*"
@@ -5349,24 +5319,24 @@
             ],
             "description": "Enables the 'Config' and 'DB Check' modules for technical analysis of the system. This includes raw database search, checking relations, counting pages and records etc.",
             "homepage": "https://typo3.org",
-            "time": "2020-05-12T10:36:00+00:00"
+            "time": "2020-05-19T13:10:50+00:00"
         },
         {
             "name": "typo3/cms-recordlist",
-            "version": "v9.5.17",
+            "version": "v9.5.18",
             "source": {
                 "type": "git",
                 "url": "https://github.com/TYPO3-CMS/recordlist.git",
-                "reference": "b2bbf6c16cadf69977863e7e649b27fc43c51905"
+                "reference": "c387723b247656d48e30cc420ea23dffa5a80dcd"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/TYPO3-CMS/recordlist/zipball/b2bbf6c16cadf69977863e7e649b27fc43c51905",
-                "reference": "b2bbf6c16cadf69977863e7e649b27fc43c51905",
+                "url": "https://api.github.com/repos/TYPO3-CMS/recordlist/zipball/c387723b247656d48e30cc420ea23dffa5a80dcd",
+                "reference": "c387723b247656d48e30cc420ea23dffa5a80dcd",
                 "shasum": ""
             },
             "require": {
-                "typo3/cms-core": "9.5.17"
+                "typo3/cms-core": "9.5.18"
             },
             "conflict": {
                 "typo3/cms": "*"
@@ -5405,24 +5375,24 @@
             ],
             "description": "List of database-records",
             "homepage": "https://typo3.org",
-            "time": "2020-05-12T10:36:00+00:00"
+            "time": "2020-05-19T13:10:50+00:00"
         },
         {
             "name": "typo3/cms-recycler",
-            "version": "v9.5.17",
+            "version": "v9.5.18",
             "source": {
                 "type": "git",
                 "url": "https://github.com/TYPO3-CMS/recycler.git",
-                "reference": "ee4cf55e77888a50d8b3f0858501a6e891f6f333"
+                "reference": "939d1fbe59e5458d42423e9e64368f51a2a976ae"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/TYPO3-CMS/recycler/zipball/ee4cf55e77888a50d8b3f0858501a6e891f6f333",
-                "reference": "ee4cf55e77888a50d8b3f0858501a6e891f6f333",
+                "url": "https://api.github.com/repos/TYPO3-CMS/recycler/zipball/939d1fbe59e5458d42423e9e64368f51a2a976ae",
+                "reference": "939d1fbe59e5458d42423e9e64368f51a2a976ae",
                 "shasum": ""
             },
             "require": {
-                "typo3/cms-core": "9.5.17"
+                "typo3/cms-core": "9.5.18"
             },
             "conflict": {
                 "typo3/cms": "*"
@@ -5454,25 +5424,25 @@
             ],
             "description": "The recycler offers the possibility to restore deleted records or remove them from the database permanently. These actions can be applied to a single record, multiple records, and recursively to child records (ex. restoring a page can restore all content elements on that page). Filtering by page and by table provides a quick overview of deleted records before taking action on them.",
             "homepage": "https://typo3.org",
-            "time": "2020-05-12T10:36:00+00:00"
+            "time": "2020-05-19T13:10:50+00:00"
         },
         {
             "name": "typo3/cms-redirects",
-            "version": "v9.5.17",
+            "version": "v9.5.18",
             "source": {
                 "type": "git",
                 "url": "https://github.com/TYPO3-CMS/redirects.git",
-                "reference": "9bdc062043f4c363aa3f66beb477f9a8ab02cb58"
+                "reference": "c0cf21050db1ef58b25cba98ebd9b16d1f2b9c1e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/TYPO3-CMS/redirects/zipball/9bdc062043f4c363aa3f66beb477f9a8ab02cb58",
-                "reference": "9bdc062043f4c363aa3f66beb477f9a8ab02cb58",
+                "url": "https://api.github.com/repos/TYPO3-CMS/redirects/zipball/c0cf21050db1ef58b25cba98ebd9b16d1f2b9c1e",
+                "reference": "c0cf21050db1ef58b25cba98ebd9b16d1f2b9c1e",
                 "shasum": ""
             },
             "require": {
-                "typo3/cms-backend": "9.5.17",
-                "typo3/cms-core": "9.5.17",
+                "typo3/cms-backend": "9.5.18",
+                "typo3/cms-core": "9.5.18",
                 "typo3fluid/fluid": "^2.6.8"
             },
             "conflict": {
@@ -5506,24 +5476,24 @@
             ],
             "description": "Custom redirects in TYPO3.",
             "homepage": "https://typo3.org",
-            "time": "2020-05-12T10:36:00+00:00"
+            "time": "2020-05-19T13:10:50+00:00"
         },
         {
             "name": "typo3/cms-reports",
-            "version": "v9.5.17",
+            "version": "v9.5.18",
             "source": {
                 "type": "git",
                 "url": "https://github.com/TYPO3-CMS/reports.git",
-                "reference": "ffb4caecd043b006596d1a5ad28a4f226a412404"
+                "reference": "a066b5de3df246608b3219f3faceaea059b14294"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/TYPO3-CMS/reports/zipball/ffb4caecd043b006596d1a5ad28a4f226a412404",
-                "reference": "ffb4caecd043b006596d1a5ad28a4f226a412404",
+                "url": "https://api.github.com/repos/TYPO3-CMS/reports/zipball/a066b5de3df246608b3219f3faceaea059b14294",
+                "reference": "a066b5de3df246608b3219f3faceaea059b14294",
                 "shasum": ""
             },
             "require": {
-                "typo3/cms-core": "9.5.17"
+                "typo3/cms-core": "9.5.18"
             },
             "conflict": {
                 "typo3/cms": "*"
@@ -5563,24 +5533,24 @@
             ],
             "description": "The reports module groups several system reports.",
             "homepage": "https://typo3.org",
-            "time": "2020-05-12T10:36:00+00:00"
+            "time": "2020-05-19T13:10:50+00:00"
         },
         {
             "name": "typo3/cms-rte-ckeditor",
-            "version": "v9.5.17",
+            "version": "v9.5.18",
             "source": {
                 "type": "git",
                 "url": "https://github.com/TYPO3-CMS/rte_ckeditor.git",
-                "reference": "a9744652abdd769e3c45e45136290b09b818bec8"
+                "reference": "1ae865f8f6a0dc7e4a661cf6f667eb18fabe4fad"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/TYPO3-CMS/rte_ckeditor/zipball/a9744652abdd769e3c45e45136290b09b818bec8",
-                "reference": "a9744652abdd769e3c45e45136290b09b818bec8",
+                "url": "https://api.github.com/repos/TYPO3-CMS/rte_ckeditor/zipball/1ae865f8f6a0dc7e4a661cf6f667eb18fabe4fad",
+                "reference": "1ae865f8f6a0dc7e4a661cf6f667eb18fabe4fad",
                 "shasum": ""
             },
             "require": {
-                "typo3/cms-core": "9.5.17"
+                "typo3/cms-core": "9.5.18"
             },
             "conflict": {
                 "typo3/cms": "*"
@@ -5615,24 +5585,24 @@
             ],
             "description": "Integration of CKEditor as Rich Text Editor.",
             "homepage": "https://typo3.org",
-            "time": "2020-05-12T10:36:00+00:00"
+            "time": "2020-05-19T13:10:50+00:00"
         },
         {
             "name": "typo3/cms-scheduler",
-            "version": "v9.5.17",
+            "version": "v9.5.18",
             "source": {
                 "type": "git",
                 "url": "https://github.com/TYPO3-CMS/scheduler.git",
-                "reference": "f9f40facb2ce211bc84cf15cdd9c0bd8bbce83b5"
+                "reference": "cc570bf6b4527837347c18eaac1e0905c844b13e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/TYPO3-CMS/scheduler/zipball/f9f40facb2ce211bc84cf15cdd9c0bd8bbce83b5",
-                "reference": "f9f40facb2ce211bc84cf15cdd9c0bd8bbce83b5",
+                "url": "https://api.github.com/repos/TYPO3-CMS/scheduler/zipball/cc570bf6b4527837347c18eaac1e0905c844b13e",
+                "reference": "cc570bf6b4527837347c18eaac1e0905c844b13e",
                 "shasum": ""
             },
             "require": {
-                "typo3/cms-core": "9.5.17"
+                "typo3/cms-core": "9.5.18"
             },
             "conflict": {
                 "typo3/cms": "*"
@@ -5661,26 +5631,26 @@
             ],
             "description": "The TYPO3 Scheduler let's you register tasks to happen at a specific time",
             "homepage": "https://typo3.org",
-            "time": "2020-05-12T10:36:00+00:00"
+            "time": "2020-05-19T13:10:50+00:00"
         },
         {
             "name": "typo3/cms-seo",
-            "version": "v9.5.17",
+            "version": "v9.5.18",
             "source": {
                 "type": "git",
                 "url": "https://github.com/TYPO3-CMS/seo.git",
-                "reference": "2e29ea4f5ac07845ed832d20a8d023cbbe6393ed"
+                "reference": "ea285517f4ff6bcd1677302666ba1aff0069c8c7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/TYPO3-CMS/seo/zipball/2e29ea4f5ac07845ed832d20a8d023cbbe6393ed",
-                "reference": "2e29ea4f5ac07845ed832d20a8d023cbbe6393ed",
+                "url": "https://api.github.com/repos/TYPO3-CMS/seo/zipball/ea285517f4ff6bcd1677302666ba1aff0069c8c7",
+                "reference": "ea285517f4ff6bcd1677302666ba1aff0069c8c7",
                 "shasum": ""
             },
             "require": {
-                "typo3/cms-core": "9.5.17",
-                "typo3/cms-extbase": "9.5.17",
-                "typo3/cms-frontend": "9.5.17"
+                "typo3/cms-core": "9.5.18",
+                "typo3/cms-extbase": "9.5.18",
+                "typo3/cms-frontend": "9.5.18"
             },
             "conflict": {
                 "typo3/cms": "*"
@@ -5712,24 +5682,24 @@
             ],
             "description": "SEO features for TYPO3.",
             "homepage": "https://typo3.org",
-            "time": "2020-05-12T10:36:00+00:00"
+            "time": "2020-05-19T13:10:50+00:00"
         },
         {
             "name": "typo3/cms-setup",
-            "version": "v9.5.17",
+            "version": "v9.5.18",
             "source": {
                 "type": "git",
                 "url": "https://github.com/TYPO3-CMS/setup.git",
-                "reference": "c1a6603c1c42268600030727a5a82dcc6a709f89"
+                "reference": "5fc695ffaa6f874a9ff97d9ccdb785d884c614d8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/TYPO3-CMS/setup/zipball/c1a6603c1c42268600030727a5a82dcc6a709f89",
-                "reference": "c1a6603c1c42268600030727a5a82dcc6a709f89",
+                "url": "https://api.github.com/repos/TYPO3-CMS/setup/zipball/5fc695ffaa6f874a9ff97d9ccdb785d884c614d8",
+                "reference": "5fc695ffaa6f874a9ff97d9ccdb785d884c614d8",
                 "shasum": ""
             },
             "require": {
-                "typo3/cms-core": "9.5.17"
+                "typo3/cms-core": "9.5.18"
             },
             "conflict": {
                 "typo3/cms": "*"
@@ -5761,24 +5731,24 @@
             ],
             "description": "Allows users to edit a limited set of options for their user profile, eg. preferred language and their name and email address.",
             "homepage": "https://typo3.org",
-            "time": "2020-05-12T10:36:00+00:00"
+            "time": "2020-05-19T13:10:50+00:00"
         },
         {
             "name": "typo3/cms-t3editor",
-            "version": "v9.5.17",
+            "version": "v9.5.18",
             "source": {
                 "type": "git",
                 "url": "https://github.com/TYPO3-CMS/t3editor.git",
-                "reference": "758c67d43a58f85036e3f252766044bd799bb5c7"
+                "reference": "2a1c6823ecc8e2ab546f2528ae3f79e8dfb74d10"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/TYPO3-CMS/t3editor/zipball/758c67d43a58f85036e3f252766044bd799bb5c7",
-                "reference": "758c67d43a58f85036e3f252766044bd799bb5c7",
+                "url": "https://api.github.com/repos/TYPO3-CMS/t3editor/zipball/2a1c6823ecc8e2ab546f2528ae3f79e8dfb74d10",
+                "reference": "2a1c6823ecc8e2ab546f2528ae3f79e8dfb74d10",
                 "shasum": ""
             },
             "require": {
-                "typo3/cms-core": "9.5.17"
+                "typo3/cms-core": "9.5.18"
             },
             "conflict": {
                 "typo3/cms": "*"
@@ -5815,24 +5785,24 @@
             ],
             "description": "JavaScript-driven editor with syntax highlighting and codecompletion. Based on CodeMirror.",
             "homepage": "https://typo3.org",
-            "time": "2020-05-12T10:36:00+00:00"
+            "time": "2020-05-19T13:10:50+00:00"
         },
         {
             "name": "typo3/cms-taskcenter",
-            "version": "v9.5.17",
+            "version": "v9.5.18",
             "source": {
                 "type": "git",
                 "url": "https://github.com/TYPO3-CMS/taskcenter.git",
-                "reference": "cdc3b082755ce102881c0a8230242ba8e8fe23e0"
+                "reference": "656684656066d645ba6c1fd337326d64bf33ddb1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/TYPO3-CMS/taskcenter/zipball/cdc3b082755ce102881c0a8230242ba8e8fe23e0",
-                "reference": "cdc3b082755ce102881c0a8230242ba8e8fe23e0",
+                "url": "https://api.github.com/repos/TYPO3-CMS/taskcenter/zipball/656684656066d645ba6c1fd337326d64bf33ddb1",
+                "reference": "656684656066d645ba6c1fd337326d64bf33ddb1",
                 "shasum": ""
             },
             "require": {
-                "typo3/cms-core": "9.5.17"
+                "typo3/cms-core": "9.5.18"
             },
             "conflict": {
                 "typo3/cms": "*"
@@ -5861,24 +5831,24 @@
             ],
             "description": "The Task Center is the framework for a host of other extensions, see below.",
             "homepage": "https://typo3.org",
-            "time": "2020-05-12T10:36:00+00:00"
+            "time": "2020-05-19T13:10:50+00:00"
         },
         {
             "name": "typo3/cms-tstemplate",
-            "version": "v9.5.17",
+            "version": "v9.5.18",
             "source": {
                 "type": "git",
                 "url": "https://github.com/TYPO3-CMS/tstemplate.git",
-                "reference": "f5d7e25a1c560b70d66fbd3b98f257345df22b86"
+                "reference": "4af47da67227c292d6a311a05a629969239173fd"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/TYPO3-CMS/tstemplate/zipball/f5d7e25a1c560b70d66fbd3b98f257345df22b86",
-                "reference": "f5d7e25a1c560b70d66fbd3b98f257345df22b86",
+                "url": "https://api.github.com/repos/TYPO3-CMS/tstemplate/zipball/4af47da67227c292d6a311a05a629969239173fd",
+                "reference": "4af47da67227c292d6a311a05a629969239173fd",
                 "shasum": ""
             },
             "require": {
-                "typo3/cms-core": "9.5.17"
+                "typo3/cms-core": "9.5.18"
             },
             "conflict": {
                 "typo3/cms": "*"
@@ -5910,24 +5880,24 @@
             ],
             "description": "Framework for management of TypoScript template records for the CMS frontend.",
             "homepage": "https://typo3.org",
-            "time": "2020-05-12T10:36:00+00:00"
+            "time": "2020-05-19T13:10:50+00:00"
         },
         {
             "name": "typo3/cms-viewpage",
-            "version": "v9.5.17",
+            "version": "v9.5.18",
             "source": {
                 "type": "git",
                 "url": "https://github.com/TYPO3-CMS/viewpage.git",
-                "reference": "230a1ad759159a8f8e4ffe1fd1e4231122f73f59"
+                "reference": "2ca37c213912323d9770d29070d019687dc1f756"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/TYPO3-CMS/viewpage/zipball/230a1ad759159a8f8e4ffe1fd1e4231122f73f59",
-                "reference": "230a1ad759159a8f8e4ffe1fd1e4231122f73f59",
+                "url": "https://api.github.com/repos/TYPO3-CMS/viewpage/zipball/2ca37c213912323d9770d29070d019687dc1f756",
+                "reference": "2ca37c213912323d9770d29070d019687dc1f756",
                 "shasum": ""
             },
             "require": {
-                "typo3/cms-core": "9.5.17"
+                "typo3/cms-core": "9.5.18"
             },
             "conflict": {
                 "typo3/cms": "*"
@@ -5959,7 +5929,7 @@
             ],
             "description": "Shows the frontend webpage inside the backend frameset.",
             "homepage": "https://typo3.org",
-            "time": "2020-05-12T10:36:00+00:00"
+            "time": "2020-05-19T13:10:50+00:00"
         },
         {
             "name": "typo3/phar-stream-wrapper",
diff --git a/patches/54471d5.diff b/patches/54471d5.diff
deleted file mode 100644
index e4bb6b08..00000000
--- a/patches/54471d5.diff
+++ /dev/null
@@ -1,333 +0,0 @@
-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">