[!!!][TASK] EXT:form - Remove deprecated code 84/45384/8
authorRalf Zimmermann <ralf.zimmermann@tritum.de>
Thu, 21 Jan 2016 10:08:18 +0000 (11:08 +0100)
committerWouter Wolters <typo3@wouterwolters.nl>
Thu, 21 Jan 2016 17:51:36 +0000 (18:51 +0100)
This patchset removes the compatibility layer of EXT:form. The layer
made sure that EXT:form acts almost like in TYPO3 6.2. This mainly
applies to the layout configuration and rendering.
In the former days integrators could use .layout settings on different
levels to change the output of the form elements in the frontend. The
whole process is not intuitive and not well documented.
Nowadyas integrators should use fluid templates to customize their
forms. With this patchset this is the only way to go.

Furthermore the SELECT, TEXTAREA and TEXTBLOCK elements are adjusted.
The automatic transformation of the .data and .content attribute is
removed. That way .text is the only valid attribute for adding a human
readable text to the above mentioned elements.
Using the old attribute causes no harm.
There will be neither an output nor an error message.

Resolves: #72861
Releases: master
Change-Id: Ibe35e68637b904c7db705d3c8fcf70b77dc8a1b1
Reviewed-on: https://review.typo3.org/45384
Reviewed-by: Bjoern Jacob <bjoern.jacob@tritum.de>
Tested-by: Bjoern Jacob <bjoern.jacob@tritum.de>
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Tested-by: Wouter Wolters <typo3@wouterwolters.nl>
100 files changed:
typo3/sysext/core/Documentation/Changelog/master/Breaking-72861-EXTform-RemoveDeprecatedCode.rst [new file with mode: 0644]
typo3/sysext/form/Classes/Domain/Builder/ElementBuilder.php
typo3/sysext/form/Classes/Domain/Builder/FormBuilder.php
typo3/sysext/form/Classes/Domain/Model/Configuration.php
typo3/sysext/form/Classes/Domain/Model/Json/SelectJsonElement.php
typo3/sysext/form/Classes/Domain/Model/Json/TextareaJsonElement.php
typo3/sysext/form/Classes/Domain/Model/Json/TextblockJsonElement.php
typo3/sysext/form/Classes/Utility/CompatibilityLayerUtility.php [deleted file]
typo3/sysext/form/Configuration/TypoScript/Elements/Form.ts
typo3/sysext/form/Resources/Private/Partials/Compatibility/Confirmation/ContainerElements/Checkboxgroup.html [deleted file]
typo3/sysext/form/Resources/Private/Partials/Compatibility/Confirmation/ContainerElements/Fieldset.html [deleted file]
typo3/sysext/form/Resources/Private/Partials/Compatibility/Confirmation/ContainerElements/Form.html [deleted file]
typo3/sysext/form/Resources/Private/Partials/Compatibility/Confirmation/ContainerElements/Radiogroup.html [deleted file]
typo3/sysext/form/Resources/Private/Partials/Compatibility/Confirmation/FlatElements/Button.html [deleted file]
typo3/sysext/form/Resources/Private/Partials/Compatibility/Confirmation/FlatElements/ButtonTag.html [deleted file]
typo3/sysext/form/Resources/Private/Partials/Compatibility/Confirmation/FlatElements/Checkbox.html [deleted file]
typo3/sysext/form/Resources/Private/Partials/Compatibility/Confirmation/FlatElements/ContentElement.html [deleted file]
typo3/sysext/form/Resources/Private/Partials/Compatibility/Confirmation/FlatElements/Header.html [deleted file]
typo3/sysext/form/Resources/Private/Partials/Compatibility/Confirmation/FlatElements/Hidden.html [deleted file]
typo3/sysext/form/Resources/Private/Partials/Compatibility/Confirmation/FlatElements/Imagebutton.html [deleted file]
typo3/sysext/form/Resources/Private/Partials/Compatibility/Confirmation/FlatElements/Input.html [deleted file]
typo3/sysext/form/Resources/Private/Partials/Compatibility/Confirmation/FlatElements/InputTypeButton.html [deleted file]
typo3/sysext/form/Resources/Private/Partials/Compatibility/Confirmation/FlatElements/Password.html [deleted file]
typo3/sysext/form/Resources/Private/Partials/Compatibility/Confirmation/FlatElements/Radio.html [deleted file]
typo3/sysext/form/Resources/Private/Partials/Compatibility/Confirmation/FlatElements/Reset.html [deleted file]
typo3/sysext/form/Resources/Private/Partials/Compatibility/Confirmation/FlatElements/Select.html [deleted file]
typo3/sysext/form/Resources/Private/Partials/Compatibility/Confirmation/FlatElements/Submit.html [deleted file]
typo3/sysext/form/Resources/Private/Partials/Compatibility/Confirmation/FlatElements/Textarea.html [deleted file]
typo3/sysext/form/Resources/Private/Partials/Compatibility/Confirmation/FlatElements/Textblock.html [deleted file]
typo3/sysext/form/Resources/Private/Partials/Compatibility/Confirmation/FlatElements/Textfield.html [deleted file]
typo3/sysext/form/Resources/Private/Partials/Compatibility/Confirmation/FlatElements/Upload.html [deleted file]
typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Html/ContainerElements/Checkboxgroup.html [deleted file]
typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Html/ContainerElements/Fieldset.html [deleted file]
typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Html/ContainerElements/Form.html [deleted file]
typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Html/ContainerElements/Radiogroup.html [deleted file]
typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Html/FlatElements/Button.html [deleted file]
typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Html/FlatElements/ButtonTag.html [deleted file]
typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Html/FlatElements/Checkbox.html [deleted file]
typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Html/FlatElements/ContentElement.html [deleted file]
typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Html/FlatElements/Header.html [deleted file]
typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Html/FlatElements/Hidden.html [deleted file]
typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Html/FlatElements/Imagebutton.html [deleted file]
typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Html/FlatElements/Input.html [deleted file]
typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Html/FlatElements/InputTypeButton.html [deleted file]
typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Html/FlatElements/Password.html [deleted file]
typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Html/FlatElements/Radio.html [deleted file]
typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Html/FlatElements/Reset.html [deleted file]
typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Html/FlatElements/Select.html [deleted file]
typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Html/FlatElements/Submit.html [deleted file]
typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Html/FlatElements/Textarea.html [deleted file]
typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Html/FlatElements/Textblock.html [deleted file]
typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Html/FlatElements/Textfield.html [deleted file]
typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Html/FlatElements/Upload.html [deleted file]
typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Plain/ContainerElements/Checkboxgroup.html [deleted file]
typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Plain/ContainerElements/Fieldset.html [deleted file]
typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Plain/ContainerElements/Form.html [deleted file]
typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Plain/ContainerElements/Radiogroup.html [deleted file]
typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Plain/FlatElements/Button.html [deleted file]
typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Plain/FlatElements/ButtonTag.html [deleted file]
typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Plain/FlatElements/Checkbox.html [deleted file]
typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Plain/FlatElements/ContentElement.html [deleted file]
typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Plain/FlatElements/Header.html [deleted file]
typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Plain/FlatElements/Hidden.html [deleted file]
typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Plain/FlatElements/Imagebutton.html [deleted file]
typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Plain/FlatElements/Input.html [deleted file]
typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Plain/FlatElements/InputTypeButton.html [deleted file]
typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Plain/FlatElements/Password.html [deleted file]
typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Plain/FlatElements/Radio.html [deleted file]
typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Plain/FlatElements/Reset.html [deleted file]
typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Plain/FlatElements/Select.html [deleted file]
typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Plain/FlatElements/Submit.html [deleted file]
typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Plain/FlatElements/Textarea.html [deleted file]
typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Plain/FlatElements/Textblock.html [deleted file]
typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Plain/FlatElements/Textfield.html [deleted file]
typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Plain/FlatElements/Upload.html [deleted file]
typo3/sysext/form/Resources/Private/Partials/Compatibility/Show/ContainerElements/Checkboxgroup.html [deleted file]
typo3/sysext/form/Resources/Private/Partials/Compatibility/Show/ContainerElements/Fieldset.html [deleted file]
typo3/sysext/form/Resources/Private/Partials/Compatibility/Show/ContainerElements/Form.html [deleted file]
typo3/sysext/form/Resources/Private/Partials/Compatibility/Show/ContainerElements/Radiogroup.html [deleted file]
typo3/sysext/form/Resources/Private/Partials/Compatibility/Show/FlatElements/Button.html [deleted file]
typo3/sysext/form/Resources/Private/Partials/Compatibility/Show/FlatElements/ButtonTag.html [deleted file]
typo3/sysext/form/Resources/Private/Partials/Compatibility/Show/FlatElements/Checkbox.html [deleted file]
typo3/sysext/form/Resources/Private/Partials/Compatibility/Show/FlatElements/ContentElement.html [deleted file]
typo3/sysext/form/Resources/Private/Partials/Compatibility/Show/FlatElements/Header.html [deleted file]
typo3/sysext/form/Resources/Private/Partials/Compatibility/Show/FlatElements/Hidden.html [deleted file]
typo3/sysext/form/Resources/Private/Partials/Compatibility/Show/FlatElements/Imagebutton.html [deleted file]
typo3/sysext/form/Resources/Private/Partials/Compatibility/Show/FlatElements/Input.html [deleted file]
typo3/sysext/form/Resources/Private/Partials/Compatibility/Show/FlatElements/InputTypeButton.html [deleted file]
typo3/sysext/form/Resources/Private/Partials/Compatibility/Show/FlatElements/Password.html [deleted file]
typo3/sysext/form/Resources/Private/Partials/Compatibility/Show/FlatElements/Radio.html [deleted file]
typo3/sysext/form/Resources/Private/Partials/Compatibility/Show/FlatElements/Reset.html [deleted file]
typo3/sysext/form/Resources/Private/Partials/Compatibility/Show/FlatElements/Select.html [deleted file]
typo3/sysext/form/Resources/Private/Partials/Compatibility/Show/FlatElements/Submit.html [deleted file]
typo3/sysext/form/Resources/Private/Partials/Compatibility/Show/FlatElements/Textarea.html [deleted file]
typo3/sysext/form/Resources/Private/Partials/Compatibility/Show/FlatElements/Textblock.html [deleted file]
typo3/sysext/form/Resources/Private/Partials/Compatibility/Show/FlatElements/Textfield.html [deleted file]
typo3/sysext/form/Resources/Private/Partials/Compatibility/Show/FlatElements/Upload.html [deleted file]
typo3/sysext/form/Resources/Private/Templates/PostProcessor/Mail/Compatibility/Html.html [deleted file]
typo3/sysext/form/Resources/Private/Templates/PostProcessor/Mail/Compatibility/Plain.html [deleted file]
typo3/sysext/form/Tests/Unit/Domain/Model/ConfigurationTest.php

diff --git a/typo3/sysext/core/Documentation/Changelog/master/Breaking-72861-EXTform-RemoveDeprecatedCode.rst b/typo3/sysext/core/Documentation/Changelog/master/Breaking-72861-EXTform-RemoveDeprecatedCode.rst
new file mode 100644 (file)
index 0000000..009cc28
--- /dev/null
@@ -0,0 +1,32 @@
+====================================================
+Breaking: #72861 - EXT:form - Remove deprecated code
+====================================================
+
+Description
+===========
+
+The compatibility layer of EXT:form has been removed. The layer made sure that EXT:form acts almost like in TYPO3 6.2. This mainly applies to the layout configuration and rendering. In the former days integrators could use ``.layout`` settings on different levels to change the output of the form elements in the frontend. Nowadays, changing the frontend output is only possible by utilizing own fluid templates.
+
+Furthermore the SELECT, TEXTAREA and TEXTBLOCK elements have been adjusted. The automatic transformation of the ``.data`` (SELECT, TEXTAREA) and ``.content`` (TEXTBLOCK) attribute was removed. That way ``.text`` is the only valid attribute for adding a human readable text to the above mentioned elements.
+
+
+Impact
+======
+
+Using ``.layout`` will have no effect anymore.
+
+Using the ``.data`` attribute for SELECT, TEXTAREA and ``.content`` for TEXTBLOCK elements will also have no effect.
+
+
+Affected Installations
+======================
+
+Any installation using ``.layout`` and/ or ``.data`` and/ or ``.content`` settings. Most of the older installations (mainly 6.2 LTS) will be affected when upgrading to 8 LTS.
+
+
+Migration
+=========
+
+All ``.layout`` settings have to be removed and ported to own fluid templates.
+
+All occurrences of the ``.data`` and ``.content`` attribute have to be substituted by ``.text``.
\ No newline at end of file
index 36e5b6b..9b2b9fe 100644 (file)
@@ -184,42 +184,15 @@ class ElementBuilder
         foreach ($this->htmlAttributes as $attributeName => $attributeValue) {
             $attributeNameWithoutDot = rtrim($attributeName, '.');
             $attributeNameToSet = $attributeNameWithoutDot;
-            $rendered = false;
-            /* If the attribute exists in the user configured typoscript */
-            if ($this->arrayKeyExists($attributeName, $this->userConfiguredElementTyposcript)) {
-                if ($this->formBuilder->getConfiguration()->getCompatibility()) {
-                    $newAttributeName = $this->formBuilder->getCompatibilityService()->getNewAttributeName(
-                        $this->element->getElementType(),
-                        $attributeNameWithoutDot
-                    );
-                    /* Should the attribute be renamed? */
-                    if ($newAttributeName !== $attributeNameWithoutDot) {
-                        $attributeNameToSet = $newAttributeName;
-                        /* If the renamed attribute already exists in the user configured typoscript */
-                        if ($this->arrayKeyExists($newAttributeName, $this->userConfiguredElementTyposcript)) {
-                            $attributeValue = $this->formBuilder->getFormUtility()->renderItem(
-                                $this->userConfiguredElementTyposcript[$newAttributeName . '.'],
-                                $this->userConfiguredElementTyposcript[$newAttributeName]
-                            );
-                            /* set renamed attribute name with the value of the renamed attribute */
-                            $this->htmlAttributes[$newAttributeName] = $attributeValue;
-                            /* unset the renamed attribute */
-                            unset($this->userConfiguredElementTyposcript[$newAttributeName . '.']);
-                            unset($this->userConfiguredElementTyposcript[$newAttributeName]);
-                            $rendered = true;
-                        }
-                    }
-                }
-            }
-            if ($rendered === false) {
-                if ($this->arrayKeyExists($attributeNameWithoutDot, $this->userConfiguredElementTyposcript)) {
-                    $attributeValue = $this->formBuilder->getFormUtility()->renderItem(
-                        $this->userConfiguredElementTyposcript[$attributeNameWithoutDot . '.'],
-                        $this->userConfiguredElementTyposcript[$attributeNameWithoutDot]
-                    );
-                    $this->htmlAttributes[$attributeNameToSet] = $attributeValue;
-                }
+
+            if ($this->arrayKeyExists($attributeNameWithoutDot, $this->userConfiguredElementTyposcript)) {
+                $attributeValue = $this->formBuilder->getFormUtility()->renderItem(
+                    $this->userConfiguredElementTyposcript[$attributeNameWithoutDot . '.'],
+                    $this->userConfiguredElementTyposcript[$attributeNameWithoutDot]
+                );
+                $this->htmlAttributes[$attributeNameToSet] = $attributeValue;
             }
+
             unset($this->userConfiguredElementTyposcript[$attributeNameWithoutDot . '.']);
             unset($this->userConfiguredElementTyposcript[$attributeNameWithoutDot]);
         }
@@ -329,41 +302,15 @@ class ElementBuilder
             }
             $attributeNameWithoutDot = rtrim($attributeName, '.');
             $attributeNameToSet = $attributeNameWithoutDot;
-            $rendered = false;
-            if ($this->formBuilder->getConfiguration()->getCompatibility()) {
-                $newAttributeName = $this->formBuilder->getCompatibilityService()->getNewAttributeName(
-                    $this->element->getElementType(),
-                    $attributeNameWithoutDot
-                );
-                /* Should the attribute be renamed? */
-                if ($newAttributeName !== $attributeNameWithoutDot) {
-                    $attributeNameToSet = $newAttributeName;
-                    /* If the renamed attribute already exists in the user configured typoscript */
-                    if ($this->arrayKeyExists($newAttributeName, $this->userConfiguredElementTyposcript)) {
-                        $attributeValue = $this->formBuilder->getFormUtility()->renderItem(
-                            $this->userConfiguredElementTyposcript[$newAttributeName . '.'],
-                            $this->userConfiguredElementTyposcript[$newAttributeName]
-                        );
-                        /* set renamed attribute name with the value of the renamed attribute */
-                        $this->additionalArguments[$newAttributeName] = $attributeValue;
-                        /* unset the renamed attribute */
-                        $ignoreKeys[$newAttributeName . '.'] = true;
-                        $ignoreKeys[$newAttributeName] = true;
-                        unset($this->userConfiguredElementTyposcript[$newAttributeName . '.']);
-                        unset($this->userConfiguredElementTyposcript[$newAttributeName]);
-                        $rendered = true;
-                    }
-                }
-            }
-            if ($rendered === false) {
-                $attributeValue = $this->formBuilder->getFormUtility()->renderItem(
-                    $this->userConfiguredElementTyposcript[$attributeNameWithoutDot . '.'],
-                    $this->userConfiguredElementTyposcript[$attributeNameWithoutDot]
-                );
-                $this->additionalArguments[$attributeNameToSet] = $attributeValue;
-                $ignoreKeys[$attributeNameToSet . '.'] = true;
-                $ignoreKeys[$attributeNameToSet] = true;
-            }
+
+            $attributeValue = $this->formBuilder->getFormUtility()->renderItem(
+                $this->userConfiguredElementTyposcript[$attributeNameWithoutDot . '.'],
+                $this->userConfiguredElementTyposcript[$attributeNameWithoutDot]
+            );
+            $this->additionalArguments[$attributeNameToSet] = $attributeValue;
+            $ignoreKeys[$attributeNameToSet . '.'] = true;
+            $ignoreKeys[$attributeNameToSet] = true;
+
             unset($this->userConfiguredElementTyposcript[$attributeNameWithoutDot . '.']);
             unset($this->userConfiguredElementTyposcript[$attributeNameWithoutDot]);
         }
