From 771b7c1b3f90aecff6f7f1080d24c8194e09fc16 Mon Sep 17 00:00:00 2001 From: Christian Kuhn Date: Thu, 20 Dec 2018 13:08:38 +0100 Subject: [PATCH] [!!!][TASK] Remove last batch of old class aliases Extbase extension is the last core extension that delivered class aliases. Drop them. Resolves: #87240 Releases: master Change-Id: I89074e9d32a4f9f639199edf12c2ebd71be2f8e4 Reviewed-on: https://review.typo3.org/59239 Tested-by: TYPO3com Reviewed-by: Benni Mack Tested-by: Benni Mack Reviewed-by: Wouter Wolters Tested-by: Wouter Wolters --- composer.json | 5 +- composer.lock | 2 +- ...g-87193-DeprecatedFunctionalityRemoved.rst | 33 +++++ .../extbase/Migrations/Code/ClassAliasMap.php | 62 --------- .../Migrations/Code/LegacyClassesForIde.php | 128 ------------------ .../BackendConfigurationManagerTest.php | 2 +- typo3/sysext/extbase/composer.json | 5 - .../ExtensionScanner/Php/ClassNameMatcher.php | 32 +++++ 8 files changed, 68 insertions(+), 201 deletions(-) delete mode 100644 typo3/sysext/extbase/Migrations/Code/ClassAliasMap.php delete mode 100644 typo3/sysext/extbase/Migrations/Code/LegacyClassesForIde.php diff --git a/composer.json b/composer.json index 168ab642831b..77fd7fc1b0cf 100644 --- a/composer.json +++ b/composer.json @@ -84,10 +84,7 @@ }, "extra": { "typo3/class-alias-loader": { - "always-add-alias-loader": true, - "class-alias-maps": [ - "typo3/sysext/extbase/Migrations/Code/ClassAliasMap.php" - ] + "always-add-alias-loader": true }, "branch-alias": { "dev-master": "10.0.x-dev" diff --git a/composer.lock b/composer.lock index a3aac639b844..6a65e0e417e4 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "0c68eda38287d75a1f379330d9cbaf54", + "content-hash": "cbd34e682c7f951eda37a610bdc468a1", "packages": [ { "name": "cogpowered/finediff", diff --git a/typo3/sysext/core/Documentation/Changelog/master/Breaking-87193-DeprecatedFunctionalityRemoved.rst b/typo3/sysext/core/Documentation/Changelog/master/Breaking-87193-DeprecatedFunctionalityRemoved.rst index 568eb33dd142..f83703f041af 100644 --- a/typo3/sysext/core/Documentation/Changelog/master/Breaking-87193-DeprecatedFunctionalityRemoved.rst +++ b/typo3/sysext/core/Documentation/Changelog/master/Breaking-87193-DeprecatedFunctionalityRemoved.rst @@ -60,7 +60,40 @@ The following PHP class aliases that have been previously deprecated for v9 have * :php:`TYPO3\CMS\Core\Tree\TableConfiguration\ExtJsArrayTreeRenderer` * :php:`TYPO3\CMS\ContextHelp\Controller\ContextHelpAjaxController` * :php:`TYPO3\CMS\Cshmanual\Domain\Repository\TableManualRepository` +* :php:`TYPO3\CMS\Extbase\Configuration\Exception\ContainerIsLockedException` +* :php:`TYPO3\CMS\Extbase\Configuration\Exception\NoSuchFileException` +* :php:`TYPO3\CMS\Extbase\Configuration\Exception\NoSuchOptionException` +* :php:`TYPO3\CMS\Extbase\Mvc\Exception\InvalidCommandIdentifierException` +* :php:`TYPO3\CMS\Extbase\Mvc\Exception\InvalidMarkerException` +* :php:`TYPO3\CMS\Extbase\Mvc\Exception\InvalidOrNoRequestHashException` +* :php:`TYPO3\CMS\Extbase\Mvc\Exception\InvalidRequestTypeException` * :php:`TYPO3\CMS\Extbase\Mvc\Exception\InvalidTemplateResourceException` +* :php:`TYPO3\CMS\Extbase\Mvc\Exception\InvalidUriPatternException` +* :php:`TYPO3\CMS\Extbase\Mvc\Exception\InvalidViewHelperException` +* :php:`TYPO3\CMS\Extbase\Mvc\Exception\RequiredArgumentMissingException` +* :php:`TYPO3\CMS\Extbase\Object\Container\Exception\CannotInitializeCacheException` +* :php:`TYPO3\CMS\Extbase\Object\Container\Exception\TooManyRecursionLevelsException` +* :php:`TYPO3\CMS\Extbase\Object\Exception\WrongScopeException` +* :php:`TYPO3\CMS\Extbase\Object\InvalidClassException` +* :php:`TYPO3\CMS\Extbase\Object\InvalidObjectConfigurationException` +* :php:`TYPO3\CMS\Extbase\Object\InvalidObjectException` +* :php:`TYPO3\CMS\Extbase\Object\ObjectAlreadyRegisteredException` +* :php:`TYPO3\CMS\Extbase\Object\UnknownClassException` +* :php:`TYPO3\CMS\Extbase\Object\UnknownInterfaceException` +* :php:`TYPO3\CMS\Extbase\Object\UnresolvedDependenciesException` +* :php:`TYPO3\CMS\Extbase\Persistence\Generic\Exception\CleanStateNotMemorizedException` +* :php:`TYPO3\CMS\Extbase\Persistence\Generic\Exception\InvalidPropertyTypeException` +* :php:`TYPO3\CMS\Extbase\Persistence\Generic\Exception\MissingBackendException` +* :php:`TYPO3\CMS\Extbase\Property\Exception\FormatNotSupportedException` +* :php:`TYPO3\CMS\Extbase\Property\Exception\InvalidFormatException` +* :php:`TYPO3\CMS\Extbase\Property\Exception\InvalidPropertyException` +* :php:`TYPO3\CMS\Extbase\Reflection\Exception\InvalidPropertyTypeException` +* :php:`TYPO3\CMS\Extbase\Security\Exception\InvalidArgumentForRequestHashGenerationException` +* :php:`TYPO3\CMS\Extbase\Security\Exception\SyntacticallyWrongRequestHashException` +* :php:`TYPO3\CMS\Extbase\Service\FlexFormService` +* :php:`TYPO3\CMS\Extbase\Service\TypoScriptService` +* :php:`TYPO3\CMS\Extbase\Validation\Exception\InvalidSubjectException` +* :php:`TYPO3\CMS\Extbase\Validation\Exception\NoValidatorFoundException` * :php:`TYPO3\CMS\Frontend\Controller\PageInformationController` * :php:`TYPO3\CMS\Frontend\Controller\TranslationStatusController` * :php:`TYPO3\CMS\Frontend\View\AdminPanelView` diff --git a/typo3/sysext/extbase/Migrations/Code/ClassAliasMap.php b/typo3/sysext/extbase/Migrations/Code/ClassAliasMap.php deleted file mode 100644 index 241ed766339e..000000000000 --- a/typo3/sysext/extbase/Migrations/Code/ClassAliasMap.php +++ /dev/null @@ -1,62 +0,0 @@ - \TYPO3\CMS\Core\TypoScript\TypoScriptService::class, - - // TYPO3 v9 replacements - // Configuration - 'TYPO3\\CMS\\Extbase\\Configuration\\Exception\\ContainerIsLockedException' => \TYPO3\CMS\Extbase\Configuration\Exception::class, - 'TYPO3\\CMS\\Extbase\\Configuration\\Exception\\NoSuchFileException' => \TYPO3\CMS\Extbase\Configuration\Exception::class, - 'TYPO3\\CMS\\Extbase\\Configuration\\Exception\\NoSuchOptionException' => \TYPO3\CMS\Extbase\Configuration\Exception::class, - - // no proper fallback - 'TYPO3\\CMS\\Extbase\\Mvc\\Exception\\InvalidMarkerException' => \TYPO3\CMS\Extbase\Exception::class, - - 'TYPO3\\CMS\\Extbase\\Mvc\\Exception\\InvalidRequestTypeException' => \TYPO3\CMS\Extbase\Mvc\Exception::class, - 'TYPO3\\CMS\\Extbase\\Mvc\\Exception\\RequiredArgumentMissingException' => \TYPO3\CMS\Extbase\Mvc\Exception::class, - 'TYPO3\\CMS\\Extbase\\Mvc\\Exception\\InvalidCommandIdentifierException' => \TYPO3\CMS\Extbase\Mvc\Exception::class, - - 'TYPO3\\CMS\\Extbase\\Mvc\\Exception\\InvalidOrNoRequestHashException' => \TYPO3\CMS\Extbase\Security\Exception\InvalidHashException::class, - 'TYPO3\\CMS\\Extbase\\Mvc\\Exception\\InvalidUriPatternException' => \TYPO3\CMS\Extbase\Security\Exception::class, - - // Object Container - 'TYPO3\\CMS\\Extbase\\Object\\Container\\Exception\\CannotInitializeCacheException' => \TYPO3\CMS\Core\Cache\Exception\InvalidCacheException::class, - 'TYPO3\\CMS\\Extbase\\Object\\Container\\Exception\\TooManyRecursionLevelsException' => \TYPO3\CMS\Extbase\Object\Exception::class, - - // ObjectManager - 'TYPO3\\CMS\\Extbase\\Object\\Exception\WrongScopeException' => \TYPO3\CMS\Extbase\Object\Exception::class, - 'TYPO3\\CMS\\Extbase\\Object\\InvalidClassException' => \TYPO3\CMS\Extbase\Object\Exception::class, - 'TYPO3\\CMS\\Extbase\\Object\\InvalidObjectConfigurationException' => \TYPO3\CMS\Extbase\Object\Exception::class, - 'TYPO3\\CMS\\Extbase\\Object\\InvalidObjectException' => \TYPO3\CMS\Extbase\Object\Exception::class, - 'TYPO3\\CMS\\Extbase\\Object\\ObjectAlreadyRegisteredException' => \TYPO3\CMS\Extbase\Object\Exception::class, - 'TYPO3\\CMS\\Extbase\\Object\\UnknownClassException' => \TYPO3\CMS\Extbase\Object\Exception::class, - 'TYPO3\\CMS\\Extbase\\Object\\UnknownInterfaceException' => \TYPO3\CMS\Extbase\Object\Exception::class, - 'TYPO3\\CMS\\Extbase\\Object\\UnresolvedDependenciesException' => \TYPO3\CMS\Extbase\Object\Exception::class, - - // Persistence - 'TYPO3\\CMS\\Extbase\\Persistence\\Generic\\Exception\\CleanStateNotMemorizedException' => \TYPO3\CMS\Extbase\Persistence\Generic\Exception::class, - 'TYPO3\\CMS\\Extbase\\Persistence\\Generic\\Exception\\InvalidPropertyTypeException' => \TYPO3\CMS\Extbase\Persistence\Generic\Exception::class, - 'TYPO3\\CMS\\Extbase\\Persistence\\Generic\\Exception\\MissingBackendException' => \TYPO3\CMS\Extbase\Persistence\Generic\Exception::class, - - // Property - 'TYPO3\\CMS\\Extbase\\Property\\Exception\\FormatNotSupportedException' => \TYPO3\CMS\Extbase\Property\Exception::class, - 'TYPO3\\CMS\\Extbase\\Property\\Exception\\InvalidFormatException' => \TYPO3\CMS\Extbase\Property\Exception::class, - 'TYPO3\\CMS\\Extbase\\Property\\Exception\\InvalidPropertyException' => \TYPO3\CMS\Extbase\Property\Exception::class, - - // Reflection - 'TYPO3\\CMS\\Extbase\\Reflection\\Exception\\InvalidPropertyTypeException' => \TYPO3\CMS\Extbase\Reflection\Exception::class, - - // Security - 'TYPO3\\CMS\\Extbase\\Security\\Exception\\InvalidArgumentForRequestHashGenerationException' => \TYPO3\CMS\Extbase\Security\Exception::class, - 'TYPO3\\CMS\\Extbase\\Security\\Exception\\SyntacticallyWrongRequestHashException' => \TYPO3\CMS\Extbase\Security\Exception::class, - - // Validation - 'TYPO3\\CMS\\Extbase\\Validation\\Exception\\InvalidSubjectException' => \TYPO3\CMS\Extbase\Validation\Exception::class, - 'TYPO3\\CMS\\Extbase\\Validation\\Exception\\NoValidatorFoundException' => \TYPO3\CMS\Extbase\Validation\Exception::class, - - // Fluid - 'TYPO3\\CMS\\Extbase\\Mvc\\Exception\\InvalidViewHelperException' => \TYPO3\CMS\Extbase\Exception::class, - - // Service - 'TYPO3\\CMS\\Extbase\\Service\\FlexFormService' => \TYPO3\CMS\Core\Service\FlexFormService::class, -]; diff --git a/typo3/sysext/extbase/Migrations/Code/LegacyClassesForIde.php b/typo3/sysext/extbase/Migrations/Code/LegacyClassesForIde.php deleted file mode 100644 index 3a9aff68234f..000000000000 --- a/typo3/sysext/extbase/Migrations/Code/LegacyClassesForIde.php +++ /dev/null @@ -1,128 +0,0 @@ - [ 'restFiles' => [ 'Deprecation-81600-UnusedExtbaseExceptions.rst', + 'Breaking-87193-DeprecatedFunctionalityRemoved.rst', ], ], 'TYPO3\CMS\Extbase\Configuration\Exception\NoSuchFileException' => [ 'restFiles' => [ 'Deprecation-81600-UnusedExtbaseExceptions.rst', + 'Breaking-87193-DeprecatedFunctionalityRemoved.rst', ], ], 'TYPO3\CMS\Extbase\Configuration\Exception\NoSuchOptionException' => [ 'restFiles' => [ 'Deprecation-81600-UnusedExtbaseExceptions.rst', + 'Breaking-87193-DeprecatedFunctionalityRemoved.rst', ], ], 'TYPO3\CMS\Extbase\Mvc\Exception\InvalidMarkerException' => [ 'restFiles' => [ 'Deprecation-81600-UnusedExtbaseExceptions.rst', + 'Breaking-87193-DeprecatedFunctionalityRemoved.rst', ], ], 'TYPO3\CMS\Extbase\Mvc\Exception\InvalidViewHelperException' => [ 'restFiles' => [ 'Deprecation-81600-UnusedExtbaseExceptions.rst', + 'Breaking-87193-DeprecatedFunctionalityRemoved.rst', ], ], 'TYPO3\CMS\Extbase\Mvc\Exception\InvalidRequestTypeException' => [ 'restFiles' => [ 'Deprecation-81600-UnusedExtbaseExceptions.rst', + 'Breaking-87193-DeprecatedFunctionalityRemoved.rst', ], ], 'TYPO3\CMS\Extbase\Mvc\Exception\RequiredArgumentMissingException' => [ 'restFiles' => [ 'Deprecation-81600-UnusedExtbaseExceptions.rst', + 'Breaking-87193-DeprecatedFunctionalityRemoved.rst', ], ], 'TYPO3\CMS\Extbase\Mvc\Exception\InvalidCommandIdentifierException' => [ 'restFiles' => [ 'Deprecation-81600-UnusedExtbaseExceptions.rst', + 'Breaking-87193-DeprecatedFunctionalityRemoved.rst', ], ], 'TYPO3\CMS\Extbase\Object\Container\Exception\CannotInitializeCacheException' => [ 'restFiles' => [ 'Deprecation-81600-UnusedExtbaseExceptions.rst', + 'Breaking-87193-DeprecatedFunctionalityRemoved.rst', ], ], 'TYPO3\CMS\Extbase\Object\Container\Exception\TooManyRecursionLevelsException' => [ 'restFiles' => [ 'Deprecation-81600-UnusedExtbaseExceptions.rst', + 'Breaking-87193-DeprecatedFunctionalityRemoved.rst', ], ], 'TYPO3\CMS\Extbase\Object\Exception\WrongScopeException' => [ 'restFiles' => [ 'Deprecation-81600-UnusedExtbaseExceptions.rst', + 'Breaking-87193-DeprecatedFunctionalityRemoved.rst', ], ], 'TYPO3\CMS\Extbase\Object\InvalidClassException' => [ 'restFiles' => [ 'Deprecation-81600-UnusedExtbaseExceptions.rst', + 'Breaking-87193-DeprecatedFunctionalityRemoved.rst', ], ], 'TYPO3\CMS\Extbase\Object\InvalidObjectConfigurationException' => [ 'restFiles' => [ 'Deprecation-81600-UnusedExtbaseExceptions.rst', + 'Breaking-87193-DeprecatedFunctionalityRemoved.rst', ], ], 'TYPO3\CMS\Extbase\Object\InvalidObjectException' => [ 'restFiles' => [ 'Deprecation-81600-UnusedExtbaseExceptions.rst', + 'Breaking-87193-DeprecatedFunctionalityRemoved.rst', ], ], 'TYPO3\CMS\Extbase\Object\ObjectAlreadyRegisteredException' => [ 'restFiles' => [ 'Deprecation-81600-UnusedExtbaseExceptions.rst', + 'Breaking-87193-DeprecatedFunctionalityRemoved.rst', ], ], 'TYPO3\CMS\Extbase\Object\UnknownClassException' => [ 'restFiles' => [ 'Deprecation-81600-UnusedExtbaseExceptions.rst', + 'Breaking-87193-DeprecatedFunctionalityRemoved.rst', ], ], 'TYPO3\CMS\Extbase\Object\UnknownInterfaceException' => [ 'restFiles' => [ 'Deprecation-81600-UnusedExtbaseExceptions.rst', + 'Breaking-87193-DeprecatedFunctionalityRemoved.rst', ], ], 'TYPO3\CMS\Extbase\Object\UnresolvedDependenciesException' => [ 'restFiles' => [ 'Deprecation-81600-UnusedExtbaseExceptions.rst', + 'Breaking-87193-DeprecatedFunctionalityRemoved.rst', ], ], 'TYPO3\CMS\Extbase\Persistence\Generic\Exception\CleanStateNotMemorizedException' => [ 'restFiles' => [ 'Deprecation-81600-UnusedExtbaseExceptions.rst', + 'Breaking-87193-DeprecatedFunctionalityRemoved.rst', ], ], 'TYPO3\CMS\Extbase\Persistence\Generic\Exception\InvalidPropertyTypeException' => [ 'restFiles' => [ 'Deprecation-81600-UnusedExtbaseExceptions.rst', + 'Breaking-87193-DeprecatedFunctionalityRemoved.rst', ], ], 'TYPO3\CMS\Extbase\Persistence\Generic\Exception\MissingBackendException' => [ 'restFiles' => [ 'Deprecation-81600-UnusedExtbaseExceptions.rst', + 'Breaking-87193-DeprecatedFunctionalityRemoved.rst', ], ], 'TYPO3\CMS\Extbase\Property\Exception\FormatNotSupportedException' => [ 'restFiles' => [ 'Deprecation-81600-UnusedExtbaseExceptions.rst', + 'Breaking-87193-DeprecatedFunctionalityRemoved.rst', ], ], 'TYPO3\CMS\Extbase\Property\Exception\InvalidFormatException' => [ 'restFiles' => [ 'Deprecation-81600-UnusedExtbaseExceptions.rst', + 'Breaking-87193-DeprecatedFunctionalityRemoved.rst', ], ], 'TYPO3\CMS\Extbase\Property\Exception\InvalidPropertyException' => [ 'restFiles' => [ 'Deprecation-81600-UnusedExtbaseExceptions.rst', + 'Breaking-87193-DeprecatedFunctionalityRemoved.rst', ], ], 'TYPO3\CMS\Extbase\Reflection\Exception\InvalidPropertyTypeException' => [ 'restFiles' => [ 'Deprecation-81600-UnusedExtbaseExceptions.rst', + 'Breaking-87193-DeprecatedFunctionalityRemoved.rst', ], ], 'TYPO3\CMS\Extbase\Security\Exception\InvalidArgumentForRequestHashGenerationException' => [ 'restFiles' => [ 'Deprecation-81600-UnusedExtbaseExceptions.rst', + 'Breaking-87193-DeprecatedFunctionalityRemoved.rst', ], ], 'TYPO3\CMS\Extbase\Security\Exception\SyntacticallyWrongRequestHashException' => [ 'restFiles' => [ 'Deprecation-81600-UnusedExtbaseExceptions.rst', + 'Breaking-87193-DeprecatedFunctionalityRemoved.rst', ], ], 'TYPO3\CMS\Extbase\Mvc\Exception\InvalidUriPatternException' => [ 'restFiles' => [ 'Deprecation-81600-UnusedExtbaseExceptions.rst', + 'Breaking-87193-DeprecatedFunctionalityRemoved.rst', ], ], 'TYPO3\CMS\Extbase\Mvc\Exception\InvalidOrNoRequestHashException' => [ 'restFiles' => [ 'Deprecation-81600-UnusedExtbaseExceptions.rst', + 'Breaking-87193-DeprecatedFunctionalityRemoved.rst', ], ], 'TYPO3\CMS\Extbase\Validation\Exception\InvalidSubjectException' => [ 'restFiles' => [ 'Deprecation-81600-UnusedExtbaseExceptions.rst', + 'Breaking-87193-DeprecatedFunctionalityRemoved.rst', ], ], 'TYPO3\CMS\Extbase\Validation\Exception\NoValidatorFoundException' => [ 'restFiles' => [ 'Deprecation-81600-UnusedExtbaseExceptions.rst', + 'Breaking-87193-DeprecatedFunctionalityRemoved.rst', ], ], 'TYPO3\CMS\Extbase\Mvc\Exception\InvalidTemplateResourceException' => [ @@ -748,6 +779,7 @@ return [ 'TYPO3\CMS\Extbase\Service\FlexFormService' => [ 'restFiles' => [ 'Deprecation-85802-MoveFlexFormServiceFromEXTextbaseToEXTcore.rst', + 'Breaking-87193-DeprecatedFunctionalityRemoved.rst', ], ], 'TYPO3\CMS\Core\Crypto\PasswordHashing\Salt\ComposedPasswordHashInterface' => [ -- 2.20.1