diff --git a/typo3/sysext/core/Classes/Utility/GeneralUtility.php b/typo3/sysext/core/Classes/Utility/GeneralUtility.php index 026b1411498a9ce481e603373e5da6abf6e5c9cd..9b70dc03ed0904c5acac4a2d8b061b609ab0fb58 100644 --- a/typo3/sysext/core/Classes/Utility/GeneralUtility.php +++ b/typo3/sysext/core/Classes/Utility/GeneralUtility.php @@ -613,30 +613,6 @@ class GeneralUtility return $hmac; } - /** - * Takes comma-separated lists and arrays and removes all duplicates - * If a value in the list is trim(empty), the value is ignored. - * - * @param string $in_list Accept multiple parameters which can be comma-separated lists of values and arrays. - * @param mixed $secondParameter Dummy field, which if set will show a warning! - * @return string Returns the list without any duplicates of values, space around values are trimmed - * @deprecated since TYPO3 v11, will be removed in TYPO3 v12. Use StringUtility::uniqueList() instead. - */ - public static function uniqueList($in_list, $secondParameter = null) - { - trigger_error( - 'GeneralUtility::uniqueList() is deprecated and will be removed in v12. Use StringUtility::uniqueList() instead.', - E_USER_DEPRECATED - ); - if (is_array($in_list)) { - throw new \InvalidArgumentException('TYPO3 Fatal Error: TYPO3\\CMS\\Core\\Utility\\GeneralUtility::uniqueList() does NOT support array arguments anymore! Only string comma lists!', 1270853885); - } - if (isset($secondParameter)) { - throw new \InvalidArgumentException('TYPO3 Fatal Error: TYPO3\\CMS\\Core\\Utility\\GeneralUtility::uniqueList() does NOT support more than a single argument value anymore. You have specified more than one!', 1270853886); - } - return implode(',', array_unique(self::trimExplode(',', $in_list, true))); - } - /** * Splits a reference to a file in 5 parts * 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 ac032dc0db7a2ce6b4a33d50882b9927d0142dcd..629af2cc199358f73b9a696568748ec9916f5b1f 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 @@ -58,6 +58,7 @@ The following PHP static class methods that have previously been marked as depre - :php:`\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::makeCategorizable()` - :php:`\TYPO3\CMS\Core\Utility\GeneralUtility::rmFromList()` - :php:`\TYPO3\CMS\Core\Utility\GeneralUtility::stdAuthCode()` +- :php:`\TYPO3\CMS\Core\Utility\GeneralUtility::uniqueList()` - :php:`\TYPO3\CMS\Core\Utility\HttpUtility::redirect()` - :php:`\TYPO3\CMS\Core\Utility\HttpUtility::setResponseCode()` - :php:`\TYPO3\CMS\Core\Utility\HttpUtility::setResponseCodeAndExit()` diff --git a/typo3/sysext/install/Configuration/ExtensionScanner/Php/MethodCallStaticMatcher.php b/typo3/sysext/install/Configuration/ExtensionScanner/Php/MethodCallStaticMatcher.php index b412952056624bf368e37a38f5f14a2891a474c8..cd0156b515afae6abed60a9d8c33fef019f00789 100644 --- a/typo3/sysext/install/Configuration/ExtensionScanner/Php/MethodCallStaticMatcher.php +++ b/typo3/sysext/install/Configuration/ExtensionScanner/Php/MethodCallStaticMatcher.php @@ -1065,6 +1065,7 @@ return [ 'maximumNumberOfArguments' => 2, 'restFiles' => [ 'Deprecation-92607-DeprecatedGeneralUtilityuniqueList.rst', + 'Breaking-96107-DeprecatedFunctionalityRemoved.rst', ], ], 'TYPO3\CMS\Core\Database\RelationHandler::isOnSymmetricSide' => [