index e4daaa7..1e3e1da 100644 (file)
@@ -20,7 +20,6 @@ use TYPO3\CMS\Form\Domain\Model\Configuration;
 use TYPO3\CMS\Form\Domain\Model\Element;
 use TYPO3\CMS\Form\Domain\Model\ValidationElement;
 use TYPO3\CMS\Form\Mvc\Controller\ControllerContext;
-use TYPO3\CMS\Form\Utility\CompatibilityLayerUtility;
 use TYPO3\CMS\Form\Utility\FormUtility;
 
 /**
@@ -32,11 +31,6 @@ use TYPO3\CMS\Form\Utility\FormUtility;
 class FormBuilder
 {
     /**
-     * @var string
-     */
-    const COMPATIBILITY_THEME_NAME = 'Compatibility';
-
-    /**
      * @param Configuration $configuration
      * @return FormBuilder
      */
@@ -59,11 +53,6 @@ class FormBuilder
     protected $typoScriptService;
 
     /**
-     * @var \TYPO3\CMS\Form\Utility\CompatibilityLayerUtility
-     */
-    protected $compatibilityService;
-
-    /**
      * @var ValidationBuilder
      */
     protected $validationBuilder;
@@ -163,14 +152,6 @@ class FormBuilder
     }
 
     /**
-     * Creates this object.
-     */
-    public function __construct()
-    {
-        $this->compatibilityService = CompatibilityLayerUtility::create($this);
-    }
-
-    /**
      * @return Configuration
      */
     public function getConfiguration()
@@ -203,22 +184,6 @@ class FormBuilder
     }
 
     /**
-     * @return CompatibilityLayerUtility
-     */
-    public function getCompatibilityService()
-    {
-        return $this->compatibilityService;
-    }
-
-    /**
-     * @param CompatibilityLayerUtility $compatibilityService
-     */
-    public function setCompatibilityService(CompatibilityLayerUtility $compatibilityService)
-    {
-        $this->compatibilityService = $compatibilityService;
-    }
-
-    /**
      * @return FormUtility
      */
     public function getFormUtility()
@@ -259,42 +224,6 @@ class FormBuilder
     public function buildModel()
     {
         $userConfiguredFormTypoScript = $this->configuration->getTypoScript();
-
-        if ($this->configuration->getCompatibility()) {
-            $layout = array();
-            if (isset($userConfiguredFormTypoScript['layout.'])) {
-                $layout = $userConfiguredFormTypoScript['layout.'];
-                /* use the compatibility theme whenever if a layout is defined */
-                $this->configuration->setThemeName(static::COMPATIBILITY_THEME_NAME);
-                unset($userConfiguredFormTypoScript['layout.']);
-            }
-
-            switch ($this->getControllerAction()) {
-                case 'show':
-                    $actionLayoutKey = 'form.';
-                    break;
-                case 'confirmation':
-                    $actionLayoutKey = 'confirmation.';
-                    break;
-                case 'process':
-                    $actionLayoutKey = 'postProcessor.';
-                    break;
-                default:
-                    $actionLayoutKey = '';
-                    break;
-            }
-            if ($actionLayoutKey && isset($userConfiguredFormTypoScript[$actionLayoutKey]['layout.'])) {
-                $actionLayout = $userConfiguredFormTypoScript[$actionLayoutKey]['layout.'];
-                $this->configuration->setThemeName(static::COMPATIBILITY_THEME_NAME);
-                unset($userConfiguredFormTypoScript[$actionLayoutKey]['layout.']);
-                $layout = array_replace_recursive($layout, $actionLayout);
-            }
-
-            if (!empty($layout)) {
-                $this->compatibilityService->setGlobalLayoutConfiguration($layout);
-            }
-        }
-
         $form = $this->createElementObject();
         $this->reviveElement($form, $userConfiguredFormTypoScript, 'FORM');
         $form->setThemeName($this->configuration->getThemeName());
@@ -346,26 +275,11 @@ class FormBuilder
             $element->setAdditionalArguments(array(
                 'content' => $attributeValue,
             ));
-            /* use the compatibility theme whenever if a layout is defined */
-            if ($this->configuration->getCompatibility()) {
-                $this->compatibilityService->setElementLayouts($element, $userConfiguredElementTypoScript);
-                if (isset($userConfiguredElementTypoScript['layout'])) {
-                    $this->configuration->setThemeName(static::COMPATIBILITY_THEME_NAME);
-                    unset($userConfiguredElementTypoScript['layout']);
-                }
-            }
         } else {
             $this->setAttributes($elementBuilder, $element, $userConfiguredElementTypoScript);
             $userConfiguredElementTypoScript = $elementBuilder->getUserConfiguredElementTypoScript();
             $this->setValidationMessages($element);
-            /* use the compatibility theme whenever if a layout is defined */
-            if ($this->configuration->getCompatibility()) {
-                $this->compatibilityService->setElementLayouts($element, $userConfiguredElementTypoScript);
-                if (isset($userConfiguredElementTypoScript['layout'])) {
-                    $this->configuration->setThemeName(static::COMPATIBILITY_THEME_NAME);
-                    unset($userConfiguredElementTypoScript['layout']);
-                }
-            }
+
             $this->signalSlotDispatcher->dispatch(
                 __CLASS__,
                 'txFormAfterElementCreation',
@@ -636,16 +550,6 @@ class FormBuilder
     }
 
     /**
-     * If TRUE form try to respect the layout settings
-     *
-     * @return bool
-     */
-    public function getCompatibilityMode()
-    {
-        return $this->configuration->getCompatibility();
-    }
-
-    /**
      * Get the incoming flat form data
      *
      * @return ValidationElement
index 76fdcb7..a7dc179 100644 (file)
@@ -54,11 +54,6 @@ class Configuration
     protected $prefix = 'form';
 
     /**
-     * @var bool
-     */
-    protected $compatibility = false;
-
-    /**
      * @var string
      */
     protected $themeName = '';
@@ -130,24 +125,6 @@ class Configuration
     }
 
     /**
-     * @return bool
-     */
-    public function getCompatibility()
-    {
-        return $this->compatibility;
-    }
-
-    /**
-     * @param bool $compatibility
-     * @return Configuration
-     */
-    public function setCompatibility($compatibility)
-    {
-        $this->compatibility = (bool)$compatibility;
-        return $this;
-    }
-
-    /**
      * @return string
      */
     public function getThemeName()
@@ -185,15 +162,6 @@ class Configuration
         if (!empty($this->typoScript['prefix'])) {
             $this->setPrefix($this->typoScript['prefix']);
         }
-        // Determine compatibility behavior
-        $this->setCompatibility((bool)$this->typoScriptRepository->getModelConfigurationByScope('FORM', 'compatibilityMode'));
-        if (isset($this->typoScript['compatibilityMode'])) {
-            if ((int)($this->typoScript['compatibilityMode']) === 0) {
-                $this->setCompatibility(false);
-            } else {
-                $this->setCompatibility(true);
-            }
-        }
         // Set the theme name
         if (!empty($this->typoScript['themeName'])) {
             $this->setThemeName($this->typoScript['themeName']);
index 61f3299..ab2709b 100644 (file)
@@ -110,10 +110,6 @@ class SelectJsonElement extends \TYPO3\CMS\Form\Domain\Model\Json\AbstractJsonEl
                             $childElementArguments['attributes']['value'] = $childElementArguments['value'];
                             unset($childElementArguments['value']);
                         }
-                        if (isset($childElementArguments['data']) && !isset($childElementArguments['text'])) {
-                            // preserve backward compatibility by rewriting data to text
-                            $childElementArguments['text'] = $childElementArguments['data'];
-                        }
                         $this->configuration['options'][] = $childElementArguments;
                     }
                 }
index b534fb2..6ae2e9d 100644 (file)
@@ -92,10 +92,6 @@ class TextareaJsonElement extends \TYPO3\CMS\Form\Domain\Model\Json\AbstractJson
      */
     protected function setAttributes(array $parameters)
     {
-        // preserve backward compatibility by rewriting data to text
-        if (isset($parameters['data'])) {
-            $this->configuration['attributes']['text'] = $parameters['data'];
-        }
         parent::setAttributes($parameters);
     }
 }
index 0e401d0..16eb64d 100644 (file)
@@ -77,9 +77,6 @@ class TextblockJsonElement extends \TYPO3\CMS\Form\Domain\Model\Json\AbstractJso
     {
         if (isset($parameters['text'])) {
             $this->configuration['various']['text'] = $parameters['text'];
-        } elseif (isset($parameters['content'])) {
-            // preserve backward compatibility by rewriting content to text
-            $this->configuration['various']['text'] = $parameters['content'];
         }
     }
 }
