Commit 72e37d83 authored by Thomas Hohn's avatar Thomas Hohn Committed by Benni Mack
Browse files

[!!!][TASK] Remove deprecations in DataHandler class

Removed deprecated methods `rmComma, destPathFromUploadFolder,
noRecordsFromUnallowedTables` and property `$checkWorkspaceCache`.

In addition changes visibility for internal properties:
`$recUpdateAccessCache, $recInsertAccessCache, $isRecordInWebMount_Cache,
$isInWebMount_Cache, $cachedTSconfig, $pageCache`.

Resolves: #80709
Releases: master
Change-Id: I9432c9586ff3478128b5e349d43ec18d9ed5a3c6
Reviewed-on: https://review.typo3.org/52503


Tested-by: default avatarTYPO3com <no-reply@typo3.com>
Reviewed-by: Wouter Wolters's avatarWouter Wolters <typo3@wouterwolters.nl>
Reviewed-by: default avatarThomas Hohn <thomas@hohn.dk>
Tested-by: default avatarThomas Hohn <thomas@hohn.dk>
Reviewed-by: Benni Mack's avatarBenni Mack <benni@typo3.org>
Tested-by: Benni Mack's avatarBenni Mack <benni@typo3.org>
parent 60c0d607
......@@ -469,64 +469,43 @@ class DataHandler
* Used by function checkRecordUpdateAccess() to store whether a record is updatable or not.
*
* @var array
*
* @deprecated since TYPO3 v8, visibility will change to protected or to a run-time cache in TYPO3 v9
*/
public $recUpdateAccessCache = [];
protected $recUpdateAccessCache = [];
/**
* User by function checkRecordInsertAccess() to store whether a record can be inserted on a page id
*
* @var array
*
* @deprecated since TYPO3 v8, visibility will change to protected or to a run-time cache in TYPO3 v9
*/
public $recInsertAccessCache = [];
protected $recInsertAccessCache = [];
/**
* Caching array for check of whether records are in a webmount
*
* @var array
*
* @deprecated since TYPO3 v8, visibility will change to protected or to a run-time cache in TYPO3 v9
*/
public $isRecordInWebMount_Cache = [];
protected $isRecordInWebMount_Cache = [];
/**
* Caching array for page ids in webmounts
*
* @var array
*
* @deprecated since TYPO3 v8, visibility will change to protected or to a run-time cache in TYPO3 v9
*/
public $isInWebMount_Cache = [];
protected $isInWebMount_Cache = [];
/**
* Caching for collecting TSconfig for page ids
*
* @var array
*
* @deprecated since TYPO3 v8, visibility will change to protected or to a run-time cache in TYPO3 v9
*/
public $cachedTSconfig = [];
protected $cachedTSconfig = [];
/**
* Used for caching page records in pageInfo()
*
* @var array
*
* @deprecated since TYPO3 v8, visibility will change to protected or to a run-time cache in TYPO3 v9
*/
public $pageCache = [];
/**
* Array caching workspace access for BE_USER
*
* @var array
*
* @deprecated since TYPO3 v8, no references could be found in class will be removed in TYPO3 v9
*/
public $checkWorkspaceCache = [];
protected $pageCache = [];
// Other arrays:
/**
......@@ -7653,19 +7632,6 @@ class DataHandler
return $value;
}
/**
* Returns the $input string without a comma in the end
*
* @param string $input Input string
* @return string Output string with any comma in the end removed, if any.
* @deprecated since TYPO3 v8, will be removed in TYPO3 v9
*/
public function rmComma($input)
{
GeneralUtility::logDeprecatedFunction();
return rtrim($input, ',');
}
/**
* Converts a HTML entity (like &#123;) to the character '123'
*
......@@ -7688,19 +7654,6 @@ class DataHandler
return implode('', $parts);
}
/**
* Returns absolute destination path for the upload folder, $folder
*
* @param string $folder Upload folder name, relative to PATH_site
* @return string Input string prefixed with PATH_site
* @deprecated since TYPO3 v8, will be removed in TYPO3 v9, can be simplified by just prepending the PATH_site constant
*/
public function destPathFromUploadFolder($folder)
{
GeneralUtility::logDeprecatedFunction();
return PATH_site . $folder;
}
/**
* Disables the delete clause for fetching records.
* In general only undeleted records will be used. If the delete
......@@ -8186,19 +8139,6 @@ class DataHandler
}
}
/**
* Used by the deleteFunctions to check if there are records from disallowed tables under the pages to be deleted.
*
* @param string $inList List of page integers
* @return bool Return TRUE, if permission granted
* @deprecated since TYPO3 v8, will be removed in TYPO3 v9
*/
public function noRecordsFromUnallowedTables($inList)
{
GeneralUtility::logDeprecatedFunction();
return $this->checkForRecordsFromDisallowedTables(GeneralUtility::intExplode(',', $inList, true));
}
/**
* Check if there are records from tables on the pages to be deleted which the current user is not allowed to
*
......
......@@ -53,6 +53,9 @@ The following PHP class methods that have been previously deprecated for v8 have
* TYPO3\CMS\Core\Charset\CharsetConverter->utf8_strrpos()
* TYPO3\CMS\Core\Charset\CharsetConverter->utf8_strtrunc()
* TYPO3\CMS\Core\Charset\CharsetConverter->utf8_substr()
* TYPO3\CMS\Core\DataHandling\DataHandler::rmComma()
* TYPO3\CMS\Core\DataHandling\DataHandler::destPathFromUploadFolder()
* TYPO3\CMS\Core\DataHandling\DataHandler::noRecordsFromUnallowedTables()
* TYPO3\CMS\Core\TypoScript\TemplateService->splitConfArray()
* TYPO3\CMS\Core\TypoScript\TemplateService->fileContent()
* TYPO3\CMS\Core\TypoScript\TemplateService->removeQueryString()
......@@ -154,6 +157,7 @@ The following methods changed signature according to previous deprecations in v8
The following public class properties have been dropped:
* TYPO3\CMS\Core\Charset\CharsetConverter->charSetArray
* TYPO3\CMS\Core\Charset\CharsetConverter->fourByteSets
* TYPO3\CMS\Core\DataHandling\DataHandler->checkWorkspaceCache
* TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController->compensateFieldWidth
* TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController->excludeCHashVars
* TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController->scriptParseTime
......@@ -165,6 +169,14 @@ The following public class properties have been dropped:
* TYPO3\CMS\Lang\LanguageService->moduleLabels
* TYPO3\CMS\Lang\LanguageService->parserFactory
The following class properties have changed visibility:
* TYPO3\CMS\Core\DataHandling\DataHandler->recUpdateAccessCache changed from public to protected
* TYPO3\CMS\Core\DataHandling\DataHandler->recInsertAccessCache changed from public to protected
* TYPO3\CMS\Core\DataHandling\DataHandler->isRecordInWebMount_Cache changed from public to protected
* TYPO3\CMS\Core\DataHandling\DataHandler->isInWebMount_Cache changed from public to protected
* TYPO3\CMS\Core\DataHandling\DataHandler->cachedTSconfig changed from public to protected
* TYPO3\CMS\Core\DataHandling\DataHandler->pageCache changed from public to protected
The following configuration options are not evaluated anymore:
* $TYPO3_CONF_VARS[SC_OPTIONS][GLOBAL][cliKeys]
* $TYPO3_CONF_VARS[FE][noPHPscriptInclude]
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment