Skip to content

Commit

Permalink
[TASK] Remove deprecated form setup mixins
Browse files Browse the repository at this point in the history
Form mixins were deprecated with #89742. The patch removes the code.

Resolves: #94861
Releases: master
Change-Id: Ic82729ae52d3f8c6ca7cd0ad8f6c97aceebc96d0
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/70528
Tested-by: Björn Jacob <bjoern.jacob@tritum.de>
Tested-by: Oliver Bartsch <bo@cedev.de>
Tested-by: core-ci <typo3@b13.com>
Tested-by: waldhacker <hello@waldhacker.dev>
Reviewed-by: Björn Jacob <bjoern.jacob@tritum.de>
Reviewed-by: Oliver Bartsch <bo@cedev.de>
Reviewed-by: waldhacker <hello@waldhacker.dev>
  • Loading branch information
waldhacker1 committed Aug 13, 2021
1 parent 290d9d2 commit 6c12d5a
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 1,117 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
use TYPO3\CMS\Core\Utility\ArrayUtility;
use TYPO3\CMS\Core\Utility\Exception\MissingArrayPathException;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Core\Utility\StringUtility;
use TYPO3\CMS\Form\Mvc\Configuration\Exception\CycleInheritancesException;

/**
Expand Down Expand Up @@ -191,21 +190,6 @@ protected function resolve(

//and replace the __inheritance operator by the respective partial
if (is_array($inheritances)) {
$deprecatedMixinInheritances = array_filter(
$inheritances,
function (string $inheritance): bool {
return StringUtility::beginsWith($inheritance, 'TYPO3.CMS.Form.mixins.');
}
);

if (!empty($deprecatedMixinInheritances)) {
trigger_error(sprintf(
'Deprecated form mixins used in "%s": %s',
$path,
implode(', ', $deprecatedMixinInheritances)
), E_USER_DEPRECATED);
}

$inheritedConfigurations = $this->resolveInheritancesRecursive($inheritances);
$configuration[$key] = array_replace_recursive($inheritedConfigurations, $configuration[$key]);
}
Expand Down
2 changes: 0 additions & 2 deletions typo3/sysext/form/Configuration/Yaml/FormSetup.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,6 @@ imports:
- { resource: "./Finishers/Redirect.yaml" }
- { resource: "./Finishers/SaveToDatabase.yaml" }

- { resource: "./Legacy/mixins.yaml" }

TYPO3:
CMS:
Form:
Expand Down
Loading

0 comments on commit 6c12d5a

Please sign in to comment.