diff --git a/typo3/sysext/form/Classes/Utility/CompatibilityLayerUtility.php b/typo3/sysext/form/Classes/Utility/CompatibilityLayerUtility.php
deleted file mode 100644 (file)
index 4161765..0000000
+++ /dev/null
@@ -1,739 +0,0 @@
-<?php
-namespace TYPO3\CMS\Form\Utility;
-
-/*
- * This file is part of the TYPO3 CMS project.
- *
- * It is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License, either version 2
- * of the License, or any later version.
- *
- * For the full copyright and license information, please read the
- * LICENSE.txt file that was distributed with this source code.
- *
- * The TYPO3 project - inspiring people to share!
- */
-
-use TYPO3\CMS\Core\Utility\GeneralUtility;
-use TYPO3\CMS\Form\Domain\Builder\FormBuilder;
-use TYPO3\CMS\Form\Domain\Model\Element;
-
-/**
- * Compatibility layer.
- * Used in the scope of one(!) specific form element.
- */
-class CompatibilityLayerUtility
-{
-    /**
-     * @param FormBuilder $formBuilder
-     * @return CompatibilityLayerUtility
-     */
-    public static function create(FormBuilder $formBuilder)
-    {
-        /** @var CompatibilityLayerUtility $compatibilityService */
-        $compatibilityService = \TYPO3\CMS\Form\Utility\FormUtility::getObjectManager()->get(CompatibilityLayerUtility::class);
-        $compatibilityService->setFormBuilder($formBuilder);
-        return $compatibilityService;
-    }
-
-    /**
-     * Layout array from form configuration
-     *
-     * @var array
-     */
-    protected $layout = array();
-
-    /**
-     * @var FormBuilder
-     */
-    protected $formBuilder;
-
-    /**
-     * @var array
-     */
-    protected $registeredFormElements = array(
-        'TEXTLINE',
-        'SUBMIT',
-        'RESET',
-        'RADIO',
-        'PASSWORD',
-        'IMAGEBUTTON',
-        'FILEUPLOAD',
-        'CHECKBOX',
-        'BUTTON',
-        'TEXTAREA',
-        'HIDDEN',
-        'CONTENTELEMENT',
-        'TEXTBLOCK',
-        'SELECT',
-        'FIELDSET',
-        'RADIOGROUP',
-        'CHECKBOXGROUP',
-    );
-
-    /**
-     * @var array
-     */
-    protected $elementsWithoutLabel = array(
-        'HIDDEN',
-        'CONTENTELEMENT',
-        'TEXTBLOCK',
-        'FIELDSET',
-        'RADIOGROUP',
-        'CHECKBOXGROUP',
-    );
-
-    /**
-     * @var array
-     */
-    protected $containerElements = array(
-        'FIELDSET',
-        'RADIOGROUP',
-        'CHECKBOXGROUP',
-    );
-
-    /**
-     * @param FormBuilder $formBuilder
-     */
-    public function setFormBuilder(FormBuilder $formBuilder)
-    {
-        $this->formBuilder = $formBuilder;
-    }
-
-    /**
-     * Set the layout configuration for one or more elements
-     *
-     * @param NULL|array $layout The configuration array
-     * @return void
-     * @deprecated since TYPO3 CMS 7, this function will be removed in TYPO3 CMS 8, as the functionality is now done via fluid
-     */
-    public function setGlobalLayoutConfiguration($layout = array())
-    {
-        GeneralUtility::deprecationLog('EXT:form: Do not use "layout." anymore. Deprecated since TYPO3 CMS 7, this function will be removed in TYPO3 CMS 8.');
-        if (is_array($layout)) {
-            foreach ($layout as $elementType => $elementValue) {
-                $elementType = strtoupper($elementType);
-                $this->layout[$elementType] = $elementValue;
-            }
-        }
-    }
-
-    /**
-     * Get the layout of the object
-     * Looks if there is an assigned layout by configuration of the element
-     * otherwise it will look if there is a layout set in the form configuration.
-     *
-     * @param string $elementType Type of element e.g BUTTON
-     * @return string The element layout
-     * @deprecated since TYPO3 CMS 7, this function will be removed in TYPO3 CMS 8, as the functionality is now done via fluid
-     */
-    public function getGlobalLayoutByElementType($elementType)
-    {
-        GeneralUtility::deprecationLog('EXT:form: Do not use "layout." anymore. Deprecated since TYPO3 CMS 7, this function will be removed in TYPO3 CMS 8.');
-        $layout = '';
-        if (!empty($this->layout[$elementType])) {
-            $layout = $this->layout[$elementType];
-        } else {
-            $action = $this->formBuilder->getControllerAction();
-            switch ($elementType) {
-                case 'FORM':
-                    $layout = '<form><containerWrap /></form>';
-                    break;
-                case 'CONFIRMATION':
-                    $layout = '<containerWrap />';
-                    break;
-                case 'HTML':
-                    $layout = '<html><head><meta http-equiv="Content-Type" content="text/html; charset=utf-8" /></head><body><table cellspacing="0"><containerWrap /></table></body></html>';
-                    break;
-                case 'CONTAINERWRAP':
-                    if ($action !== 'process') {
-                        $layout = '<ol><elements /></ol>';
-                    } else {
-                        $layout = '<tbody><elements /></tbody>';
-                    }
-                    break;
-                case 'ELEMENTWRAP':
-                    if ($action !== 'process') {
-                        $layout = '<li><element /></li>';
-                    } else {
-                        $layout = '<tr><element /></tr>';
-                    }
-                    break;
-                case 'LABEL':
-                    if ($action === 'show') {
-                        $layout = '<label><labelvalue /><mandatory /><error /></label>';
-                    } elseif ($action === 'confirmation') {
-                        $layout = '<label><labelvalue /></label>';
-                    } else {
-                        $layout = '<em><labelvalue /></em>';
-                    }
-                    break;
-                case 'LEGEND':
-                    if ($action === 'show') {
-                        $layout = '<legend><legendvalue /><mandatory /><error /></legend>';
-                    } elseif ($action === 'confirmation') {
-                        $layout = '<legend><legendvalue /></legend>';
-                    } else {
-                        $layout = '<thead><tr><th colspan="2" align="left"><legendvalue /></th></tr></thead>';
-                    }
-                    break;
-                case 'MANDATORY':
-                    if ($action !== 'process') {
-                        $layout = '<em><mandatoryvalue /></em>';
-                    } else {
-                        $layout = '';
-                    }
-                    break;
-                case 'ERROR':
-                    if ($action !== 'process') {
-                        $layout = '<strong><errorvalue /></strong>';
-                    } else {
-                        $layout = '';
-                    }
-                    break;
-                case 'RADIOGROUP':
-                case 'CHECKBOXGROUP':
-                case 'FIELDSET':
-                    if ($action !== 'process') {
-                        $layout = '<fieldset><legend /><containerWrap /></fieldset>';
-                    } else {
-                        $layout = '<td colspan="2"><table cellspacing="0" style="padding-left: 20px; margin-bottom: 20px;"><legend /><containerWrap /></table></td>';
-                    }
-                    break;
-                case 'HIDDEN':
-                    if ($action !== 'process') {
-                        $layout = '<input />';
-                    } else {
-                        $layout = '';
-                    }
-                    break;
-                case 'SELECT':
-                    if ($action === 'show') {
-                        $layout = '<label /><select><elements /></select>';
-                    } elseif ($action === 'confirmation') {
-                        $layout = '<label /><ol><elements /></ol>';
-                    } else {
-                        $layout = '<td style="width: 200px;"><label /></td><td><elements /></td>';
-                    }
-                    break;
-                case 'TEXTAREA':
-                    if ($action === 'show') {
-                        $layout = '<label /><textarea />';
-                    } elseif ($action === 'confirmation') {
-                        $layout = '<label /><inputvalue />';
-                    } else {
-                        $layout = '<td style="width: 200px;" valign="top"><label /></td><td><inputvalue /></td>';
-                    }
-                    break;
-                case 'BUTTON':
-                case 'IMAGEBUTTON':
-                case 'PASSWORD':
-                case 'RESET':
-                case 'SUBMIT':
-                    if ($action !== 'show') {
-                        $layout = '';
-                        break;
-                    }
-                case 'CHECKBOX':
-                case 'FILEUPLOAD':
-                case 'RADIO':
-                case 'TEXTLINE':
-                    if ($action === 'show') {
-                        $layout = '<label /><input />';
-                    } elseif ($action === 'confirmation') {
-                        $layout = '<label /><inputvalue />';
-                    } else {
-                        $layout = '<td style="width: 200px;"><label /></td><td><inputvalue /></td>';
-                    }
-                    break;
-                case 'TEXTBLOCK':
-                    if ($action === 'show') {
-                        $layout = '<textblock />';
-                    } else {
-                        $layout = '';
-                    }
-                    break;
-            }
-        }
-        return $layout;
-    }
-
-    /**
-     * Set the layout for a element
-     * Not supported / ignored: OPTGROUP, OPTION, layout.legend
-     *
-     * @param \TYPO3\CMS\Form\Domain\Model\Element $element
-     * @param array $userConfiguredElementTyposcript The configuration array
-     * @return void
-     * @deprecated since TYPO3 CMS 7, this function will be removed in TYPO3 CMS 8, as the functionality is now done via fluid
-     */
-    public function setElementLayouts(Element $element, array $userConfiguredElementTyposcript = array())
-    {
-        GeneralUtility::deprecationLog('EXT:form: Do not use "layout." anymore. Deprecated since TYPO3 CMS 7, this function will be removed in TYPO3 CMS 8.');
-        if ($element->getElementType() === 'FORM') {
-            $containerWrapReturn = $this->replaceTagWithMarker('elements', 'body', $this->getGlobalLayoutByElementType('CONTAINERWRAP'));
-            if ($this->formBuilder->getControllerAction() === 'show') {
-                $formWrapReturn = $this->replaceTagWithMarker('containerwrap', 'form', $this->getGlobalLayoutByElementType('FORM'));
-            } elseif ($this->formBuilder->getControllerAction() === 'confirmation') {
-                $formWrapReturn = $this->replaceTagWithMarker('containerwrap', 'body', $this->getGlobalLayoutByElementType('CONFIRMATION'));
-            } else {
-                $formWrapReturn = $this->replaceTagWithMarker('containerwrap', 'html', $this->getGlobalLayoutByElementType('HTML'));
-            }
-            $formLayout = str_replace($formWrapReturn['marker'], $containerWrapReturn['html'], $formWrapReturn['html']);
-            $formContainerWrap = explode($containerWrapReturn['marker'], $formLayout);
-            $layout['containerInnerWrap'] = $formContainerWrap;
-            $element->setLayout($layout);
-            $classFromLayout = $this->getElementClassFromLayout('form');
-            if (!empty($classFromLayout)) {
-                if (!empty($element->getAdditionalArgument('class'))) {
-                    $classFromLayout .= ' ' . $element->getAdditionalArgument('class');
-                }
-                $element->setAdditionalArgument('class', $classFromLayout);
-            }
-            return;
-        }
-        if (in_array($element->getElementType(), $this->registeredFormElements)) {
-            /* Get the element layout definition or fallback to the global definition (if set) */
-            if (isset($userConfiguredElementTyposcript['layout'])) {
-                $elementLayout = $userConfiguredElementTyposcript['layout'];
-            } else {
-                $elementLayout = $this->getGlobalLayoutByElementType($element->getElementType());
-            }
-            /* if a element layout exist */
-            $elementWrap = null;
-            if ($elementLayout) {
-                $elementWrap = $this->determineElementOuterWraps($element->getElementType(), $elementLayout);
-                if ($elementWrap['html'] !== '') {
-                    /* layout.label */
-                    if (!in_array($element->getElementType(), $this->elementsWithoutLabel, true)) {
-                        $descriptionElementLayouts = $this->getDescriptionElementLayouts($element);
-
-                        if (!$descriptionElementLayouts['labelContainContent']) {
-                            $descriptionElementLayouts['labelLayout'] = '';
-                        } else {
-                            $libxmlUseInternalErrors = libxml_use_internal_errors(true);
-                            $dom = new \DOMDocument('1.0', 'utf-8');
-                            $dom->formatOutput = true;
-                            $dom->preserveWhiteSpace = false;
-                            if ($dom->loadXML($descriptionElementLayouts['labelLayout'])) {
-                                $nodes = $dom->getElementsByTagName('label');
-                                if ($nodes->length) {
-                                    $node = $nodes->item(0);
-                                    if ($node) {
-                                        $node->setAttribute('for', $element->getId());
-                                        $descriptionElementLayouts['labelLayout'] = $dom->saveXML($dom->firstChild);
-                                    }
-                                }
-                            }
-                            libxml_use_internal_errors($libxmlUseInternalErrors);
-                        }
-                        /* Replace <label />, <error /> and <mandatory /> in the element wrap html */
-                        $labelReturn = $this->replaceTagWithMarker('label', 'body', $elementWrap['html']);
-                        if ($labelReturn['html'] !== '') {
-                            $elementWrap['html'] = str_replace($labelReturn['marker'], $descriptionElementLayouts['labelLayout'], $labelReturn['html']);
-                        }
-                        $errorReturn = $this->replaceTagWithMarker('error', 'body', $elementWrap['html']);
-                        if ($errorReturn['html'] !== '') {
-                            $elementWrap['html'] = str_replace($errorReturn['marker'], $descriptionElementLayouts['errorLayout'], $errorReturn['html']);
-                        }
-                        $mandatoryReturn = $this->replaceTagWithMarker('mandatory', 'body', $elementWrap['html']);
-                        if ($mandatoryReturn['html'] !== '') {
-                            $elementWrap['html'] = str_replace($mandatoryReturn['marker'], $descriptionElementLayouts['mandatoryLayout'], $mandatoryReturn['html']);
-                        }
-                    }
-                    $elementWrap = explode($elementWrap['marker'], $elementWrap['html']);
-                } else {
-                    $elementWrap = null;
-                }
-            }
-            /* Set element outer wraps and set the default classes */
-            $elementOuterWrap = null;
-            if ($this->getGlobalLayoutByElementType('ELEMENTWRAP')) {
-                $libxmlUseInternalErrors = libxml_use_internal_errors(true);
-                $dom = new \DOMDocument('1.0', 'utf-8');
-                $dom->formatOutput = true;
-                $dom->preserveWhiteSpace = false;
-                if ($dom->loadXML($this->getGlobalLayoutByElementType('ELEMENTWRAP'))) {
-                    $node = $dom->firstChild;
-                    if ($node) {
-                        $class = '';
-                        if ($node->getAttribute('class') !== '') {
-                            $class = $node->getAttribute('class') . ' ';
-                        }
-                        $class .= 'csc-form-' . $element->getElementCounter() . ' csc-form-element csc-form-element-' . $element->getElementTypeLowerCase();
-                        $node->setAttribute('class', $class);
-                        $elementOuterWrap = $dom->saveXML($dom->firstChild);
-                        $return = $this->replaceTagWithMarker('element', 'body', $elementOuterWrap);
-                        if ($return['marker'] !== '') {
-                            $elementOuterWrap = explode($return['marker'], $return['html']);
-                            if ($element->getElementType() === 'SELECT') {
-                                $layout = $element->getLayout();
-                                $layout['optionOuterWrap'] = $elementOuterWrap;
-                                $element->setLayout($layout);
-                            }
-                        } else {
-                            /* this should never be happen */
-                            $elementOuterWrap = null;
-                        }
-                    }
-                } else {
-                    $elementOuterWrap = null;
-                }
-                libxml_use_internal_errors($libxmlUseInternalErrors);
-            }
-
-            if (
-                $elementWrap
-                && !$elementOuterWrap
-            ) {
-                /* If only $elementWrap isset */
-                $layout = $element->getLayout();
-                $layout['elementOuterWrap'] = $elementWrap;
-                $element->setLayout($layout);
-            } elseif (
-                !$elementWrap
-                && $elementOuterWrap
-            ) {
-                /* If only $elementOuterWrap isset */
-                $layout = $element->getLayout();
-                $layout['elementOuterWrap'] = $elementOuterWrap;
-                $element->setLayout($layout);
-            } elseif (
-                $elementWrap
-                && $elementOuterWrap
-            ) {
-                /* If $elementWrap isset and $elementOuterWrap isset */
-                $elementWrap = array(
-                    $elementOuterWrap[0] . $elementWrap[0],
-                    $elementWrap[1] . $elementOuterWrap[1],
-                );
-                $layout = $element->getLayout();
-                $layout['elementOuterWrap'] = $elementWrap;
-                $element->setLayout($layout);
-            }
-
-            /* Set container inner wraps */
-            if (in_array($element->getElementType(), $this->containerElements)) {
-                $elementWrap = $this->determineElementOuterWraps($element->getElementType(), $elementLayout);
-                /* Replace the legend value */
-                $descriptionElementLayouts = $this->getDescriptionElementLayouts($element, 'legend');
-                if (!$descriptionElementLayouts['labelContainContent']) {
-                    $descriptionElementLayouts['labelLayout'] = '';
-                }
-                /* No fieldset tag exist.
-                 * Ignore CONTAINERWRAP
-                 * */
-                if ($elementWrap['html'] === '') {
-                    $containerWrapReturn = $this->replaceTagWithMarker('elements', 'body', $elementLayout);
-                    if ($containerWrapReturn['marker'] && $containerWrapReturn['html']) {
-                        /* Replace <legend /> in the element wrap html */
-                        $legendReturn = $this->replaceTagWithMarker('legend', 'body', $containerWrapReturn['html']);
-                        if ($legendReturn['html'] !== '') {
-                            $containerWrapReturn['html'] = str_replace($legendReturn['marker'], $descriptionElementLayouts['labelLayout'], $legendReturn['html']);
-                        }
-                        $containerWrap = explode($containerWrapReturn['marker'], $containerWrapReturn['html']);
-                    } else {
-                        $containerWrap = array('', '');
-                    }
-
-                    $layout = $element->getLayout();
-                    $layout['containerInnerWrap'] = $containerWrap;
-                    $layout['noFieldsetTag'] = true;
-                    $layout['legend'] = $descriptionElementLayouts['labelLayout'];
-                    $element->setLayout($layout);
-                } else {
-                    /* set the wraps */
-                    $containerOuterWrap = array('', '');
-                    $containerOuterWrap = explode($elementWrap['marker'], $elementWrap['html']);
-                    $containerWrapReturn = $this->replaceTagWithMarker('elements', 'body', $this->getGlobalLayoutByElementType('CONTAINERWRAP'));
-                    $containerInnerWrap = explode($containerWrapReturn['marker'], $containerWrapReturn['html']);
-
-                    $containerWrap = array(
-                        $containerOuterWrap[0] . $containerInnerWrap[0],
-                        $containerInnerWrap[1] . $containerOuterWrap[1],
-                    );
-
-                    $layout = $element->getLayout();
-                    $layout['containerInnerWrap'] = $containerWrap;
-                    $layout['legend'] = $descriptionElementLayouts['labelLayout'];
-                    $element->setLayout($layout);
-                    $classFromLayout = $this->getElementClassFromLayout('fieldset');
-                    if (!empty($classFromLayout)) {
-                        if (!empty($element->getHtmlAttribute('class'))) {
-                            $classFromLayout .= ' ' . $element->getHtmlAttribute('class');
-                        }
-                        $element->setHtmlAttribute('class', $classFromLayout);
-                    }
-                }
-            } else {
-                /* set class attribute for the element tag */
-                if ($this->formBuilder->getControllerAction() === 'show') {
-                    if ($elementType === 'TEXTAREA') {
-                        $tagName = 'textarea';
-                    } elseif ($elementType === 'SELECT') {
-                        $tagName = 'select';
-                    } else {
-                        $tagName = 'input';
-                    }
-
-                    $classFromLayout = $this->getElementClassFromLayout($element->getElementType(), $tagName);
-                    if (!empty($classFromLayout)) {
-                        if (!empty($element->getAdditionalArgument('class'))) {
-                            $classFromLayout .= ' ' . $element->getAdditionalArgument('class');
-                        }
-                        $element->setAdditionalArgument('class', $classFromLayout);
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * Replace the message sections of a label.
-     * The scopes can be mandatory or error.
-     *
-     * @param string $scope
-     * @param array $messages
-     * @return string
-     */
-    protected function replaceLabelContent($scope = '', array $messages)
-    {
-        $messages = implode(' - ', $messages);
-        $return = $this->replaceTagWithMarker($scope . 'value', 'body', $this->getGlobalLayoutByElementType(strtoupper($scope)));
-        $html = str_replace($return['marker'], $messages, $return['html']);
-        return $html;
-    }
-
-    /**
-     * Replace <labelvalue /> or <legendvalue />, <mandatory />
-     * and <error /> in a label / legend with the associated content.
-     * Return the replaced <label /> / <legend /> layout and the replaced
-     * <mandatory /> and <error /> layout.
-     *
-     * @param \TYPO3\CMS\Form\Domain\Model\Element $element
-     * @param string $scope
-     * @return array
-     */
-    protected function getDescriptionElementLayouts(Element $element, $scope = 'label')
-    {
-        $labelLayout = $this->getGlobalLayoutByElementType(strtoupper($scope));
-        $labelContainContent = false;
-        $mandatoryLayout = '';
-        $errorLayout = '';
-        if ($this->formBuilder->getControllerAction() === 'show') {
-            /* Replace the mandatory and error messages */
-            /* layout.mandatory */
-            $mandatoryMessages = $this->formBuilder->getValidationBuilder()->getMandatoryValidationMessagesByElementName($element->getName());
-            if (!empty($mandatoryMessages)) {
-                $mandatoryLayout = $this->replaceLabelContent('mandatory', $mandatoryMessages);
-            }
-            $mandatoryReturn = $this->replaceTagWithMarker('mandatory', 'body', $labelLayout);
-            if (!empty($mandatoryReturn['html'])) {
-                if (!empty($mandatoryLayout)) {
-                    $labelContainContent = true;
-                }
-                $labelLayout = str_replace($mandatoryReturn['marker'], $mandatoryLayout, $mandatoryReturn['html']);
-            }
-
-            /* layout.error */
-            $errorMessages = $element->getValidationErrorMessages();
-            if (!empty($errorMessages)) {
-                $errorLayout = $this->replaceLabelContent('error', $errorMessages);
-            }
-            $errorReturn = $this->replaceTagWithMarker('error', 'body', $labelLayout);
-            if (!empty($errorReturn['html'])) {
-                if (!empty($errorLayout)) {
-                    $labelContainContent = true;
-                }
-                $labelLayout = str_replace($errorReturn['marker'], $errorLayout, $errorReturn['html']);
-            }
-        }
-        /* Replace the label value */
-        $labelValueReturn = $this->replaceTagWithMarker($scope . 'value', 'body', $labelLayout);
-        if (!empty($labelValueReturn['html'])) {
-            if (!empty($element->getAdditionalArgument($scope))) {
-                $labelContainContent = true;
-            }
-            $labelLayout = str_replace($labelValueReturn['marker'], $element->getAdditionalArgument($scope), $labelValueReturn['html']);
-        }
-
-        return array(
-            'labelContainContent' => $labelContainContent,
-            'labelLayout' => $labelLayout,
-            'errorLayout' => $errorLayout,
-            'mandatoryLayout' => $mandatoryLayout
-        );
-    }
-
-    /**
-     * Return the class attribute for a element defined by layout.
-     *
-     * @param string $elementType
-     * @param string $tagName
-     * @return string
-     */
-    protected function getElementClassFromLayout($elementType = '', $tagName = '')
-    {
-        $class = '';
-        $libxmlUseInternalErrors = libxml_use_internal_errors(true);
-        $dom = new \DOMDocument('1.0', 'utf-8');
-        $dom->formatOutput = true;
-        $dom->preserveWhiteSpace = false;
-        if ($dom->loadXML($this->getGlobalLayoutByElementType(strtoupper($elementType)))) {
-            if ($tagName === '') {
-                $tagName = $elementType;
-            }
-            $nodes = $dom->getElementsByTagName($tagName);
-            if ($nodes->length) {
-                $node = $nodes->item(0);
-                if ($node && $node->getAttribute('class') !== '') {
-                    $class = $node->getAttribute('class');
-                }
-            }
-        }
-        libxml_use_internal_errors($libxmlUseInternalErrors);
-        return $class;
-    }
-
-    /**
-     * Try to explode the element layout into 2 parts to get the
-     * outer wrapping
-     *
-     * @param string $elementType
-     * @param string $elementLayout
-     * @return string
-     * @deprecated since TYPO3 CMS 7, this function will be removed in TYPO3 CMS 8, as the functionality is now done via fluid
-     */
-    protected function determineElementOuterWraps($elementType, $elementLayout = '')
-    {
-        if ($this->formBuilder->getControllerAction() === 'show') {
-            if ($elementType === 'TEXTAREA') {
-                $return = $this->replaceTagWithMarker('textarea', 'body', $elementLayout);
-            } elseif ($elementType === 'CONTENTELEMENT') {
-                $return = $this->replaceTagWithMarker('content', 'body', $elementLayout);
-            } elseif ($elementType === 'SELECT') {
-                $return = $this->replaceTagWithMarker('select', 'body', $elementLayout);
-            } elseif (in_array($elementType, $this->containerElements)) {
-                $return = $this->replaceTagWithMarker('fieldset', 'body', $elementLayout);
-            } else {
-                $return = $this->replaceTagWithMarker('input', 'body', $elementLayout);
-            }
-        } else {
-            if ($elementType === 'CONTENTELEMENT') {
-                $return = $this->replaceTagWithMarker('content', 'body', $elementLayout);
-            } elseif ($elementType === 'SELECT') {
-                $return = $this->replaceTagWithMarker('elements', 'body', $elementLayout);
-            } elseif (in_array($elementType, $this->containerElements)) {
-                if ($this->formBuilder->getControllerAction() === 'confirmation') {
-                    $return = $this->replaceTagWithMarker('fieldset', 'body', $elementLayout);
-                } else {
-                    $return = $this->replaceTagWithMarker('containerwrap', 'body', $elementLayout);
-                }
-            } else {
-                $return = $this->replaceTagWithMarker('inputvalue', 'body', $elementLayout);
-            }
-        }
-        return $return;
-    }
-
-    /**
-     * Replace a html tag with a unique marker
-     *
-     * @param string $tagName
-     * @param string $stopTag
-     * @param string $html
-     * @return array
-     */
-    protected function replaceTagWithMarker($tagName, $stopTag = 'body', $html = '')
-    {
-        if (
-            $tagName === ''
-            || $html === ''
-        ) {
-            return array(
-                'html' => '',
-                'marker' => ''
-            );
-        }
-        $libxmlUseInternalErrors = libxml_use_internal_errors(true);
-        $dom = new \DOMDocument('1.0', 'utf-8');
-        $dom->preserveWhiteSpace = false;
-        if (!$dom->loadHTML('<?xml encoding="utf-8">' . $html)) {
-            libxml_use_internal_errors($libxmlUseInternalErrors);
-            return array(
-                'html' => '',
-                'marker' => ''
-            );
-        }
-        libxml_use_internal_errors($libxmlUseInternalErrors);
-        $nodes = $dom->getElementsByTagName($tagName);
-        if (!$nodes->length) {
-            return array(
-                'html' => '',
-                'marker' => ''
-            );
-        }
-        $nodeToReplace = $nodes->item(0);
-        /* Replace $tagname tag with a unique marker */
-        $marker = '###' . uniqid() . '###';
-        $markerNode = $dom->createTextNode($marker);
-        $replaceNode = $dom->createDocumentFragment();
-        $domNode = $dom->importNode($markerNode, true);
-        $replaceNode->appendChild($domNode);
-        $parentNode = $nodeToReplace->parentNode;
-        $parentNode->insertBefore($replaceNode, $nodeToReplace);
-        $parentNode->removeChild($nodeToReplace);
-        $nextParent = $parentNode;
-        /* Do not save the stop tag */
-        while ($nextParent !== null) {
-            if ($nextParent->tagName === $stopTag) {
-                break;
-            }
-            $nextParent = $nextParent->parentNode;
-        }
-        $html = '';
-        /* if stopTag == html, save the whole html */
-        if ($stopTag === 'html') {
-            $html = $nextParent->ownerDocument->saveHTML($nextParent);
-        } else {
-            /* do not save the stopTag */
-            $children = $nextParent->childNodes;
-            foreach ($children as $child) {
-                $html .= $nextParent->ownerDocument->saveHTML($child);
-            }
-        }
-        return array(
-            'html' => $html,
-            'marker' => $marker
-        );
-    }
-
-    /**
-     * Get new name for some old inconsistent attribute names
-     *
-     * @param string $elementType
-     * @param string $attributeName
-     * @return string
-     * @deprecated since TYPO3 CMS 7, this function will be removed in TYPO3 CMS 8, as the functionality is now done via fluid
-     */
-    public function getNewAttributeName($elementType, $attributeName)
-    {
-        if ($elementType === 'OPTION') {
-            if ($attributeName === 'data') {
-                GeneralUtility::deprecationLog('EXT:form: Deprecated since TYPO3 CMS 7, use text instead of data to configure the OPTION text');
-                $attributeName = 'text';
-            }
-        } elseif ($elementType === 'TEXTAREA') {
-            if ($attributeName === 'data') {
-                GeneralUtility::deprecationLog('EXT:form: Deprecated since TYPO3 CMS 7, use text instead of data to configure the TEXTAREA value');
-                $attributeName = 'text';
-            }
-        } elseif ($elementType === 'TEXTBLOCK') {
-            if ($attributeName === 'content') {
-                GeneralUtility::deprecationLog('EXT:form: Deprecated since TYPO3 CMS 7, use text instead of content to configure the TEXTBLOCK value');
-                $attributeName = 'text';
-            }
-        }
-        return $attributeName;
-    }
-}
index e5b0a7a..1ededb9 100644 (file)
@@ -28,28 +28,12 @@ plugin.tx_form {
                                #
                                # @ToDo: add more details
                        FORM {
-                                       # compatibilityMode
-                                       # Used by: frontend
-                                       # Overwritable by user: TRUE
-                                       # Only evaluated for FORM element
-                                       #
-                                       # If set to 1 tx_form acts almost like in TYPO3 6.2.
-                                       # This setting can be overwritten in the FORM object.
-                                       # @ToDo: add more details
-                                       #
-                                       # only for FORM
-                               compatibilityMode = 1
-
                                        # themeName
                                        # Used by: frontend, wizard (not implemented right now)
                                        # Overwritable by user: TRUE
                                        #
                                        # Sets the theme name used for templating.
-                                       # Right now there are 2 themes:
-                                       #       * Default: This theme provides a solid and clean foundation and should be used.
-                                       #       * Compatibility: This theme imitates the form layout/ behavior of TYPO3 6.2.
-                                       # If compatibilityMode = 1 and layout is used in the user definded TypoScript
-                                       # the theme name switches automatically to "Compatibility".
+                                       # Right now there is one default theme. One can define an own theme and use this one instead.
                                        #
                                        # This setting can be overwritten in the FORM object.
                                        # @ToDo: add more details
diff --git a/typo3/sysext/form/Resources/Private/Partials/Compatibility/Confirmation/ContainerElements/Checkboxgroup.html b/typo3/sysext/form/Resources/Private/Partials/Compatibility/Confirmation/ContainerElements/Checkboxgroup.html
deleted file mode 100644 (file)
index 737ee03..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-<f:if condition="{model.additionalArguments.atLeastOneCheckedChildElement}">
-       <f:if condition="{model.showElement}">
-               <f:then>
-                       <f:if condition="{model.layout.noFieldsetTag}">
-                               <f:then>
-                                       <f:format.raw>{model.layout.elementOuterWrap.0}</f:format.raw>
-                                       <f:format.raw>{model.layout.containerInnerWrap.0}</f:format.raw>
-                                               <f:for each="{model.childElements}" as="element">
-                                                       <f:render partial="{themeName}/Confirmation/{element.partialPath}" arguments="{model: element, themeName: themeName}" />
-                                               </f:for>
-                                       <f:format.raw>{model.layout.containerInnerWrap.1}</f:format.raw>
-                                       <f:format.raw>{model.layout.elementOuterWrap.1}</f:format.raw>
-                               </f:then>
-                               <f:else>
-                                       <f:format.raw>{model.layout.elementOuterWrap.0}</f:format.raw>
-                                               <fieldset
-                                               <f:for each="{model.htmlAttributes}" as="htmAttributeValue" key="htmAttributeKey">
-                                                       {htmAttributeKey}="{htmAttributeValue}"
-                                               </f:for>
-                                               >
-                                                       <f:if condition="{model.additionalArguments.legend}">
-                                                               <legend>{model.additionalArguments.legend}</legend>
-                                                       </f:if>
-
-                                                       <f:format.raw>{model.layout.containerInnerWrap.0}</f:format.raw>
-                                                               <f:for each="{model.childElements}" as="element">
-                                                                       <f:render partial="{themeName}/Confirmation/{element.partialPath}" arguments="{model: element, themeName: themeName}" />
-                                                               </f:for>
-                                                       <f:format.raw>{model.layout.containerInnerWrap.1}</f:format.raw>
-                                               </fieldset>
-                                       <f:format.raw>{model.layout.elementOuterWrap.1}</f:format.raw>
-                               </f:else>
-                       </f:if>
-               </f:then>
-               <f:else>
-                       <f:for each="{model.childElements}" as="element">
-                               <f:render partial="{themeName}/Confirmation/{element.partialPath}" arguments="{model: element, themeName: themeName}" />
-                       </f:for>
-               </f:else>
-       </f:if>
-</f:if>
diff --git a/typo3/sysext/form/Resources/Private/Partials/Compatibility/Confirmation/ContainerElements/Fieldset.html b/typo3/sysext/form/Resources/Private/Partials/Compatibility/Confirmation/ContainerElements/Fieldset.html
deleted file mode 100644 (file)
index dc7cb8a..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-<f:if condition="{model.childElements.0}">
-       <f:if condition="{model.showElement}">
-               <f:then>
-                       <f:if condition="{model.layout.noFieldsetTag}">
-                               <f:then>
-                                       <f:format.raw>{model.layout.elementOuterWrap.0}</f:format.raw>
-                                       <f:format.raw>{model.layout.containerInnerWrap.0}</f:format.raw>
-                                               <f:for each="{model.childElements}" as="element">
-                                                       <f:render partial="{themeName}/Confirmation/{element.partialPath}" arguments="{model: element, themeName: themeName}" />
-                                               </f:for>
-                                       <f:format.raw>{model.layout.containerInnerWrap.1}</f:format.raw>
-                                       <f:format.raw>{model.layout.elementOuterWrap.1}</f:format.raw>
-                               </f:then>
-                               <f:else>
-                                       <f:format.raw>{model.layout.elementOuterWrap.0}</f:format.raw>
-                                               <fieldset
-                                               <f:for each="{model.htmlAttributes}" as="htmAttributeValue" key="htmAttributeKey">
-                                                       {htmAttributeKey}="{htmAttributeValue}"
-                                               </f:for>
-                                               >
-                                                       <f:if condition="{model.additionalArguments.legend}">
-                                                               <legend>{model.additionalArguments.legend}</legend>
-                                                       </f:if>
-
-                                                       <f:format.raw>{model.layout.containerInnerWrap.0}</f:format.raw>
-                                                               <f:for each="{model.childElements}" as="element">
-                                                                       <f:render partial="{themeName}/Confirmation/{element.partialPath}" arguments="{model: element, themeName: themeName}" />
-                                                               </f:for>
-                                                       <f:format.raw>{model.layout.containerInnerWrap.1}</f:format.raw>
-                                               </fieldset>
-                                       <f:format.raw>{model.layout.elementOuterWrap.1}</f:format.raw>
-                               </f:else>
-                       </f:if>
-               </f:then>
-               <f:else>
-                       <f:for each="{model.childElements}" as="element">
-                               <f:render partial="{themeName}/Confirmation/{element.partialPath}" arguments="{model: element, themeName: themeName}" />
-                       </f:for>
-               </f:else>
-       </f:if>
-</f:if>
\ No newline at end of file
diff --git a/typo3/sysext/form/Resources/Private/Partials/Compatibility/Confirmation/ContainerElements/Form.html b/typo3/sysext/form/Resources/Private/Partials/Compatibility/Confirmation/ContainerElements/Form.html
deleted file mode 100644 (file)
index 7b3a839..0000000
+++ /dev/null
@@ -1,53 +0,0 @@
-<f:form
-       class="{model.additionalArguments.class}"
-       dir="{model.additionalArguments.dir}"
-       id="{model.additionalArguments.id}"
-       lang="{model.additionalArguments.lang}"
-       style="{model.additionalArguments.style}"
-       title="{model.additionalArguments.title}"
-       accesskey="{model.additionalArguments.accesskey}"
-       tabindex="{model.additionalArguments.tabindex}"
-       onclick="{model.additionalArguments.onclick}"
-
-       enctype="{model.additionalArguments.enctype}"
-       method="{model.additionalArguments.method}"
-       name="{model.additionalArguments.name}"
-       onreset="{model.additionalArguments.onreset}"
-       onsubmit="{model.additionalArguments.onsubmit}"
-
-       absolute="{model.additionalArguments.absolute}"
-       action="dispatchConfirmationButtonClick"
-       actionUri="{model.additionalArguments.actionUri}"
-       addQueryString="{model.additionalArguments.addQueryString}"
-       additionalAttributes="{model.htmlAttributes}"
-       additionalParams="{model.additionalArguments.additionalParams}"
-       arguments="{model.additionalArguments.arguments}"
-       argumentsToBeExcludedFromQueryString="{model.additionalArguments.argumentsToBeExcludedFromQueryString}"
-       controller="Frontend"
-       extensionName="Form"
-
-       format="{f:if(condition:'{model.additionalArguments.format}',then:'{model.additionalArguments.format}')}"
-       hiddenFieldClassName="{model.additionalArguments.hiddenFieldClassName}"
-
-       object="{model}"
-
-       pageType="{model.additionalArguments.pageType}"
-       pageUid="{model.additionalArguments.pageUid}"
-       pluginName="Form"
-       section="{model.additionalArguments.section}">
-
-       <f:format.raw>{model.layout.containerInnerWrap.0}</f:format.raw>
-               <f:for each="{model.childElements}" as="element">
-                       <f:render partial="{themeName}/Confirmation/{element.partialPath}" arguments="{model: element, themeName: themeName}" />
-               </f:for>
-       <f:format.raw>{model.layout.containerInnerWrap.1}</f:format.raw>
-
-       <ol>
-               <li class="csc-form-confirmation-false">
-                       <f:form.submit name="confirmation-false" value="<f:translate key='tx_form_view_confirmation.donotconfirm'/>"><f:translate key='tx_form_view_confirmation.donotconfirm'/></f:form.submit>
-               </li>
-               <li class="csc-form-confirmation-true">
-                       <f:form.submit name="confirmation-true" value="<f:translate key='tx_form_view_confirmation.confirm'/>"><f:translate key='tx_form_view_confirmation.confirm'/></f:form.submit>
-               </li>
-       </ol>
-</f:form>
\ No newline at end of file
diff --git a/typo3/sysext/form/Resources/Private/Partials/Compatibility/Confirmation/ContainerElements/Radiogroup.html b/typo3/sysext/form/Resources/Private/Partials/Compatibility/Confirmation/ContainerElements/Radiogroup.html
deleted file mode 100644 (file)
index 737ee03..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-<f:if condition="{model.additionalArguments.atLeastOneCheckedChildElement}">
-       <f:if condition="{model.showElement}">
-               <f:then>
-                       <f:if condition="{model.layout.noFieldsetTag}">
-                               <f:then>
-                                       <f:format.raw>{model.layout.elementOuterWrap.0}</f:format.raw>
-                                       <f:format.raw>{model.layout.containerInnerWrap.0}</f:format.raw>
-                                               <f:for each="{model.childElements}" as="element">
-                                                       <f:render partial="{themeName}/Confirmation/{element.partialPath}" arguments="{model: element, themeName: themeName}" />
-                                               </f:for>
-                                       <f:format.raw>{model.layout.containerInnerWrap.1}</f:format.raw>
-                                       <f:format.raw>{model.layout.elementOuterWrap.1}</f:format.raw>
-                               </f:then>
-                               <f:else>
-                                       <f:format.raw>{model.layout.elementOuterWrap.0}</f:format.raw>
-                                               <fieldset
-                                               <f:for each="{model.htmlAttributes}" as="htmAttributeValue" key="htmAttributeKey">
-                                                       {htmAttributeKey}="{htmAttributeValue}"
-                                               </f:for>
-                                               >
-                                                       <f:if condition="{model.additionalArguments.legend}">
-                                                               <legend>{model.additionalArguments.legend}</legend>
-                                                       </f:if>
-
-                                                       <f:format.raw>{model.layout.containerInnerWrap.0}</f:format.raw>
-                                                               <f:for each="{model.childElements}" as="element">
-                                                                       <f:render partial="{themeName}/Confirmation/{element.partialPath}" arguments="{model: element, themeName: themeName}" />
-                                                               </f:for>
-                                                       <f:format.raw>{model.layout.containerInnerWrap.1}</f:format.raw>
-                                               </fieldset>
-                                       <f:format.raw>{model.layout.elementOuterWrap.1}</f:format.raw>
-                               </f:else>
-                       </f:if>
-               </f:then>
-               <f:else>
-                       <f:for each="{model.childElements}" as="element">
-                               <f:render partial="{themeName}/Confirmation/{element.partialPath}" arguments="{model: element, themeName: themeName}" />
-                       </f:for>
-               </f:else>
-       </f:if>
-</f:if>
diff --git a/typo3/sysext/form/Resources/Private/Partials/Compatibility/Confirmation/FlatElements/Button.html b/typo3/sysext/form/Resources/Private/Partials/Compatibility/Confirmation/FlatElements/Button.html
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/typo3/sysext/form/Resources/Private/Partials/Compatibility/Confirmation/FlatElements/ButtonTag.html b/typo3/sysext/form/Resources/Private/Partials/Compatibility/Confirmation/FlatElements/ButtonTag.html
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/typo3/sysext/form/Resources/Private/Partials/Compatibility/Confirmation/FlatElements/Checkbox.html b/typo3/sysext/form/Resources/Private/Partials/Compatibility/Confirmation/FlatElements/Checkbox.html
deleted file mode 100644 (file)
index efc41fa..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-<f:if condition="{model.showElement}">
-       <f:if condition="{model.additionalArguments.checked} == 'checked'">
-               <f:format.raw>{model.layout.elementOuterWrap.0}</f:format.raw>
-               <f:format.raw>{model.layout.elementOuterWrap.1}</f:format.raw>
-       </f:if>
-</f:if>
-
-<f:if condition="{model.additionalArguments.checked} == 'checked'">
-       <f:if condition="{model.additionalArguments.multiple}">
-               <f:then>
-                       <f:form.hidden
-                               class="{model.additionalArguments.class}"
-                               dir="{model.additionalArguments.dir}"
-                               id="{model.additionalArguments.id}"
-                               lang="{model.additionalArguments.lang}"
-                               style="{model.additionalArguments.style}"
-                               title="{model.additionalArguments.title}"
-                               accesskey="{model.additionalArguments.accesskey}"
-                               tabindex="{model.additionalArguments.tabindex}"
-                               onclick="{model.additionalArguments.onclick}"
-
-                               name="{model.additionalArguments.prefix}[{model.additionalArguments.name}][{model.name}]"
-                               value="<f:if condition='{model.additionalArguments.value}'><f:then>{model.additionalArguments.value}</f:then><f:else>{model.additionalArguments.name}-{model.elementCounter}</f:else></f:if>"
-
-                               additionalAttributes="{model.htmlAttributes}"
-                       />
-               </f:then>
-               <f:else>
-                       <f:form.hidden
-                               class="{model.additionalArguments.class}"
-                               dir="{model.additionalArguments.dir}"
-                               id="{model.additionalArguments.id}"
-                               lang="{model.additionalArguments.lang}"
-                               style="{model.additionalArguments.style}"
-                               title="{model.additionalArguments.title}"
-                               accesskey="{model.additionalArguments.accesskey}"
-                               tabindex="{model.additionalArguments.tabindex}"
-                               onclick="{model.additionalArguments.onclick}"
-
-                               name="{model.additionalArguments.prefix}[{model.additionalArguments.name}]"
-                               value="<f:if condition='{model.additionalArguments.value}'><f:then>{model.additionalArguments.value}</f:then><f:else>{model.additionalArguments.name}-{model.elementCounter}</f:else></f:if>"
-
-                               additionalAttributes="{model.htmlAttributes}"
-                       />
-               </f:else>
-       </f:if>
-</f:if>
diff --git a/typo3/sysext/form/Resources/Private/Partials/Compatibility/Confirmation/FlatElements/ContentElement.html b/typo3/sysext/form/Resources/Private/Partials/Compatibility/Confirmation/FlatElements/ContentElement.html
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/typo3/sysext/form/Resources/Private/Partials/Compatibility/Confirmation/FlatElements/Header.html b/typo3/sysext/form/Resources/Private/Partials/Compatibility/Confirmation/FlatElements/Header.html
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/typo3/sysext/form/Resources/Private/Partials/Compatibility/Confirmation/FlatElements/Hidden.html b/typo3/sysext/form/Resources/Private/Partials/Compatibility/Confirmation/FlatElements/Hidden.html
deleted file mode 100644 (file)
index 321fe02..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-<f:form.hidden
-       class="{model.additionalArguments.class}"
-       dir="{model.additionalArguments.dir}"
-       id="{model.additionalArguments.id}"
-       lang="{model.additionalArguments.lang}"
-       style="{model.additionalArguments.style}"
-       title="{model.additionalArguments.title}"
-       accesskey="{model.additionalArguments.accesskey}"
-       tabindex="{model.additionalArguments.tabindex}"
-       onclick="{model.additionalArguments.onclick}"
-
-       name="{model.additionalArguments.prefix}[{model.additionalArguments.name}]"
-       value="{model.additionalArguments.value}"
-
-       additionalAttributes="{model.htmlAttributes}"
-/>
diff --git a/typo3/sysext/form/Resources/Private/Partials/Compatibility/Confirmation/FlatElements/Imagebutton.html b/typo3/sysext/form/Resources/Private/Partials/Compatibility/Confirmation/FlatElements/Imagebutton.html
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/typo3/sysext/form/Resources/Private/Partials/Compatibility/Confirmation/FlatElements/Input.html b/typo3/sysext/form/Resources/Private/Partials/Compatibility/Confirmation/FlatElements/Input.html
deleted file mode 100644 (file)
index 1f4cebc..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-<f:if condition="{model.showElement}">
-       <f:format.raw>{model.layout.elementOuterWrap.0}</f:format.raw>
-               {model.additionalArguments.value}
-       <f:format.raw>{model.layout.elementOuterWrap.1}</f:format.raw>
-</f:if>
-
-<f:form.hidden
-       class="{model.additionalArguments.class}"
-       dir="{model.additionalArguments.dir}"
-       id="{model.additionalArguments.id}"
-       lang="{model.additionalArguments.lang}"
-       style="{model.additionalArguments.style}"
-       title="{model.additionalArguments.title}"
-       accesskey="{model.additionalArguments.accesskey}"
-       tabindex="{model.additionalArguments.tabindex}"
-       onclick="{model.additionalArguments.onclick}"
-
-       name="{model.additionalArguments.prefix}[{model.additionalArguments.name}]"
-       value="{model.additionalArguments.value}"
-
-       additionalAttributes="{model.htmlAttributes}"
-/>
diff --git a/typo3/sysext/form/Resources/Private/Partials/Compatibility/Confirmation/FlatElements/InputTypeButton.html b/typo3/sysext/form/Resources/Private/Partials/Compatibility/Confirmation/FlatElements/InputTypeButton.html
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/typo3/sysext/form/Resources/Private/Partials/Compatibility/Confirmation/FlatElements/Password.html b/typo3/sysext/form/Resources/Private/Partials/Compatibility/Confirmation/FlatElements/Password.html
deleted file mode 100644 (file)
index f7e3d8c..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-<f:form.hidden
-       class="{model.additionalArguments.class}"
-       dir="{model.additionalArguments.dir}"
-       id="{model.additionalArguments.id}"
-       lang="{model.additionalArguments.lang}"
-       style="{model.additionalArguments.style}"
-       title="{model.additionalArguments.title}"
-       accesskey="{model.additionalArguments.accesskey}"
-       tabindex="{model.additionalArguments.tabindex}"
-       onclick="{model.additionalArguments.onclick}"
-
-       name="{model.additionalArguments.prefix}[{model.additionalArguments.name}]"
-       value="{model.additionalArguments.value}"
-
-       additionalAttributes="{model.htmlAttributes}"
-/>
\ No newline at end of file
diff --git a/typo3/sysext/form/Resources/Private/Partials/Compatibility/Confirmation/FlatElements/Radio.html b/typo3/sysext/form/Resources/Private/Partials/Compatibility/Confirmation/FlatElements/Radio.html
deleted file mode 100644 (file)
index 97e6dcc..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-<f:if condition="{model.showElement}">
-       <f:if condition="{model.additionalArguments.checked} == 'checked'">
-               <f:format.raw>{model.layout.elementOuterWrap.0}</f:format.raw>
-               <f:format.raw>{model.layout.elementOuterWrap.1}</f:format.raw>
-       </f:if>
-</f:if>
-
-<f:if condition="{model.additionalArguments.checked} == 'checked'">
-       <f:form.hidden
-               class="{model.additionalArguments.class}"
-               dir="{model.additionalArguments.dir}"
-               id="{model.additionalArguments.id}"
-               lang="{model.additionalArguments.lang}"
-               style="{model.additionalArguments.style}"
-               title="{model.additionalArguments.title}"
-               accesskey="{model.additionalArguments.accesskey}"
-               tabindex="{model.additionalArguments.tabindex}"
-               onclick="{model.additionalArguments.onclick}"
-
-               name="{model.additionalArguments.prefix}[{model.additionalArguments.name}]"
-               value="<f:if condition='{model.additionalArguments.value}'><f:then>{model.additionalArguments.value}</f:then><f:else>{model.additionalArguments.name}-{model.elementCounter}</f:else></f:if>"
-
-               additionalAttributes="{model.htmlAttributes}"
-       />
-</f:if>
diff --git a/typo3/sysext/form/Resources/Private/Partials/Compatibility/Confirmation/FlatElements/Reset.html b/typo3/sysext/form/Resources/Private/Partials/Compatibility/Confirmation/FlatElements/Reset.html
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/typo3/sysext/form/Resources/Private/Partials/Compatibility/Confirmation/FlatElements/Select.html b/typo3/sysext/form/Resources/Private/Partials/Compatibility/Confirmation/FlatElements/Select.html
deleted file mode 100644 (file)
index a2391a1..0000000
+++ /dev/null
@@ -1,106 +0,0 @@
-{namespace form=TYPO3\CMS\Form\ViewHelpers}
-
-<f:if condition="{model.showElement}">
-       <f:format.raw>{model.layout.elementOuterWrap.0}</f:format.raw>
-               <ol>
-</f:if>
-               <f:for each="{form:aggregateSelectOptions(model:model)}" as="option">
-                       <f:if condition="{option.options}">
-                               <f:then>
-                                               <f:for each="{option.options}" as="optgroupOption">
-                                                       <f:if condition="{optgroupOption.selected}">
-                                                               <f:if condition="{model.showElement}">
-                                                                       <f:format.raw>{model.layout.optionOuterWrap.0}</f:format.raw>{optgroupOption.label}<f:format.raw>{model.layout.optionOuterWrap.1}</f:format.raw>
-                                                               </f:if>
-                                                               <f:if condition="{model.additionalArguments.multiple}">
-                                                                       <f:then>
-                                                                               <f:form.hidden
-                                                                                       class="{model.additionalArguments.class}"
-                                                                                       dir="{model.additionalArguments.dir}"
-                                                                                       id="{model.additionalArguments.id}"
-                                                                                       lang="{model.additionalArguments.lang}"
-                                                                                       style="{model.additionalArguments.style}"
-                                                                                       title="{model.additionalArguments.title}"
-                                                                                       accesskey="{model.additionalArguments.accesskey}"
-                                                                                       tabindex="{model.additionalArguments.tabindex}"
-                                                                                       onclick="{model.additionalArguments.onclick}"
-
-                                                                                       name="{model.additionalArguments.prefix}[{model.additionalArguments.name}][]"
-                                                                                       value="{option.value}"
-
-                                                                                       additionalAttributes="{model.htmlAttributes}"
-                                                                               />
-                                                                       </f:then>
-                                                                       <f:else>
-                                                                               <f:form.hidden
-                                                                                       class="{model.additionalArguments.class}"
-                                                                                       dir="{model.additionalArguments.dir}"
-                                                                                       id="{model.additionalArguments.id}"
-                                                                                       lang="{model.additionalArguments.lang}"
-                                                                                       style="{model.additionalArguments.style}"
-                                                                                       title="{model.additionalArguments.title}"
-                                                                                       accesskey="{model.additionalArguments.accesskey}"
-                                                                                       tabindex="{model.additionalArguments.tabindex}"
-                                                                                       onclick="{model.additionalArguments.onclick}"
-
-                                                                                       name="{model.additionalArguments.prefix}[{model.additionalArguments.name}]"
-                                                                                       value="{option.value}"
-
-                                                                                       additionalAttributes="{model.htmlAttributes}"
-                                                                               />
-                                                                       </f:else>
-                                                               </f:if>
-                                                       </f:if>
-                                               </f:for>
-                               </f:then>
-                               <f:else>
-                                       <f:if condition="{option.selected}">
-                                               <f:if condition="{model.showElement}">
-                                                       <f:format.raw>{model.layout.optionOuterWrap.0}</f:format.raw>{option.label}<f:format.raw>{model.layout.optionOuterWrap.1}</f:format.raw>
-                                               </f:if>
-                                               <f:if condition="{model.additionalArguments.multiple}">
-                                                       <f:then>
-                                                               <f:form.hidden
-                                                                       class="{model.additionalArguments.class}"
-                                                                       dir="{model.additionalArguments.dir}"
-                                                                       id="{model.additionalArguments.id}"
-                                                                       lang="{model.additionalArguments.lang}"
-                                                                       style="{model.additionalArguments.style}"
-                                                                       title="{model.additionalArguments.title}"
-                                                                       accesskey="{model.additionalArguments.accesskey}"
-                                                                       tabindex="{model.additionalArguments.tabindex}"
-                                                                       onclick="{model.additionalArguments.onclick}"
-
-                                                                       name="{model.additionalArguments.prefix}[{model.additionalArguments.name}][]"
-                                                                       value="{option.value}"
-
-                                                                       additionalAttributes="{model.htmlAttributes}"
-                                                               />
-                                                       </f:then>
-                                                       <f:else>
-                                                               <f:form.hidden
-                                                                       class="{model.additionalArguments.class}"
-                                                                       dir="{model.additionalArguments.dir}"
-                                                                       id="{model.additionalArguments.id}"
-                                                                       lang="{model.additionalArguments.lang}"
-                                                                       style="{model.additionalArguments.style}"
-                                                                       title="{model.additionalArguments.title}"
-                                                                       accesskey="{model.additionalArguments.accesskey}"
-                                                                       tabindex="{model.additionalArguments.tabindex}"
-                                                                       onclick="{model.additionalArguments.onclick}"
-
-                                                                       name="{model.additionalArguments.prefix}[{model.additionalArguments.name}]"
-                                                                       value="{option.value}"
-
-                                                                       additionalAttributes="{model.htmlAttributes}"
-                                                               />
-                                                       </f:else>
-                                               </f:if>
-                                       </f:if>
-                               </f:else>
-                       </f:if>
-               </f:for>
-<f:if condition="{model.showElement}">
-               </ol>
-       <f:format.raw>{model.layout.elementOuterWrap.1}</f:format.raw>
-</f:if>
\ No newline at end of file
diff --git a/typo3/sysext/form/Resources/Private/Partials/Compatibility/Confirmation/FlatElements/Submit.html b/typo3/sysext/form/Resources/Private/Partials/Compatibility/Confirmation/FlatElements/Submit.html
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/typo3/sysext/form/Resources/Private/Partials/Compatibility/Confirmation/FlatElements/Textarea.html b/typo3/sysext/form/Resources/Private/Partials/Compatibility/Confirmation/FlatElements/Textarea.html
deleted file mode 100644 (file)
index b7bda7c..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-<f:if condition="{model.showElement}">
-       <f:format.raw>{model.layout.elementOuterWrap.0}</f:format.raw>
-       {model.additionalArguments.text}
-       <f:format.raw>{model.layout.elementOuterWrap.1}</f:format.raw>
-</f:if>
-
-<f:form.hidden
-       class="{model.additionalArguments.class}"
-       dir="{model.additionalArguments.dir}"
-       id="{model.additionalArguments.id}"
-       lang="{model.additionalArguments.lang}"
-       style="{model.additionalArguments.style}"
-       title="{model.additionalArguments.title}"
-       accesskey="{model.additionalArguments.accesskey}"
-       tabindex="{model.additionalArguments.tabindex}"
-       onclick="{model.additionalArguments.onclick}"
-
-       name="{model.additionalArguments.prefix}[{model.additionalArguments.name}]"
-       value="{model.additionalArguments.text}"
-
-       additionalAttributes="{model.htmlAttributes}"
-/>
diff --git a/typo3/sysext/form/Resources/Private/Partials/Compatibility/Confirmation/FlatElements/Textblock.html b/typo3/sysext/form/Resources/Private/Partials/Compatibility/Confirmation/FlatElements/Textblock.html
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/typo3/sysext/form/Resources/Private/Partials/Compatibility/Confirmation/FlatElements/Textfield.html b/typo3/sysext/form/Resources/Private/Partials/Compatibility/Confirmation/FlatElements/Textfield.html
deleted file mode 100644 (file)
index 4c4bab2..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-<f:if condition="{model.showElement}">
-       <f:format.raw>{model.layout.elementOuterWrap.0}</f:format.raw>
-       {model.additionalArguments.value}
-       <f:format.raw>{model.layout.elementOuterWrap.1}</f:format.raw>
-</f:if>
-
-<f:form.hidden
-       class="{model.additionalArguments.class}"
-       dir="{model.additionalArguments.dir}"
-       id="{model.additionalArguments.id}"
-       lang="{model.additionalArguments.lang}"
-       style="{model.additionalArguments.style}"
-       title="{model.additionalArguments.title}"
-       accesskey="{model.additionalArguments.accesskey}"
-       tabindex="{model.additionalArguments.tabindex}"
-       onclick="{model.additionalArguments.onclick}"
-
-       name="{model.additionalArguments.prefix}[{model.additionalArguments.name}]"
-       value="{model.additionalArguments.value}"
-
-       additionalAttributes="{model.htmlAttributes}"
-/>
diff --git a/typo3/sysext/form/Resources/Private/Partials/Compatibility/Confirmation/FlatElements/Upload.html b/typo3/sysext/form/Resources/Private/Partials/Compatibility/Confirmation/FlatElements/Upload.html
deleted file mode 100644 (file)
index 9837361..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-<f:if condition="{model.showElement}">
-       <f:format.raw>{model.layout.elementOuterWrap.0}</f:format.raw>
-       <f:for each="{model.additionalArguments.uploadedFiles}" as="uploadedFile">
-               {uploadedFile.name}<br />
-       </f:for>
-       <f:format.raw>{model.layout.elementOuterWrap.1}</f:format.raw>
-</f:if>
diff --git a/typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Html/ContainerElements/Checkboxgroup.html b/typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Html/ContainerElements/Checkboxgroup.html
deleted file mode 100644 (file)
index 132e686..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-<f:if condition="{model.additionalArguments.atLeastOneCheckedChildElement}">
-       <f:if condition="{model.showElement}">
-               <f:then>
-                       <f:format.raw>{model.layout.elementOuterWrap.0}</f:format.raw>
-                       <f:format.raw>{model.layout.containerInnerWrap.0}</f:format.raw>
-                               <f:for each="{model.childElements}" as="element">
-                                       <f:render partial="{element.partialPath}" arguments="{model: element}" />
-                               </f:for>
-                       <f:format.raw>{model.layout.containerInnerWrap.1}</f:format.raw>
-                       <f:format.raw>{model.layout.elementOuterWrap.1}</f:format.raw>
-               </f:then>
-               <f:else>
-                       <f:for each="{model.childElements}" as="element">
-                               <f:render partial="{element.partialPath}" arguments="{model: element}" />
-                       </f:for>
-               </f:else>
-       </f:if>
-</f:if>
\ No newline at end of file
diff --git a/typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Html/ContainerElements/Fieldset.html b/typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Html/ContainerElements/Fieldset.html
deleted file mode 100644 (file)
index b3be1fb..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-<f:if condition="{model.childElements.0}">
-       <f:if condition="{model.showElement}">
-               <f:then>
-                       <f:format.raw>{model.layout.elementOuterWrap.0}</f:format.raw>
-                       <f:format.raw>{model.layout.containerInnerWrap.0}</f:format.raw>
-                               <f:for each="{model.childElements}" as="element">
-                                       <f:render partial="{element.partialPath}" arguments="{model: element}" />
-                               </f:for>
-                       <f:format.raw>{model.layout.containerInnerWrap.1}</f:format.raw>
-                       <f:format.raw>{model.layout.elementOuterWrap.1}</f:format.raw>
-               </f:then>
-               <f:else>
-                       <f:for each="{model.childElements}" as="element">
-                               <f:render partial="{element.partialPath}" arguments="{model: element}" />
-                       </f:for>
-               </f:else>
-       </f:if>
-</f:if>
\ No newline at end of file
diff --git a/typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Html/ContainerElements/Form.html b/typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Html/ContainerElements/Form.html
deleted file mode 100644 (file)
index 2113e67..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-<f:format.raw>{model.layout.containerInnerWrap.0}</f:format.raw>
-<f:for each="{model.childElements}" as="element">
-       <f:render partial="{element.partialPath}" arguments="{model: element}" />
-</f:for>
-<f:format.raw>{model.layout.containerInnerWrap.1}</f:format.raw>
\ No newline at end of file
diff --git a/typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Html/ContainerElements/Radiogroup.html b/typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Html/ContainerElements/Radiogroup.html
deleted file mode 100644 (file)
index 132e686..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-<f:if condition="{model.additionalArguments.atLeastOneCheckedChildElement}">
-       <f:if condition="{model.showElement}">
-               <f:then>
-                       <f:format.raw>{model.layout.elementOuterWrap.0}</f:format.raw>
-                       <f:format.raw>{model.layout.containerInnerWrap.0}</f:format.raw>
-                               <f:for each="{model.childElements}" as="element">
-                                       <f:render partial="{element.partialPath}" arguments="{model: element}" />
-                               </f:for>
-                       <f:format.raw>{model.layout.containerInnerWrap.1}</f:format.raw>
-                       <f:format.raw>{model.layout.elementOuterWrap.1}</f:format.raw>
-               </f:then>
-               <f:else>
-                       <f:for each="{model.childElements}" as="element">
-                               <f:render partial="{element.partialPath}" arguments="{model: element}" />
-                       </f:for>
-               </f:else>
-       </f:if>
-</f:if>
\ No newline at end of file
diff --git a/typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Html/FlatElements/Button.html b/typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Html/FlatElements/Button.html
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Html/FlatElements/ButtonTag.html b/typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Html/FlatElements/ButtonTag.html
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Html/FlatElements/Checkbox.html b/typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Html/FlatElements/Checkbox.html
deleted file mode 100644 (file)
index f9f417a..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-<f:if condition="{model.showElement}">
-       <f:if condition="{model.additionalArguments.checked} == 'checked'">
-               <f:format.raw>{model.layout.elementOuterWrap.0}</f:format.raw>
-               <f:format.raw>{model.layout.elementOuterWrap.1}</f:format.raw>
-       </f:if>
-</f:if>
\ No newline at end of file
diff --git a/typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Html/FlatElements/ContentElement.html b/typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Html/FlatElements/ContentElement.html
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Html/FlatElements/Header.html b/typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Html/FlatElements/Header.html
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Html/FlatElements/Hidden.html b/typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Html/FlatElements/Hidden.html
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Html/FlatElements/Imagebutton.html b/typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Html/FlatElements/Imagebutton.html
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Html/FlatElements/Input.html b/typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Html/FlatElements/Input.html
deleted file mode 100644 (file)
index 131deb0..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-<f:if condition="{model.showElement}">
-       <f:format.raw>{model.layout.elementOuterWrap.0}</f:format.raw>
-               {model.additionalArguments.value}
-       <f:format.raw>{model.layout.elementOuterWrap.1}</f:format.raw>
-</f:if>
diff --git a/typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Html/FlatElements/InputTypeButton.html b/typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Html/FlatElements/InputTypeButton.html
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Html/FlatElements/Password.html b/typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Html/FlatElements/Password.html
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Html/FlatElements/Radio.html b/typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Html/FlatElements/Radio.html
deleted file mode 100644 (file)
index f9f417a..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-<f:if condition="{model.showElement}">
-       <f:if condition="{model.additionalArguments.checked} == 'checked'">
-               <f:format.raw>{model.layout.elementOuterWrap.0}</f:format.raw>
-               <f:format.raw>{model.layout.elementOuterWrap.1}</f:format.raw>
-       </f:if>
-</f:if>
\ No newline at end of file
diff --git a/typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Html/FlatElements/Reset.html b/typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Html/FlatElements/Reset.html
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Html/FlatElements/Select.html b/typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Html/FlatElements/Select.html
deleted file mode 100644 (file)
index 5b25ee9..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-{namespace form=TYPO3\CMS\Form\ViewHelpers}
-<f:if condition="{model.showElement}">
-       <f:format.raw>{model.layout.elementOuterWrap.0}</f:format.raw>
-
-       <f:for each="<form:aggregateSelectOptions model='{model}' />" as="option">
-               <f:if condition="{option.options}">
-                       <f:then>
-                               <f:for each="{option.options}" as="optgroupOption">
-                                       <f:if condition="{optgroupOption.selected} == 'selected'">
-                                               <f:format.raw>{model.layout.optionOuterWrap.0}</f:format.raw>{optgroupOption.label}<f:format.raw>{model.layout.optionOuterWrap.1}</f:format.raw>
-                                       </f:if>
-                               </f:for>
-                       </f:then>
-                       <f:else>
-                               <f:if condition="{option.selected} == 'selected'">
-                                       <f:format.raw>{model.layout.optionOuterWrap.0}</f:format.raw>{option.label}<f:format.raw>{model.layout.optionOuterWrap.1}</f:format.raw>
-                               </f:if>
-                       </f:else>
-               </f:if>
-       </f:for>
-
-       <f:format.raw>{model.layout.elementOuterWrap.1}</f:format.raw>
-</f:if>
diff --git a/typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Html/FlatElements/Submit.html b/typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Html/FlatElements/Submit.html
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Html/FlatElements/Textarea.html b/typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Html/FlatElements/Textarea.html
deleted file mode 100644 (file)
index b18af10..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-<f:if condition="{model.showElement}">
-       <f:format.raw>{model.layout.elementOuterWrap.0}</f:format.raw>
-               {model.additionalArguments.text}
-       <f:format.raw>{model.layout.elementOuterWrap.1}</f:format.raw>
-</f:if>
\ No newline at end of file
diff --git a/typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Html/FlatElements/Textblock.html b/typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Html/FlatElements/Textblock.html
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Html/FlatElements/Textfield.html b/typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Html/FlatElements/Textfield.html
deleted file mode 100644 (file)
index 131deb0..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-<f:if condition="{model.showElement}">
-       <f:format.raw>{model.layout.elementOuterWrap.0}</f:format.raw>
-               {model.additionalArguments.value}
-       <f:format.raw>{model.layout.elementOuterWrap.1}</f:format.raw>
-</f:if>
diff --git a/typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Html/FlatElements/Upload.html b/typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Html/FlatElements/Upload.html
deleted file mode 100644 (file)
index 4e29340..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-<f:if condition="{model.showElement}">
-       <f:format.raw>{model.layout.elementOuterWrap.0}</f:format.raw>
-               <f:for each="{model.additionalArguments.uploadedFiles}" as="uploadedFile">{uploadedFile.name}<br /></f:for>
-       <f:format.raw>{model.layout.elementOuterWrap.1}</f:format.raw>
-</f:if>
diff --git a/typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Plain/ContainerElements/Checkboxgroup.html b/typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Plain/ContainerElements/Checkboxgroup.html
deleted file mode 100644 (file)
index 2a2a5e6..0000000
+++ /dev/null
@@ -1 +0,0 @@
-{namespace form=TYPO3\CMS\Form\ViewHelpers}<f:if condition="{model.additionalArguments.atLeastOneCheckedChildElement}"><f:if condition="{model.showElement}"><f:then><form:plainMail labelContent="{model}" newLineAfterLabel="1" indent="4" /><f:for each="{model.childElements}" as="element"><f:render partial="{element.partialPath}" arguments="{model: element}" /></f:for><form:plainMail indent="-4"/></f:then><f:else><f:for each="{model.childElements}" as="element"><f:render partial="{element.partialPath}" arguments="{model: element}" /></f:for></f:else></f:if></f:if>
\ No newline at end of file
diff --git a/typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Plain/ContainerElements/Fieldset.html b/typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Plain/ContainerElements/Fieldset.html
deleted file mode 100644 (file)
index 7bfa283..0000000
+++ /dev/null
@@ -1 +0,0 @@
-{namespace form=TYPO3\CMS\Form\ViewHelpers}<f:if condition="{model.childElements.0}"><f:if condition="{model.showElement}"><f:then><form:plainMail labelContent="{model}" newLineAfterLabel="1" indent="4" /><f:for each="{model.childElements}" as="element"><f:render partial="{element.partialPath}" arguments="{model: element}" /></f:for><form:plainMail indent="-4"/></f:then><f:else><f:for each="{model.childElements}" as="element"><f:render partial="{element.partialPath}" arguments="{model: element}" /></f:for></f:else></f:if></f:if>
\ No newline at end of file
diff --git a/typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Plain/ContainerElements/Form.html b/typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Plain/ContainerElements/Form.html
deleted file mode 100644 (file)
index 4a71b60..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-{namespace form=TYPO3\CMS\Form\ViewHelpers}
-<form:plainMail content="{model}" /><f:for each="{model.childElements}" as="element"><f:render partial="{element.partialPath}" arguments="{model: element}" /></f:for>
\ No newline at end of file
diff --git a/typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Plain/ContainerElements/Radiogroup.html b/typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Plain/ContainerElements/Radiogroup.html
deleted file mode 100644 (file)
index 2a2a5e6..0000000
+++ /dev/null
@@ -1 +0,0 @@
-{namespace form=TYPO3\CMS\Form\ViewHelpers}<f:if condition="{model.additionalArguments.atLeastOneCheckedChildElement}"><f:if condition="{model.showElement}"><f:then><form:plainMail labelContent="{model}" newLineAfterLabel="1" indent="4" /><f:for each="{model.childElements}" as="element"><f:render partial="{element.partialPath}" arguments="{model: element}" /></f:for><form:plainMail indent="-4"/></f:then><f:else><f:for each="{model.childElements}" as="element"><f:render partial="{element.partialPath}" arguments="{model: element}" /></f:for></f:else></f:if></f:if>
\ No newline at end of file
diff --git a/typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Plain/FlatElements/Button.html b/typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Plain/FlatElements/Button.html
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Plain/FlatElements/ButtonTag.html b/typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Plain/FlatElements/ButtonTag.html
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Plain/FlatElements/Checkbox.html b/typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Plain/FlatElements/Checkbox.html
deleted file mode 100644 (file)
index 53327c2..0000000
+++ /dev/null
@@ -1 +0,0 @@
-{namespace form=TYPO3\CMS\Form\ViewHelpers}<f:if condition="{model.showElement}"><f:if condition="{model.additionalArguments.checked} == 'checked'"><form:plainMail labelContent="{model}" newLineAfterLabel="1" /></f:if></f:if>
\ No newline at end of file
diff --git a/typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Plain/FlatElements/ContentElement.html b/typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Plain/FlatElements/ContentElement.html
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Plain/FlatElements/Header.html b/typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Plain/FlatElements/Header.html
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Plain/FlatElements/Hidden.html b/typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Plain/FlatElements/Hidden.html
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Plain/FlatElements/Imagebutton.html b/typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Plain/FlatElements/Imagebutton.html
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Plain/FlatElements/Input.html b/typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Plain/FlatElements/Input.html
deleted file mode 100644 (file)
index 7667630..0000000
+++ /dev/null
@@ -1 +0,0 @@
-{namespace form=TYPO3\CMS\Form\ViewHelpers}<f:if condition="{model.showElement}"><form:plainMail labelContent="{model}" content="{model}" /></f:if>
diff --git a/typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Plain/FlatElements/InputTypeButton.html b/typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Plain/FlatElements/InputTypeButton.html
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Plain/FlatElements/Password.html b/typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Plain/FlatElements/Password.html
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Plain/FlatElements/Radio.html b/typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Plain/FlatElements/Radio.html
deleted file mode 100644 (file)
index 051749e..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-{namespace form=TYPO3\CMS\Form\ViewHelpers}<f:if condition="{model.showElement}"><f:if condition="{model.additionalArguments.checked} == 'checked'"><form:plainMail labelContent="{model}" />
-</f:if></f:if>
\ No newline at end of file
diff --git a/typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Plain/FlatElements/Reset.html b/typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Plain/FlatElements/Reset.html
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Plain/FlatElements/Select.html b/typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Plain/FlatElements/Select.html
deleted file mode 100644 (file)
index 122c866..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-{namespace form=TYPO3\CMS\Form\ViewHelpers}<f:if condition="{model.showElement}"><form:plainMail labelContent="{model}" newLineAfterLabel="1" indent="4" /><f:for each="{form:aggregateSelectOptions(model:model)}" as="option"><f:if condition="{option.options}"><f:then><f:for each="{option.options}" as="optgroupOption"><f:if condition="{optgroupOption.selected}"><form:plainMail content="{optgroupOption.label}" />
-</f:if></f:for></f:then><f:else><f:if condition="{option.selected}"><form:plainMail content="{option.label}" />
-</f:if></f:else></f:if></f:for><form:plainMail indent="-4"/></f:if>
\ No newline at end of file
diff --git a/typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Plain/FlatElements/Submit.html b/typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Plain/FlatElements/Submit.html
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Plain/FlatElements/Textarea.html b/typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Plain/FlatElements/Textarea.html
deleted file mode 100644 (file)
index 5c6ea67..0000000
+++ /dev/null
@@ -1 +0,0 @@
-{namespace form=TYPO3\CMS\Form\ViewHelpers}<f:if condition="{model.showElement}"><form:plainMail labelContent="{model}" content="{model.additionalArguments.text}" newLineAfterLabel="1" indent="4" /><form:plainMail indent="-4" /></f:if>
diff --git a/typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Plain/FlatElements/Textblock.html b/typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Plain/FlatElements/Textblock.html
deleted file mode 100644 (file)
index e69de29..0000000
diff --git a/typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Plain/FlatElements/Textfield.html b/typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Plain/FlatElements/Textfield.html
deleted file mode 100644 (file)
index 7667630..0000000
+++ /dev/null
@@ -1 +0,0 @@
-{namespace form=TYPO3\CMS\Form\ViewHelpers}<f:if condition="{model.showElement}"><form:plainMail labelContent="{model}" content="{model}" /></f:if>
diff --git a/typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Plain/FlatElements/Upload.html b/typo3/sysext/form/Resources/Private/Partials/Compatibility/PostProcessor/Mail/Plain/FlatElements/Upload.html
deleted file mode 100644 (file)
index bb95731..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-{namespace form=TYPO3\CMS\Form\ViewHelpers}<f:if condition="{model.showElement}"><form:plainMail labelContent="{model}" newLineAfterLabel="1" indent="4" /><f:for each="{model.additionalArguments.uploadedFiles}" as="uploadedFile"><form:plainMail content="{uploadedFile.name}" />
-</f:for><form:plainMail indent="-4"/></f:if>
\ No newline at end of file
diff --git a/typo3/sysext/form/Resources/Private/Partials/Compatibility/Show/ContainerElements/Checkboxgroup.html b/typo3/sysext/form/Resources/Private/Partials/Compatibility/Show/ContainerElements/Checkboxgroup.html
deleted file mode 100644 (file)
index 9b02383..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-<f:if condition="{model.showElement}">
-       <f:then>
-               <f:if condition="{model.layout.noFieldsetTag}">
-                       <f:then>
-                               <f:format.raw>{model.layout.elementOuterWrap.0}</f:format.raw>
-                               <f:format.raw>{model.layout.containerInnerWrap.0}</f:format.raw>
-                                       <f:for each="{model.childElements}" as="element">
-                                               <f:render partial="{themeName}/Show/{element.partialPath}" arguments="{model: element, themeName: themeName}" />
-                                       </f:for>
-                               <f:format.raw>{model.layout.containerInnerWrap.1}</f:format.raw>
-                               <f:format.raw>{model.layout.elementOuterWrap.1}</f:format.raw>
-                       </f:then>
-                       <f:else>
-                               <f:format.raw>{model.layout.elementOuterWrap.0}</f:format.raw>
-                                       <fieldset
-                                       <f:for each="{model.htmlAttributes}" as="htmAttributeValue" key="htmAttributeKey">
-                                               {htmAttributeKey}="{htmAttributeValue}"
-                                       </f:for>
-                                       >
-                                               <f:if condition="{model.layout.legend}">
-                                                       <f:format.raw>{model.layout.legend}</f:format.raw>
-                                               </f:if>
-
-                                               <f:format.raw>{model.layout.containerInnerWrap.0}</f:format.raw>
-                                                       <f:for each="{model.childElements}" as="element">
-                                                               <f:render partial="{themeName}/Show/{element.partialPath}" arguments="{model: element, themeName: themeName}" />
-                                                       </f:for>
-                                               <f:format.raw>{model.layout.containerInnerWrap.1}</f:format.raw>
-                                       </fieldset>
-                               <f:format.raw>{model.layout.elementOuterWrap.1}</f:format.raw>
-                       </f:else>
-               </f:if>
-       </f:then>
-       <f:else>
-               <f:for each="{model.childElements}" as="element">
-                       <f:render partial="{themeName}/Show/{element.partialPath}" arguments="{model: element, themeName: themeName}" />
-               </f:for>
-       </f:else>
-</f:if>
diff --git a/typo3/sysext/form/Resources/Private/Partials/Compatibility/Show/ContainerElements/Fieldset.html b/typo3/sysext/form/Resources/Private/Partials/Compatibility/Show/ContainerElements/Fieldset.html
deleted file mode 100644 (file)
index 967bf83..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-<f:if condition="{model.showElement}">
-       <f:then>
-               <f:if condition="{model.layout.noFieldsetTag}">
-                       <f:then>
-                               <f:format.raw>{model.layout.elementOuterWrap.0}</f:format.raw>
-                               <f:format.raw>{model.layout.containerInnerWrap.0}</f:format.raw>
-                                       <f:for each="{model.childElements}" as="element">
-                                               <f:render partial="{themeName}/Show/{element.partialPath}" arguments="{model: element, themeName: themeName}" />
-                                       </f:for>
-                               <f:format.raw>{model.layout.containerInnerWrap.1}</f:format.raw>
-                               <f:format.raw>{model.layout.elementOuterWrap.1}</f:format.raw>
-                       </f:then>
-                       <f:else>
-                               <f:format.raw>{model.layout.elementOuterWrap.0}</f:format.raw>
-                                       <fieldset
-                                       <f:for each="{model.htmlAttributes}" as="htmAttributeValue" key="htmAttributeKey">
-                                               {htmAttributeKey}="{htmAttributeValue}"
-                                       </f:for>
-                                       >
-                                               <f:if condition="{model.additionalArguments.legend}">
-                                                       <legend>{model.additionalArguments.legend}</legend>
-                                               </f:if>
-
-                                               <f:format.raw>{model.layout.containerInnerWrap.0}</f:format.raw>
-                                                       <f:for each="{model.childElements}" as="element">
-                                                               <f:render partial="{themeName}/Show/{element.partialPath}" arguments="{model: element, themeName: themeName}" />
-                                                       </f:for>
-                                               <f:format.raw>{model.layout.containerInnerWrap.1}</f:format.raw>
-                                       </fieldset>
-                               <f:format.raw>{model.layout.elementOuterWrap.1}</f:format.raw>
-                       </f:else>
-               </f:if>
-       </f:then>
-       <f:else>
-               <f:for each="{model.childElements}" as="element">
-                       <f:render partial="{themeName}/Show/{element.partialPath}" arguments="{model: element, themeName: themeName}" />
-               </f:for>
-       </f:else>
-</f:if>
\ No newline at end of file
diff --git a/typo3/sysext/form/Resources/Private/Partials/Compatibility/Show/ContainerElements/Form.html b/typo3/sysext/form/Resources/Private/Partials/Compatibility/Show/ContainerElements/Form.html
deleted file mode 100644 (file)
index 0492b45..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-<f:form
-       class="{model.additionalArguments.class}"
-       dir="{model.additionalArguments.dir}"
-       id="{model.additionalArguments.id}"
-       lang="{model.additionalArguments.lang}"
-       style="{model.additionalArguments.style}"
-       title="{model.additionalArguments.title}"
-       accesskey="{model.additionalArguments.accesskey}"
-       tabindex="{model.additionalArguments.tabindex}"
-       onclick="{model.additionalArguments.onclick}"
-
-       enctype="{model.additionalArguments.enctype}"
-       method="{model.additionalArguments.method}"
-       name="{model.additionalArguments.name}"
-       onreset="{model.additionalArguments.onreset}"
-       onsubmit="{model.additionalArguments.onsubmit}"
-
-       absolute="{model.additionalArguments.absolute}"
-       action="{model.additionalArguments.action}"
-       actionUri="{model.additionalArguments.actionUri}"
-       addQueryString="{model.additionalArguments.addQueryString}"
-       additionalAttributes="{model.htmlAttributes}"
-       additionalParams="{model.additionalArguments.additionalParams}"
-       arguments="{model.additionalArguments.arguments}"
-       argumentsToBeExcludedFromQueryString="{model.additionalArguments.argumentsToBeExcludedFromQueryString}"
-       controller="{model.additionalArguments.controller}"
-       extensionName="{model.additionalArguments.extensionName}"
-
-       format="{f:if(condition:'{model.additionalArguments.format}',then:'{model.additionalArguments.format}')}"
-       hiddenFieldClassName="{model.additionalArguments.hiddenFieldClassName}"
-
-       object="{model}"
-
-       pageType="{model.additionalArguments.pageType}"
-       pageUid="{model.additionalArguments.pageUid}"
-       pluginName="{model.additionalArguments.pluginName}"
-       section="{model.additionalArguments.section}">
-
-       <f:format.raw>{model.layout.containerInnerWrap.0}</f:format.raw>
-               <f:for each="{model.childElements}" as="element">
-                       <f:render partial="{themeName}/Show/{element.partialPath}" arguments="{model: element, themeName: themeName}" />
-               </f:for>
-       <f:format.raw>{model.layout.containerInnerWrap.1}</f:format.raw>
-</f:form>
diff --git a/typo3/sysext/form/Resources/Private/Partials/Compatibility/Show/ContainerElements/Radiogroup.html b/typo3/sysext/form/Resources/Private/Partials/Compatibility/Show/ContainerElements/Radiogroup.html
deleted file mode 100644 (file)
index 9b02383..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-<f:if condition="{model.showElement}">
-       <f:then>
-               <f:if condition="{model.layout.noFieldsetTag}">
-                       <f:then>
-                               <f:format.raw>{model.layout.elementOuterWrap.0}</f:format.raw>
-                               <f:format.raw>{model.layout.containerInnerWrap.0}</f:format.raw>
-                                       <f:for each="{model.childElements}" as="element">
-                                               <f:render partial="{themeName}/Show/{element.partialPath}" arguments="{model: element, themeName: themeName}" />
-                                       </f:for>
-                               <f:format.raw>{model.layout.containerInnerWrap.1}</f:format.raw>
-                               <f:format.raw>{model.layout.elementOuterWrap.1}</f:format.raw>
-                       </f:then>
-                       <f:else>
-                               <f:format.raw>{model.layout.elementOuterWrap.0}</f:format.raw>
-                                       <fieldset
-                                       <f:for each="{model.htmlAttributes}" as="htmAttributeValue" key="htmAttributeKey">
-                                               {htmAttributeKey}="{htmAttributeValue}"
-                                       </f:for>
-                                       >
-                                               <f:if condition="{model.layout.legend}">
-                                                       <f:format.raw>{model.layout.legend}</f:format.raw>
-                                               </f:if>
-
-                                               <f:format.raw>{model.layout.containerInnerWrap.0}</f:format.raw>
-                                                       <f:for each="{model.childElements}" as="element">
-                                                               <f:render partial="{themeName}/Show/{element.partialPath}" arguments="{model: element, themeName: themeName}" />
-                                                       </f:for>
-                                               <f:format.raw>{model.layout.containerInnerWrap.1}</f:format.raw>
-                                       </fieldset>
-                               <f:format.raw>{model.layout.elementOuterWrap.1}</f:format.raw>
-                       </f:else>
-               </f:if>
-       </f:then>
-       <f:else>
-               <f:for each="{model.childElements}" as="element">
-                       <f:render partial="{themeName}/Show/{element.partialPath}" arguments="{model: element, themeName: themeName}" />
-               </f:for>
-       </f:else>
-</f:if>
diff --git a/typo3/sysext/form/Resources/Private/Partials/Compatibility/Show/FlatElements/Button.html b/typo3/sysext/form/Resources/Private/Partials/Compatibility/Show/FlatElements/Button.html
deleted file mode 100644 (file)
index 36369a2..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-<f:if condition="{model.showElement}">
-       <f:format.raw>{model.layout.elementOuterWrap.0}</f:format.raw>
-               <f:form.button
-                       class="{model.additionalArguments.class}"
-                       dir="{model.additionalArguments.dir}"
-                       id="{model.additionalArguments.id}"
-                       lang="{model.additionalArguments.lang}"
-                       style="{model.additionalArguments.style}"
-                       title="{model.additionalArguments.title}"
-                       accesskey="{model.additionalArguments.accesskey}"
-                       tabindex="{model.additionalArguments.tabindex}"
-                       onclick="{model.additionalArguments.onclick}"
-
-                       name="{model.additionalArguments.prefix}[{model.additionalArguments.name}]"
-                       value="{model.additionalArguments.value}"
-
-                       autofocus="{model.additionalArguments.autofocus}"
-                       type="{model.additionalArguments.type}"
-
-                       additionalAttributes="{model.htmlAttributes}"
-               >{model.additionalArguments.value}</f:form.button>
-       <f:format.raw>{model.layout.elementOuterWrap.1}</f:format.raw>
-</f:if>
\ No newline at end of file
diff --git a/typo3/sysext/form/Resources/Private/Partials/Compatibility/Show/FlatElements/ButtonTag.html b/typo3/sysext/form/Resources/Private/Partials/Compatibility/Show/FlatElements/ButtonTag.html
deleted file mode 100644 (file)
index a29643c..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-<f:if condition="{model.showElement}">
-       <f:format.raw>{model.layout.elementOuterWrap.0}</f:format.raw>
-               <f:form.button
-                       class="{model.additionalArguments.class}"
-                       dir="{model.additionalArguments.dir}"
-                       id="{model.additionalArguments.id}"
-                       lang="{model.additionalArguments.lang}"
-                       style="{model.additionalArguments.style}"
-                       title="{model.additionalArguments.title}"
-                       accesskey="{model.additionalArguments.accesskey}"
-                       tabindex="{model.additionalArguments.tabindex}"
-                       onclick="{model.additionalArguments.onclick}"
-
-                       name="{model.additionalArguments.prefix}[{model.additionalArguments.name}]"
-                       value="{model.additionalArguments.value}"
-
-                       autofocus="{model.additionalArguments.autofocus}"
-                       type="{model.additionalArguments.type}"
-               >{model.attributes.value.value}</f:form.button>
-       <f:format.raw>{model.layout.elementOuterWrap.1}</f:format.raw>
-</f:if>
\ No newline at end of file
diff --git a/typo3/sysext/form/Resources/Private/Partials/Compatibility/Show/FlatElements/Checkbox.html b/typo3/sysext/form/Resources/Private/Partials/Compatibility/Show/FlatElements/Checkbox.html
deleted file mode 100644 (file)
index 87bd14e..0000000
+++ /dev/null
@@ -1,48 +0,0 @@
-<f:if condition="{model.showElement}">
-       <f:format.raw>{model.layout.elementOuterWrap.0}</f:format.raw>
-               <f:if condition="{model.additionalArguments.multiple}">
-                       <f:then>
-                               <f:form.checkbox
-                                       class="{model.additionalArguments.class}"
-                                       dir="{model.additionalArguments.dir}"
-                                       id="{model.additionalArguments.id}"
-                                       lang="{model.additionalArguments.lang}"
-                                       style="{model.additionalArguments.style}"
-                                       title="{model.additionalArguments.title}"
-                                       accesskey="{model.additionalArguments.accesskey}"
-                                       tabindex="{model.additionalArguments.tabindex}"
-                                       onclick="{model.additionalArguments.onclick}"
-
-                                       name="{model.additionalArguments.prefix}[{model.additionalArguments.name}][{model.name}]"
-                                       value="<f:if condition='{model.additionalArguments.value}'><f:then>{model.additionalArguments.value}</f:then><f:else>{model.additionalArguments.name}-{model.elementCounter}</f:else></f:if>"
-
-                                       checked="{model.additionalArguments.checked}"
-
-                                       errorClass="{model.additionalAttributes.errorClass}"
-                                       additionalAttributes="{model.htmlAttributes}"
-                               />
-                       </f:then>
-                       <f:else>
-                               <f:form.checkbox
-                                       class="{model.additionalArguments.class}"
-                                       dir="{model.additionalArguments.dir}"
-                                       id="{model.additionalArguments.id}"
-                                       lang="{model.additionalArguments.lang}"
-                                       style="{model.additionalArguments.style}"
-                                       title="{model.additionalArguments.title}"
-                                       accesskey="{model.additionalArguments.accesskey}"
-                                       tabindex="{model.additionalArguments.tabindex}"
-                                       onclick="{model.additionalArguments.onclick}"
-
-                                       name="{model.additionalArguments.prefix}[{model.additionalArguments.name}]"
-                                       value="<f:if condition='{model.additionalArguments.value}'><f:then>{model.additionalArguments.value}</f:then><f:else>{model.additionalArguments.name}-{model.elementCounter}</f:else></f:if>"
-
-                                       checked="{model.additionalArguments.checked}"
-
-                                       errorClass="{model.additionalAttributes.errorClass}"
-                                       additionalAttributes="{model.htmlAttributes}"
-                               />
-                       </f:else>
-               </f:if>
-       <f:format.raw>{model.layout.elementOuterWrap.1}</f:format.raw>
-</f:if>
diff --git a/typo3/sysext/form/Resources/Private/Partials/Compatibility/Show/FlatElements/ContentElement.html b/typo3/sysext/form/Resources/Private/Partials/Compatibility/Show/FlatElements/ContentElement.html
deleted file mode 100644 (file)
index 3100f76..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<f:if condition="{model.showElement}">
-       <f:format.raw>{model.additionalArguments.content}</f:format.raw>
-</f:if>
\ No newline at end of file
diff --git a/typo3/sysext/form/Resources/Private/Partials/Compatibility/Show/FlatElements/Header.html b/typo3/sysext/form/Resources/Private/Partials/Compatibility/Show/FlatElements/Header.html
deleted file mode 100644 (file)
index a5498fa..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<f:if condition="{model.showElement}">
-       <f:format.raw><{model.additionalArguments.headingSize}>{model.additionalArguments.content}</{model.additionalArguments.headingSize}></f:format.raw>
-</f:if>
\ No newline at end of file
diff --git a/typo3/sysext/form/Resources/Private/Partials/Compatibility/Show/FlatElements/Hidden.html b/typo3/sysext/form/Resources/Private/Partials/Compatibility/Show/FlatElements/Hidden.html
deleted file mode 100644 (file)
index 321fe02..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-<f:form.hidden
-       class="{model.additionalArguments.class}"
-       dir="{model.additionalArguments.dir}"
-       id="{model.additionalArguments.id}"
-       lang="{model.additionalArguments.lang}"
-       style="{model.additionalArguments.style}"
-       title="{model.additionalArguments.title}"
-       accesskey="{model.additionalArguments.accesskey}"
-       tabindex="{model.additionalArguments.tabindex}"
-       onclick="{model.additionalArguments.onclick}"
-
-       name="{model.additionalArguments.prefix}[{model.additionalArguments.name}]"
-       value="{model.additionalArguments.value}"
-
-       additionalAttributes="{model.htmlAttributes}"
-/>
diff --git a/typo3/sysext/form/Resources/Private/Partials/Compatibility/Show/FlatElements/Imagebutton.html b/typo3/sysext/form/Resources/Private/Partials/Compatibility/Show/FlatElements/Imagebutton.html
deleted file mode 100644 (file)
index 5a5c22f..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-<f:if condition="{model.showElement}">
-       <f:format.raw>{model.layout.elementOuterWrap.0}</f:format.raw>
-               <f:form.textfield
-                       class="{model.additionalArguments.class}"
-                       dir="{model.additionalArguments.dir}"
-                       id="{model.additionalArguments.id}"
-                       lang="{model.additionalArguments.lang}"
-                       style="{model.additionalArguments.style}"
-                       title="{model.additionalArguments.title}"
-                       accesskey="{model.additionalArguments.accesskey}"
-                       tabindex="{model.additionalArguments.tabindex}"
-                       onclick="{model.additionalArguments.onclick}"
-
-                       name="{model.additionalArguments.prefix}[{model.additionalArguments.name}]"
-                       value="{model.additionalArguments.value}"
-
-                       autofocus="{model.additionalArguments.autofocus}"
-                       maxlength="{model.additionalArguments.maxlength}"
-                       size="{model.additionalArguments.size}"
-                       placeholder="{model.additionalArguments.placeholder}"
-                       pattern="{model.additionalArguments.pattern}"
-                       required="{model.additionalArguments.required}"
-                       type="{model.additionalArguments.type}"
-
-                       errorClass="{model.additionalArguments.errorClass}"
-                       additionalAttributes="{model.htmlAttributes}"
-               />
-       <f:format.raw>{model.layout.elementOuterWrap.1}</f:format.raw>
-</f:if>
\ No newline at end of file
diff --git a/typo3/sysext/form/Resources/Private/Partials/Compatibility/Show/FlatElements/Input.html b/typo3/sysext/form/Resources/Private/Partials/Compatibility/Show/FlatElements/Input.html
deleted file mode 100644 (file)
index 7231637..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-<f:if condition="{model.showElement}">
-       <f:format.raw>{model.layout.elementOuterWrap.0}</f:format.raw>
-               <f:form.textfield
-                       class="{model.additionalArguments.class}"
-                       dir="{model.additionalArguments.dir}"
-                       id="{model.additionalArguments.id}"
-                       lang="{model.additionalArguments.lang}"
-                       style="{model.additionalArguments.style}"
-                       title="{model.additionalArguments.title}"
-                       accesskey="{model.additionalArguments.accesskey}"
-                       tabindex="{model.additionalArguments.tabindex}"
-                       onclick="{model.additionalArguments.onclick}"
-
-                       name="{model.additionalArguments.prefix}[{model.additionalArguments.name}]"
-                       value="{model.additionalArguments.value}"
-
-                       autofocus="{model.additionalArguments.autofocus}"
-                       maxlength="{model.additionalArguments.maxlength}"
-                       size="{model.additionalArguments.size}"
-                       placeholder="{model.additionalArguments.placeholder}"
-                       pattern="{model.additionalArguments.pattern}"
-                       required="{model.additionalArguments.required}"
-                       type="{model.additionalArguments.type}"
-
-                       errorClass="{model.additionalArguments.errorClass}"
-                       additionalAttributes="{model.htmlAttributes}"
-               />
-       <f:format.raw>{model.layout.elementOuterWrap.1}</f:format.raw>
-</f:if>
diff --git a/typo3/sysext/form/Resources/Private/Partials/Compatibility/Show/FlatElements/InputTypeButton.html b/typo3/sysext/form/Resources/Private/Partials/Compatibility/Show/FlatElements/InputTypeButton.html
deleted file mode 100644 (file)
index 5a5c22f..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-<f:if condition="{model.showElement}">
-       <f:format.raw>{model.layout.elementOuterWrap.0}</f:format.raw>
-               <f:form.textfield
-                       class="{model.additionalArguments.class}"
-                       dir="{model.additionalArguments.dir}"
-                       id="{model.additionalArguments.id}"
-                       lang="{model.additionalArguments.lang}"
-                       style="{model.additionalArguments.style}"
-                       title="{model.additionalArguments.title}"
-                       accesskey="{model.additionalArguments.accesskey}"
-                       tabindex="{model.additionalArguments.tabindex}"
-                       onclick="{model.additionalArguments.onclick}"
-
-                       name="{model.additionalArguments.prefix}[{model.additionalArguments.name}]"
-                       value="{model.additionalArguments.value}"
-
-                       autofocus="{model.additionalArguments.autofocus}"
-                       maxlength="{model.additionalArguments.maxlength}"
-                       size="{model.additionalArguments.size}"
-                       placeholder="{model.additionalArguments.placeholder}"
-                       pattern="{model.additionalArguments.pattern}"
-                       required="{model.additionalArguments.required}"
-                       type="{model.additionalArguments.type}"
-
-                       errorClass="{model.additionalArguments.errorClass}"
-                       additionalAttributes="{model.htmlAttributes}"
-               />
-       <f:format.raw>{model.layout.elementOuterWrap.1}</f:format.raw>
-</f:if>
\ No newline at end of file
diff --git a/typo3/sysext/form/Resources/Private/Partials/Compatibility/Show/FlatElements/Password.html b/typo3/sysext/form/Resources/Private/Partials/Compatibility/Show/FlatElements/Password.html
deleted file mode 100644 (file)
index 90aa7c5..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-<f:if condition="{model.showElement}">
-       <f:format.raw>{model.layout.elementOuterWrap.0}</f:format.raw>
-               <f:form.password
-                       class="{model.additionalArguments.class}"
-                       dir="{model.additionalArguments.dir}"
-                       id="{model.additionalArguments.id}"
-                       lang="{model.additionalArguments.lang}"
-                       style="{model.additionalArguments.style}"
-                       title="{model.additionalArguments.title}"
-                       accesskey="{model.additionalArguments.accesskey}"
-                       tabindex="{model.additionalArguments.tabindex}"
-                       onclick="{model.additionalArguments.onclick}"
-
-                       name="{model.additionalArguments.prefix}[{model.additionalArguments.name}]"
-                       value="{model.additionalArguments.value}"
-
-                       maxlength="{model.additionalArguments.maxlength}"
-                       size="{model.additionalArguments.size}"
-
-                       errorClass="{model.additionalArguments.errorClass}"
-                       additionalAttributes="{model.htmlAttributes}"
-               />
-       <f:format.raw>{model.layout.elementOuterWrap.1}</f:format.raw>
-</f:if>
diff --git a/typo3/sysext/form/Resources/Private/Partials/Compatibility/Show/FlatElements/Radio.html b/typo3/sysext/form/Resources/Private/Partials/Compatibility/Show/FlatElements/Radio.html
deleted file mode 100644 (file)
index d7fda48..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-<f:if condition="{model.showElement}">
-       <f:format.raw>{model.layout.elementOuterWrap.0}</f:format.raw>
-               <f:form.radio
-                       class="{model.additionalArguments.class}"
-                       dir="{model.additionalArguments.dir}"
-                       id="{model.additionalArguments.id}"
-                       lang="{model.additionalArguments.lang}"
-                       style="{model.additionalArguments.style}"
-                       title="{model.additionalArguments.title}"
-                       accesskey="{model.additionalArguments.accesskey}"
-                       tabindex="{model.additionalArguments.tabindex}"
-                       onclick="{model.additionalArguments.onclick}"
-
-                       name="{model.additionalArguments.prefix}[{model.additionalArguments.name}]"
-                       value="<f:if condition='{model.additionalArguments.value}'><f:then>{model.additionalArguments.value}</f:then><f:else>{model.additionalArguments.name}-{model.elementCounter}</f:else></f:if>"
-
-                       checked="{model.additionalArguments.checked}"
-
-                       errorClass="{model.additionalArguments.errorClass}"
-                       additionalAttributes="{model.htmlAttributes}"
-               />
-       <f:format.raw>{model.layout.elementOuterWrap.1}</f:format.raw>
-</f:if>
diff --git a/typo3/sysext/form/Resources/Private/Partials/Compatibility/Show/FlatElements/Reset.html b/typo3/sysext/form/Resources/Private/Partials/Compatibility/Show/FlatElements/Reset.html
deleted file mode 100644 (file)
index 5a5c22f..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-<f:if condition="{model.showElement}">
-       <f:format.raw>{model.layout.elementOuterWrap.0}</f:format.raw>
-               <f:form.textfield
-                       class="{model.additionalArguments.class}"
-                       dir="{model.additionalArguments.dir}"
-                       id="{model.additionalArguments.id}"
-                       lang="{model.additionalArguments.lang}"
-                       style="{model.additionalArguments.style}"
-                       title="{model.additionalArguments.title}"
-                       accesskey="{model.additionalArguments.accesskey}"
-                       tabindex="{model.additionalArguments.tabindex}"
-                       onclick="{model.additionalArguments.onclick}"
-
-                       name="{model.additionalArguments.prefix}[{model.additionalArguments.name}]"
-                       value="{model.additionalArguments.value}"
-
-                       autofocus="{model.additionalArguments.autofocus}"
-                       maxlength="{model.additionalArguments.maxlength}"
-                       size="{model.additionalArguments.size}"
-                       placeholder="{model.additionalArguments.placeholder}"
-                       pattern="{model.additionalArguments.pattern}"
-                       required="{model.additionalArguments.required}"
-                       type="{model.additionalArguments.type}"
-
-                       errorClass="{model.additionalArguments.errorClass}"
-                       additionalAttributes="{model.htmlAttributes}"
-               />
-       <f:format.raw>{model.layout.elementOuterWrap.1}</f:format.raw>
-</f:if>
\ No newline at end of file
diff --git a/typo3/sysext/form/Resources/Private/Partials/Compatibility/Show/FlatElements/Select.html b/typo3/sysext/form/Resources/Private/Partials/Compatibility/Show/FlatElements/Select.html
deleted file mode 100644 (file)
index 77bec13..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-{namespace form=TYPO3\CMS\Form\ViewHelpers}
-
-<f:if condition="{model.showElement}">
-       <f:format.raw>{model.layout.elementOuterWrap.0}</f:format.raw>
-               <form:select
-                       class="{model.additionalArguments.class}"
-                       dir="{model.additionalArguments.dir}"
-                       id="{model.additionalArguments.id}"
-                       lang="{model.additionalArguments.lang}"
-                       style="{model.additionalArguments.style}"
-                       title="{model.additionalArguments.title}"
-                       accesskey="{model.additionalArguments.accesskey}"
-                       tabindex="{model.additionalArguments.tabindex}"
-                       onclick="{model.additionalArguments.onclick}"
-
-                       name="{model.additionalArguments.prefix}[{model.additionalArguments.name}]"
-                       value="{form:aggregateSelectOptions(model:model, returnSelectedValues: 1)}"
-
-                       multiple="{model.additionalArguments.multiple}"
-                       size="{model.additionalArguments.size}"
-
-                       optionLabelField="label"
-                       optionValueField="value"
-                       options="{form:aggregateSelectOptions(model:model)}"
-                       prependOptionLabel="{model.additionalArguments.prependOptionLabel}"
-                       prependOptionValue="{model.additionalArguments.prependOptionValue}"
-                       selectAllByDefault="{model.additionalArguments.selectAllByDefault}"
-                       sortByOptionLabel="{model.additionalArguments.sortByOptionLabel}"
-
-                       errorClass="{model.additionalArguments.errorClass}"
-                       additionalAttributes="{model.htmlAttributes}"
-               />
-       <f:format.raw>{model.layout.elementOuterWrap.1}</f:format.raw>
-</f:if>
diff --git a/typo3/sysext/form/Resources/Private/Partials/Compatibility/Show/FlatElements/Submit.html b/typo3/sysext/form/Resources/Private/Partials/Compatibility/Show/FlatElements/Submit.html
deleted file mode 100644 (file)
index a688706..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-<f:if condition="{model.showElement}">
-       <f:format.raw>{model.layout.elementOuterWrap.0}</f:format.raw>
-               <f:form.submit
-                       additionalAttributes="{model.htmlAttributes}"
-                       dir="{model.additionalArguments.dir}"
-                       id="{model.additionalArguments.id}"
-                       lang="{model.additionalArguments.lang}"
-                       style="{model.additionalArguments.style}"
-                       title="{model.additionalArguments.title}"
-                       accesskey="{model.additionalArguments.accesskey}"
-                       tabindex="{model.additionalArguments.tabindex}"
-                       onclick="{model.additionalArguments.onclick}"
-
-                       name="{model.additionalArguments.prefix}[{model.additionalArguments.name}]"
-                       value="{model.additionalArguments.value}"
-               />
-       <f:format.raw>{model.layout.elementOuterWrap.1}</f:format.raw>
-</f:if>
diff --git a/typo3/sysext/form/Resources/Private/Partials/Compatibility/Show/FlatElements/Textarea.html b/typo3/sysext/form/Resources/Private/Partials/Compatibility/Show/FlatElements/Textarea.html
deleted file mode 100644 (file)
index dbf9c3e..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-<f:if condition="{model.showElement}">
-       <f:format.raw>{model.layout.elementOuterWrap.0}</f:format.raw>
-               <f:form.textarea
-                       class="{model.additionalArguments.class}"
-                       dir="{model.additionalArguments.dir}"
-                       id="{model.additionalArguments.id}"
-                       lang="{model.additionalArguments.lang}"
-                       style="{model.additionalArguments.style}"
-                       title="{model.additionalArguments.title}"
-                       accesskey="{model.additionalArguments.accesskey}"
-                       tabindex="{model.additionalArguments.tabindex}"
-                       onclick="{model.additionalArguments.onclick}"
-
-                       name="{model.additionalArguments.prefix}[{model.additionalArguments.name}]"
-                       value="{model.additionalArguments.text}"
-
-                       autofocus="{model.additionalArguments.autofocus}"
-                       rows="{model.additionalArguments.rows}"
-                       cols="{model.additionalArguments.cols}"
-                       placeholder="{model.additionalArguments.placeholder}"
-
-                       errorClass="{model.additionalArguments.errorClass}"
-                       additionalAttributes="{model.htmlAttributes}"
-               />
-       <f:format.raw>{model.layout.elementOuterWrap.1}</f:format.raw>
-</f:if>
diff --git a/typo3/sysext/form/Resources/Private/Partials/Compatibility/Show/FlatElements/Textblock.html b/typo3/sysext/form/Resources/Private/Partials/Compatibility/Show/FlatElements/Textblock.html
deleted file mode 100644 (file)
index 5171a9e..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<f:if condition="{model.showElement}">
-       <f:format.raw>{model.additionalArguments.text}</f:format.raw>
-</f:if>
\ No newline at end of file
diff --git a/typo3/sysext/form/Resources/Private/Partials/Compatibility/Show/FlatElements/Textfield.html b/typo3/sysext/form/Resources/Private/Partials/Compatibility/Show/FlatElements/Textfield.html
deleted file mode 100644 (file)
index 3507e5f..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-<f:if condition="{model.showElement}">
-       <f:format.raw>{model.layout.elementOuterWrap.0}</f:format.raw>
-               <f:form.textfield
-                       class="{model.additionalArguments.class}"
-                       dir="{model.additionalArguments.dir}"
-                       id="{model.additionalArguments.id}"
-                       lang="{model.additionalArguments.lang}"
-                       style="{model.additionalArguments.style}"
-                       title="{model.additionalArguments.title}"
-                       accesskey="{model.additionalArguments.accesskey}"
-                       tabindex="{model.additionalArguments.tabindex}"
-                       onclick="{model.additionalArguments.onclick}"
-
-                       value="{model.additionalArguments.value}"
-                       name="{model.additionalArguments.prefix}[{model.additionalArguments.name}]"
-
-                       autofocus="{model.additionalArguments.autofocus}"
-                       maxlength="{model.additionalArguments.maxlength}"
-                       size="{model.additionalArguments.size}"
-                       placeholder="{model.additionalArguments.placeholder}"
-                       pattern="{model.additionalArguments.pattern}"
-                       required="{model.additionalArguments.required}"
-                       type="{model.additionalArguments.type}"
-
-                       errorClass="{model.additionalArguments.errorClass}"
-                       additionalAttributes="{model.htmlAttributes}"
-               />
-       <f:format.raw>{model.layout.elementOuterWrap.1}</f:format.raw>
-</f:if>
\ No newline at end of file
diff --git a/typo3/sysext/form/Resources/Private/Partials/Compatibility/Show/FlatElements/Upload.html b/typo3/sysext/form/Resources/Private/Partials/Compatibility/Show/FlatElements/Upload.html
deleted file mode 100644 (file)
index 79149bd..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-<f:if condition="{model.showElement}">
-       <f:format.raw>{model.layout.elementOuterWrap.0}</f:format.raw>
-               <f:form.upload
-                       class="{model.additionalArguments.class}"
-                       dir="{model.additionalArguments.dir}"
-                       id="{model.additionalArguments.id}"
-                       lang="{model.additionalArguments.lang}"
-                       style="{model.additionalArguments.style}"
-                       title="{model.additionalArguments.title}"
-                       accesskey="{model.additionalArguments.accesskey}"
-                       tabindex="{model.additionalArguments.tabindex}"
-                       onclick="{model.additionalArguments.onclick}"
-
-                       name="{model.additionalArguments.prefix}[{model.additionalArguments.name}]"
-                       value="{model.additionalArguments.value}"
-
-                       multiple="{model.additionalArguments.multiple}"
-
-                       errorClass="{model.additionalArguments.errorClass}"
-                       additionalAttributes="{model.htmlAttributes}"
-               />
-       <f:format.raw>{model.layout.elementOuterWrap.1}</f:format.raw>
-</f:if>
\ No newline at end of file
diff --git a/typo3/sysext/form/Resources/Private/Templates/PostProcessor/Mail/Compatibility/Html.html b/typo3/sysext/form/Resources/Private/Templates/PostProcessor/Mail/Compatibility/Html.html
deleted file mode 100644 (file)
index e50cfa8..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-<f:layout name="Default" />
-
-<f:section name="main">
-       <f:render partial="ContainerElements/Form" arguments="{model: model}" />
-</f:section>
diff --git a/typo3/sysext/form/Resources/Private/Templates/PostProcessor/Mail/Compatibility/Plain.html b/typo3/sysext/form/Resources/Private/Templates/PostProcessor/Mail/Compatibility/Plain.html
deleted file mode 100644 (file)
index 66119ca..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-<f:layout name="Default" />
-
-<f:section name="main">
-       <f:render partial="ContainerElements/Form" arguments="{model: model, themeName: model.themeName}" />
-</f:section>
index 6e5019e..efe362b 100644 (file)
@@ -56,26 +56,20 @@ class ConfigurationTest extends UnitTestCase
 
     /**
      * @param array $typoScript
-     * @param bool $globalCompatibilityMode
      * @param string $globalThemeName
      * @param array $expected
      *
      * @test
      * @dataProvider propertiesAreUpdatedFromTypoScriptDataProvider
      */
-    public function propertiesAreUpdatedFromTypoScript(array $typoScript, $globalCompatibilityMode, $globalThemeName, array $expected)
+    public function propertiesAreUpdatedFromTypoScript(array $typoScript, $globalThemeName, array $expected)
     {
         $this->typoScriptRepositoryProphecy
-            ->getModelConfigurationByScope('FORM', 'compatibilityMode')
-            ->willReturn($globalCompatibilityMode);
-
-        $this->typoScriptRepositoryProphecy
             ->getModelConfigurationByScope('FORM', 'themeName')
             ->willReturn($globalThemeName);
 
         $this->subject->setTypoScript($typoScript);
         $this->assertEquals($expected['prefix'], $this->subject->getPrefix());
-        $this->assertEquals($expected['compatibility'], $this->subject->getCompatibility());
         $this->assertEquals($expected['contentElementRendering'], $this->subject->getContentElementRendering());
     }
 
@@ -89,114 +83,54 @@ class ConfigurationTest extends UnitTestCase
                 array(
                     'prefix' => '',
                     'themeName' => '',
-                    'compatibilityMode' => false,
                     'disableContentElement' => false,
                 ),
-                false,
                 '',
                 array(
                     'prefix' => 'form',
                     'themeName' => 'Default',
-                    'compatibility' => false,
                     'contentElementRendering' => true,
                 ),
             ),
             '#2' => array(
                 array(
-                    'prefix' => '',
-                    'themeName' => '',
-                    'compatibilityMode' => false,
-                    'disableContentElement' => false,
-                ),
-                true,
-                '',
-                array(
-                    'prefix' => 'form',
-                    'themeName' => 'Default',
-                    'compatibility' => false,
-                    'contentElementRendering' => true,
-                ),
-            ),
-            '#3' => array(
-                array(
-                    'prefix' => 'somePrefix',
-                    'themeName' => 'someTheme',
-                    'compatibilityMode' => true,
-                    'disableContentElement' => true,
-                ),
-                true,
-                '',
-                array(
-                    'prefix' => 'somePrefix',
-                    'themeName' => 'someTheme',
-                    'compatibility' => true,
-                    'contentElementRendering' => false,
-                ),
-            ),
-            '#4' => array(
-                array(
                     'prefix' => 'somePrefix',
                     'themeName' => 'someTheme',
-                    'compatibilityMode' => true,
                     'disableContentElement' => true,
                 ),
-                false,
                 '',
                 array(
                     'prefix' => 'somePrefix',
                     'themeName' => 'someTheme',
-                    'compatibility' => true,
                     'contentElementRendering' => false,
                 ),
             ),
-            '#5' => array(
+            '#3' => array(
                 array(
                     'prefix' => 'somePrefix',
                     'themeName' => 'someTheme',
-                    'compatibilityMode' => null,
                     'disableContentElement' => true,
                 ),
-                true,
                 '',
                 array(
                     'prefix' => 'somePrefix',
                     'themeName' => 'someTheme',
-                    'compatibility' => true,
                     'contentElementRendering' => false,
                 ),
             ),
-            '#6' => array(
+            '#4' => array(
                 array(
                     'prefix' => 'somePrefix',
                     'themeName' => 'someTheme',
-                    'compatibilityMode' => null,
                     'disableContentElement' => true,
                 ),
-                false,
                 '',
                 array(
                     'prefix' => 'somePrefix',
                     'themeName' => 'someTheme',
-                    'compatibility' => false,
                     'contentElementRendering' => false,
                 ),
             ),
-            '#7' => array(
-                array(
-                    'prefix' => '',
-                    'themeName' => '',
-                    'compatibilityMode' => false,
-                    'disableContentElement' => false,
-                ),
-                false,
-                'globalTheme',
-                array(
-                    'prefix' => 'form',
-                    'themeName' => 'globalTheme',
-                    'compatibility' => false,
-                    'contentElementRendering' => true,
-                ),
-            ),
         );
     }
 }