Skip to content

Commit

Permalink
[!!!][TASK] Remove deprecated code from RteHtmlParser
Browse files Browse the repository at this point in the history 
Resolves: #87336
Releases: master
Change-Id: I7835c2e328aac7bc154b9460abaec56a29fe8216
Reviewed-on: https://review.typo3.org/59342
Tested-by: TYPO3com <no-reply@typo3.com>
Reviewed-by: Andreas Fernandez <a.fernandez@scripting-base.de>
Tested-by: Andreas Fernandez <a.fernandez@scripting-base.de>
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Tested-by: Wouter Wolters <typo3@wouterwolters.nl>
  • Loading branch information
@lolli42 @wouter90
lolli42 authored and wouter90 committed Jan 6, 2019
1 parent 64ad561 commit 3854f8b
Show file tree
Hide file tree
Showing 7 changed files with 67 additions and 331 deletions.
253 changes: 6 additions & 247 deletions typo3/sysext/core/Classes/Html/RteHtmlParser.php
View file

Large diffs are not rendered by default.

26 changes: 26 additions & 0 deletions ...ocumentation/Changelog/master/Breaking-87193-DeprecatedFunctionalityRemoved.rst
View file
Expand Up @@ -279,6 +279,9 @@ The following PHP class methods that have been previously deprecated for v9 have
* :php:`TYPO3\CMS\Core\Crypto\PasswordHashing\PhpassPasswordHash->setHashCount()`
* :php:`TYPO3\CMS\Core\Crypto\PasswordHashing\PhpassPasswordHash->setMaxHashCount()`
* :php:`TYPO3\CMS\Core\Crypto\PasswordHashing\PhpassPasswordHash->setMinHashCount()`
* :php:`TYPO3\CMS\Core\Html\RteHtmlParser->transformStyledATags()`
* :php:`TYPO3\CMS\Core\Html\RteHtmlParser->TS_links_rte()`
* :php:`TYPO3\CMS\Core\Html\RteHtmlParser->urlInfoForLinkTags()`
* :php:`TYPO3\CMS\Core\Package\PackageManager->injectDependencyResolver()`
* :php:`TYPO3\CMS\Core\Page\PageRenderer::addMetaTag()`
* :php:`TYPO3\CMS\Core\Page\PageRenderer::disableConcatenateFiles()`
Expand Down Expand Up @@ -422,6 +425,7 @@ The following methods changed signature according to previous deprecations in v9
* :php:`TYPO3\CMS\Core\Crypto\PasswordHashing\PhpassPasswordHash->getHashedPassword()` - Second argument dropped
* :php:`TYPO3\CMS\Core\Http\Dispatcher->dispatch()` - Second argument dropped
* :php:`TYPO3\CMS\Core\Package\PackageManager->__construct()` - First argument mandatory
* :php:`TYPO3\CMS\Core\Html\RteHtmlParser->TS_AtagToAbs()` - Second argument dropped and protected
* :php:`TYPO3\CMS\Core\Page\PageRenderer::addInlineLanguageLabelArray()` - Second argument dropped
* :php:`TYPO3\CMS\Core\Utility\ExtensionManagementUtility::isLoaded()` - Second argument dropped
* :php:`TYPO3\CMS\Core\Utility\GeneralUtility->explodeUrl2Array()` - Second argument dropped
Expand Down Expand Up @@ -571,6 +575,16 @@ The following class methods have changed visibility:
* :php:`TYPO3\CMS\Core\Crypto\PasswordHashing\Pbkdf2PasswordHash->isValidSalt()` changed from public to protected
* :php:`TYPO3\CMS\Core\Crypto\PasswordHashing\PhpassPasswordHash->base64Encode()` changed from public to protected
* :php:`TYPO3\CMS\Core\Crypto\PasswordHashing\PhpassPasswordHash->isValidSalt()` changed from public to protected
* :php:`TYPO3\CMS\Core\Html\RteHtmlParser->TS_images_db()` changed from public to protected
* :php:`TYPO3\CMS\Core\Html\RteHtmlParser->TS_links_db()` changed from public to protected
* :php:`TYPO3\CMS\Core\Html\RteHtmlParser->TS_transform_db()` changed from public to protected
* :php:`TYPO3\CMS\Core\Html\RteHtmlParser->TS_transform_rte()` changed from public to protected
* :php:`TYPO3\CMS\Core\Html\RteHtmlParser->HTMLcleaner_db()` changed from public to protected
* :php:`TYPO3\CMS\Core\Html\RteHtmlParser->getKeepTags()` changed from public to protected
* :php:`TYPO3\CMS\Core\Html\RteHtmlParser->divideIntoLines()` changed from public to protected
* :php:`TYPO3\CMS\Core\Html\RteHtmlParser->setDivTags()` changed from public to protected
* :php:`TYPO3\CMS\Core\Html\RteHtmlParser->getWHFromAttribs()` changed from public to protected
* :php:`TYPO3\CMS\Core\Html\RteHtmlParser->TS_AtagToAbs()` changed from public to protected
* :php:`TYPO3\CMS\Core\TypoScript\TemplateService->flattenSetup()` changed from public to protected
* :php:`TYPO3\CMS\Core\TypoScript\TemplateService->mergeConstantsFromPageTSconfig()` changed from public to protected
* :php:`TYPO3\CMS\Core\TypoScript\TemplateService->prependStaticExtra()` changed from public to protected
Expand Down Expand Up @@ -757,6 +771,14 @@ The following class properties have changed visibility:
* :php:`TYPO3\CMS\Core\Charset\CharsetConverter->parsedCharsets` changed from public to protected
* :php:`TYPO3\CMS\Core\Charset\CharsetConverter->toASCII` changed from public to protected
* :php:`TYPO3\CMS\Core\Charset\CharsetConverter->twoByteSets` changed from public to protected
* :php:`TYPO3\CMS\Core\Html\RteHtmlParser->allowedClasses` changed from public to protected
* :php:`TYPO3\CMS\Core\Html\RteHtmlParser->blockElementList` changed from public to protected
* :php:`TYPO3\CMS\Core\Html\RteHtmlParser->elRef` changed from public to protected
* :php:`TYPO3\CMS\Core\Html\RteHtmlParser->getKeepTags_cache` changed from public to protected
* :php:`TYPO3\CMS\Core\Html\RteHtmlParser->procOptions` changed from public to protected
* :php:`TYPO3\CMS\Core\Html\RteHtmlParser->recPid` changed from public to protected
* :php:`TYPO3\CMS\Core\Html\RteHtmlParser->TS_transform_db_safecounter` changed from public to protected
* :php:`TYPO3\CMS\Core\Html\RteHtmlParser->tsConfig` changed from public to protected
* :php:`TYPO3\CMS\Core\TypoScript\TemplateService->absoluteRootLine` changed from public to protected
* :php:`TYPO3\CMS\Core\TypoScript\TemplateService->matchAll` changed from public to protected
* :php:`TYPO3\CMS\Core\TypoScript\TemplateService->nextLevel` changed from public to protected
Expand Down Expand Up @@ -884,6 +906,8 @@ The following user TSconfig options have been dropped:

* Prefix `mod.` to override page TSconfig is ignored
* `TSFE.frontendEditingController` to override the frontend editing controller in EXT:feedit
* `RTE.proc.keepPDIVattribs`
* `RTE.proc.dontRemoveUnknownTags_db`


The following TypoScript options have been dropped:
Expand Down Expand Up @@ -993,6 +1017,8 @@ The following hooks have been removed:
* :php:`$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['tslib/class.tslib_fe.php']['connectToDB']`
* :php:`$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['tslib/class.tslib_fe.php']['hook_previewInfo']`
* :php:`$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['tslib/class.tslib_fe.php']['tslib_fe-PostProc']`
* :php:`$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_parsehtml_proc.php']['modifyParams_LinksDb_PostProc']`
* :php:`$GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_parsehtml_proc.php']['modifyParams_LinksRte_PostProc']`


The following feature is now always enabled:
Expand Down
73 changes: 0 additions & 73 deletions typo3/sysext/core/Tests/UnitDeprecated/Html/RteHtmlParserTest.php
View file

This file was deleted.

2 changes: 2 additions & 0 deletions typo3/sysext/install/Configuration/ExtensionScanner/Php/ArrayDimensionMatcher.php
View file
Expand Up @@ -144,11 +144,13 @@
'$GLOBALS[\'TYPO3_CONF_VARS\'][\'SC_OPTIONS\'][\'t3lib/class.t3lib_parsehtml_proc.php\'][\'modifyParams_LinksRte_PostProc\']' => [
'restFiles' => [
'Deprecation-83252-Link-tagSyntaxProcesssing.rst',
'Breaking-87193-DeprecatedFunctionalityRemoved.rst',
],
],
'$GLOBALS[\'TYPO3_CONF_VARS\'][\'SC_OPTIONS\'][\'t3lib/class.t3lib_parsehtml_proc.php\'][\'modifyParams_LinksDb_PostProc\']' => [
'restFiles' => [
'Deprecation-83252-Link-tagSyntaxProcesssing.rst',
'Breaking-87193-DeprecatedFunctionalityRemoved.rst',
],
],
'$GLOBALS[\'TYPO3_CONF_VARS\'][\'SC_OPTIONS\'][\'TYPO3\CMS\Recordlist\RecordList\DatabaseRecordList\'][\'buildQueryParameters\']' => [
Expand Down
1 change: 1 addition & 0 deletions typo3/sysext/install/Configuration/ExtensionScanner/Php/MethodArgumentUnusedMatcher.php
View file
Expand Up @@ -31,6 +31,7 @@
'unusedArgumentNumbers' => [ 2 ],
'restFiles' => [
'Deprecation-83252-Link-tagSyntaxProcesssing.rst',
'Breaking-87193-DeprecatedFunctionalityRemoved.rst',
],
],
'TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController->__construct' => [
Expand Down
35 changes: 24 additions & 11 deletions typo3/sysext/install/Configuration/ExtensionScanner/Php/MethodCallMatcher.php
View file
Expand Up @@ -1792,13 +1792,15 @@
'maximumNumberOfArguments' => 0,
'restFiles' => [
'Deprecation-83252-Link-tagSyntaxProcesssing.rst',
'Breaking-87193-DeprecatedFunctionalityRemoved.rst',
],
],
'TYPO3\CMS\Core\Html\RteHtmlParser->TS_links_rte' => [
'numberOfMandatoryArguments' => 0,
'maximumNumberOfArguments' => 0,
'restFiles' => [
'Deprecation-83252-Link-tagSyntaxProcesssing.rst',
'Breaking-87193-DeprecatedFunctionalityRemoved.rst',
],
],
'TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController->pageUnavailableAndExit' => [
Expand Down Expand Up @@ -3902,77 +3904,88 @@
'numberOfMandatoryArguments' => 1,
'maximumNumberOfArguments' => 1,
'restFiles' => [
'Deprecation-86441-VariousMethodsAndPropertiesInsideBackendUserAuthentication.rst'
'Deprecation-86441-VariousMethodsAndPropertiesInsideBackendUserAuthentication.rst',
'Breaking-87193-DeprecatedFunctionalityRemoved.rst',
],
],
'TYPO3\CMS\Core\Html\RteHtmlParser->TS_links_db' => [
'numberOfMandatoryArguments' => 1,
'maximumNumberOfArguments' => 1,
'restFiles' => [
'Deprecation-86441-VariousMethodsAndPropertiesInsideBackendUserAuthentication.rst'
'Deprecation-86441-VariousMethodsAndPropertiesInsideBackendUserAuthentication.rst',
'Breaking-87193-DeprecatedFunctionalityRemoved.rst',
],
],
'TYPO3\CMS\Core\Html\RteHtmlParser->TS_transform_db' => [
'numberOfMandatoryArguments' => 1,
'maximumNumberOfArguments' => 1,
'restFiles' => [
'Deprecation-86441-VariousMethodsAndPropertiesInsideBackendUserAuthentication.rst'
'Deprecation-86441-VariousMethodsAndPropertiesInsideBackendUserAuthentication.rst',
'Breaking-87193-DeprecatedFunctionalityRemoved.rst',
],
],
'TYPO3\CMS\Core\Html\RteHtmlParser->TS_transform_rte' => [
'numberOfMandatoryArguments' => 1,
'maximumNumberOfArguments' => 1,
'restFiles' => [
'Deprecation-86441-VariousMethodsAndPropertiesInsideBackendUserAuthentication.rst'
'Deprecation-86441-VariousMethodsAndPropertiesInsideBackendUserAuthentication.rst',
'Breaking-87193-DeprecatedFunctionalityRemoved.rst',
],
],
'TYPO3\CMS\Core\Html\RteHtmlParser->HTMLcleaner_db' => [
'numberOfMandatoryArguments' => 1,
'maximumNumberOfArguments' => 1,
'restFiles' => [
'Deprecation-86441-VariousMethodsAndPropertiesInsideBackendUserAuthentication.rst'
'Deprecation-86441-VariousMethodsAndPropertiesInsideBackendUserAuthentication.rst',
'Breaking-87193-DeprecatedFunctionalityRemoved.rst',
],
],
'TYPO3\CMS\Core\Html\RteHtmlParser->getKeepTags' => [
'numberOfMandatoryArguments' => 0,
'maximumNumberOfArguments' => 1,
'restFiles' => [
'Deprecation-86441-VariousMethodsAndPropertiesInsideBackendUserAuthentication.rst'
'Deprecation-86441-VariousMethodsAndPropertiesInsideBackendUserAuthentication.rst',
'Breaking-87193-DeprecatedFunctionalityRemoved.rst',
],
],
'TYPO3\CMS\Core\Html\RteHtmlParser->divideIntoLines' => [
'numberOfMandatoryArguments' => 1,
'maximumNumberOfArguments' => 3,
'restFiles' => [
'Deprecation-86441-VariousMethodsAndPropertiesInsideBackendUserAuthentication.rst'
'Deprecation-86441-VariousMethodsAndPropertiesInsideBackendUserAuthentication.rst',
'Breaking-87193-DeprecatedFunctionalityRemoved.rst',
],
],
'TYPO3\CMS\Core\Html\RteHtmlParser->setDivTags' => [
'numberOfMandatoryArguments' => 1,
'maximumNumberOfArguments' => 1,
'restFiles' => [
'Deprecation-86441-VariousMethodsAndPropertiesInsideBackendUserAuthentication.rst'
'Deprecation-86441-VariousMethodsAndPropertiesInsideBackendUserAuthentication.rst',
'Breaking-87193-DeprecatedFunctionalityRemoved.rst',
],
],
'TYPO3\CMS\Core\Html\RteHtmlParser->getWHFromAttribs' => [
'numberOfMandatoryArguments' => 1,
'maximumNumberOfArguments' => 1,
'restFiles' => [
'Deprecation-86441-VariousMethodsAndPropertiesInsideBackendUserAuthentication.rst'
'Deprecation-86441-VariousMethodsAndPropertiesInsideBackendUserAuthentication.rst',
'Breaking-87193-DeprecatedFunctionalityRemoved.rst',
],
],
'TYPO3\CMS\Core\Html\RteHtmlParser->urlInfoForLinkTags' => [
'numberOfMandatoryArguments' => 1,
'maximumNumberOfArguments' => 1,
'restFiles' => [
'Deprecation-86441-VariousMethodsAndPropertiesInsideBackendUserAuthentication.rst'
'Deprecation-86441-VariousMethodsAndPropertiesInsideBackendUserAuthentication.rst',
'Breaking-87193-DeprecatedFunctionalityRemoved.rst',
],
],
'TYPO3\CMS\Core\Html\RteHtmlParser->TS_AtagToAbs' => [
'numberOfMandatoryArguments' => 1,
'maximumNumberOfArguments' => 1,
'restFiles' => [
'Deprecation-86441-VariousMethodsAndPropertiesInsideBackendUserAuthentication.rst'
'Deprecation-86441-VariousMethodsAndPropertiesInsideBackendUserAuthentication.rst',
'Breaking-87193-DeprecatedFunctionalityRemoved.rst',
],
],
'TYPO3\CMS\Core\Page\PageRenderer->loadJquery' => [
Expand Down
8 changes: 8 additions & 0 deletions typo3/sysext/install/Configuration/ExtensionScanner/Php/PropertyProtectedMatcher.php
View file
Expand Up @@ -1061,41 +1061,49 @@
'TYPO3\CMS\Core\Html\RteHtmlParser->blockElementList' => [
'restFiles' => [
'Deprecation-86440-InternalMethodsAndPropertiesWithinRteHtmlParser.rst',
'Breaking-87193-DeprecatedFunctionalityRemoved.rst',
],
],
'TYPO3\CMS\Core\Html\RteHtmlParser->recPid' => [
'restFiles' => [
'Deprecation-86440-InternalMethodsAndPropertiesWithinRteHtmlParser.rst',
'Breaking-87193-DeprecatedFunctionalityRemoved.rst',
],
],
'TYPO3\CMS\Core\Html\RteHtmlParser->elRef' => [
'restFiles' => [
'Deprecation-86440-InternalMethodsAndPropertiesWithinRteHtmlParser.rst',
'Breaking-87193-DeprecatedFunctionalityRemoved.rst',
],
],
'TYPO3\CMS\Core\Html\RteHtmlParser->tsConfig' => [
'restFiles' => [
'Deprecation-86440-InternalMethodsAndPropertiesWithinRteHtmlParser.rst',
'Breaking-87193-DeprecatedFunctionalityRemoved.rst',
],
],
'TYPO3\CMS\Core\Html\RteHtmlParser->procOptions' => [
'restFiles' => [
'Deprecation-86440-InternalMethodsAndPropertiesWithinRteHtmlParser.rst',
'Breaking-87193-DeprecatedFunctionalityRemoved.rst',
],
],
'TYPO3\CMS\Core\Html\RteHtmlParser->TS_transform_db_safecounter' => [
'restFiles' => [
'Deprecation-86440-InternalMethodsAndPropertiesWithinRteHtmlParser.rst',
'Breaking-87193-DeprecatedFunctionalityRemoved.rst',
],
],
'TYPO3\CMS\Core\Html\RteHtmlParser->getKeepTags_cache' => [
'restFiles' => [
'Deprecation-86440-InternalMethodsAndPropertiesWithinRteHtmlParser.rst',
'Breaking-87193-DeprecatedFunctionalityRemoved.rst',
],
],
'TYPO3\CMS\Core\Html\RteHtmlParser->allowedClasses' => [
'restFiles' => [
'Deprecation-86440-InternalMethodsAndPropertiesWithinRteHtmlParser.rst',
'Breaking-87193-DeprecatedFunctionalityRemoved.rst',
],
],
'TYPO3\CMS\Core\Authentication\BackendUserAuthentication->checkWorkspaceCurrent_cache' => [
Expand Down

0 comments on commit 3854f8b

Please sign in to comment.