diff --git a/typo3/sysext/core/Documentation/Changelog/12.0/Breaking-96107-DeprecatedFunctionalityRemoved.rst b/typo3/sysext/core/Documentation/Changelog/12.0/Breaking-96107-DeprecatedFunctionalityRemoved.rst index dd060944545c4da1d6e539b9f0d3a85559d0e5bb..25e196943948b70ae62d4ca1c5f2113d368ac5c6 100644 --- a/typo3/sysext/core/Documentation/Changelog/12.0/Breaking-96107-DeprecatedFunctionalityRemoved.rst +++ b/typo3/sysext/core/Documentation/Changelog/12.0/Breaking-96107-DeprecatedFunctionalityRemoved.rst @@ -34,6 +34,7 @@ The following PHP static class methods that have previously been marked as depre The following methods changed signature according to previous deprecations in v11 at the end of the argument list: +- :php:`\TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController->ATagParams` (argument 2 is removed) - :php:`\Full\Class\Name->methodName` (argument 42 is now an integer) The following public class properties have been dropped: diff --git a/typo3/sysext/frontend/Classes/ContentObject/ContentObjectRenderer.php b/typo3/sysext/frontend/Classes/ContentObject/ContentObjectRenderer.php index 92809a9ee7c1ee40d79bf161063c6e7460c35f3b..84183ce03e3ec8aa1c84a23a58592170194ef729 100644 --- a/typo3/sysext/frontend/Classes/ContentObject/ContentObjectRenderer.php +++ b/typo3/sysext/frontend/Classes/ContentObject/ContentObjectRenderer.php @@ -1187,25 +1187,18 @@ class ContentObjectRenderer implements LoggerAwareInterface /** * An abstraction method to add parameters to an A tag. - * Uses the ATagParams property. + * Uses the ATagParams property, also includes the global TypoScript config.ATagParams * * @param array $conf TypoScript configuration properties - * @param bool|int|null $addGlobal If set, will add the global config.ATagParams to the link. @deprecated will be removed in TYPO3 v12.0. * @return string String containing the parameters to the A tag (if non empty, with a leading space) * @see typolink() */ - public function getATagParams($conf, $addGlobal = null) + public function getATagParams($conf) { - $aTagParams = ' ' . $this->stdWrapValue('ATagParams', $conf ?? []); - if ($addGlobal !== null) { - trigger_error('Setting the second argument $addGlobal of $cObj->getATagParams will have no effect in TYPO3 v12.0 anymore.', E_USER_DEPRECATED); - } - // Add the global config.ATagParams if $addGlobal is NULL (default) or set to TRUE. - // @deprecated The if clause can be removed in v12 - if ($addGlobal === null || $addGlobal) { - $globalParams = trim($this->getTypoScriptFrontendController()->config['config']['ATagParams'] ?? ''); - $aTagParams = ' ' . trim($globalParams . $aTagParams); - } + $aTagParams = $this->stdWrapValue('ATagParams', $conf ?? []); + // Add the global config.ATagParams + $globalParams = trim($this->getTypoScriptFrontendController()->config['config']['ATagParams'] ?? ''); + $aTagParams = ' ' . trim($globalParams . ' ' . $aTagParams); // Extend params $_params = [ 'conf' => &$conf, diff --git a/typo3/sysext/install/Configuration/ExtensionScanner/Php/PropertyPublicMatcher.php b/typo3/sysext/install/Configuration/ExtensionScanner/Php/PropertyPublicMatcher.php index a5a5f5d05f4dfc8f94c570871ee287ff0f439d3e..6b2ca911e2342c33c82e167f2fd067660dfc3b40 100644 --- a/typo3/sysext/install/Configuration/ExtensionScanner/Php/PropertyPublicMatcher.php +++ b/typo3/sysext/install/Configuration/ExtensionScanner/Php/PropertyPublicMatcher.php @@ -918,6 +918,7 @@ return [ 'TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController->ATagParams' => [ 'restFiles' => [ 'Deprecation-95219-TypoScriptFrontendController-ATagParams.rst', + 'Breaking-96107-DeprecatedFunctionalityRemoved.rst', ], ], ];