Commit 50008990 authored by Wouter Wolters's avatar Wouter Wolters Committed by Christian Kuhn
Browse files

[!!!][TASK] Remove deprecated methods in several files

Resolves: #80718
Releases: master
Change-Id: I632b36b4b14cc354a6da1a060baf4801d5231766
Reviewed-on: https://review.typo3.org/52531

Reviewed-by: Georg Ringer's avatarGeorg Ringer <georg.ringer@gmail.com>
Tested-by: Georg Ringer's avatarGeorg Ringer <georg.ringer@gmail.com>
Tested-by: default avatarTYPO3com <no-reply@typo3.com>
Reviewed-by: Christian Kuhn's avatarChristian Kuhn <lolli@schwarzbu.ch>
Tested-by: Christian Kuhn's avatarChristian Kuhn <lolli@schwarzbu.ch>
parent 2a53c734
......@@ -1276,29 +1276,6 @@ abstract class AbstractItemProvider
return $itemArray;
}
/**
* Make sure maxitems is always filled with a valid integer value.
*
* Used by TcaSelectItems and TcaSelectTreeItems data providers
*
* @param mixed $maxItems
* @return int
* @deprecated since TYPO3 v8, will be removed in TYPO3 v9
*/
public function sanitizeMaxItems($maxItems)
{
GeneralUtility::logDeprecatedFunction();
if (!empty($maxItems)
&& (int)$maxItems >= 1
) {
$maxItems = (int)$maxItems;
} else {
$maxItems = 99999;
}
return $maxItems;
}
/**
* Gets the record uid of the live default record. If already
* pointing to the live record, the submitted record uid is returned.
......
......@@ -126,28 +126,5 @@ function getModuleUrl(inUrl) { //
}
}
// Backwards-compatible layer for "old" ExtJS-based code
// which was in use (top.content) before TYPO3 8.4. Now, the direct "top.nav_frame" and "top.list_frame"
// calls do work directly.
// @deprecated since TYPO3 v8, will be removed in TYPO3 v9, this functionality will be removed in TYPO3 v9.
$(document).on('ready', function() {
top.content = {
list_frame: top.list_frame,
nav_frame: top.nav_frame
};
// top.nav.refresh() is currently used by the clickmenu inline JS code, and can be removed afterwards
top.nav = {
refresh: function() {
if (top.nav_frame && top.nav_frame.refresh_nav) {
top.nav_frame.refresh_nav();
} else if (top.TYPO3.Backend && top.TYPO3.Backend.NavigationContainer.PageTree) {
top.TYPO3.Backend.NavigationContainer.PageTree.refreshTree();
}
}
};
});
// Used by Frameset Modules
// Used by Frameset Modules
var currentSubScript = "";
......@@ -1154,20 +1154,6 @@ abstract class AbstractUserAuthentication
}
}
/**
* VeriCode returns 10 first chars of a md5 hash of the session cookie AND the encryptionKey from TYPO3_CONF_VARS.
* This code is used as an alternative verification when the JavaScript interface executes cmd's to
* tce_db.php from eg. MSIE 5.0 because the proper referer is not passed with this browser...
*
* @return string
* @deprecated since TYPO3 v8, will be removed in TYPO3 v9
*/
public function veriCode()
{
GeneralUtility::logDeprecatedFunction();
return substr(md5($this->id . $GLOBALS['TYPO3_CONF_VARS']['SYS']['encryptionKey']), 0, 10);
}
/*************************
*
* Session and Configuration Handling
......
......@@ -579,19 +579,6 @@ class QueryView
return CsvUtility::csvValues($valueArray, $delim, $quote);
}
/**
* Table wrap
*
* @param string $str
* @return string
* @deprecated since TYPO3 v8, will be removed in TYPO3 v9
*/
public function tableWrap($str)
{
GeneralUtility::logDeprecatedFunction();
return '<pre>' . $str . '</pre>';
}
/**
* Search
*
......
......@@ -3270,22 +3270,6 @@ class IconRegistry implements SingletonInterface
return $this->icons[$identifier];
}
/**
* @param string $identifier
*
* @return array
* @throws Exception
* @deprecated since TYPO3 v8, will be removed in TYPO3 v9
*/
public function getDeprecationSettings($identifier)
{
GeneralUtility::logDeprecatedFunction();
if (!$this->isDeprecated($identifier)) {
throw new Exception('Icon with identifier "' . $identifier . '" is not deprecated"', 1460976527);
}
return $this->deprecatedIcons[$identifier];
}
/**
* @return array
*/
......
......@@ -45,6 +45,7 @@ The following PHP class methods that have been previously deprecated for v8 have
* TYPO3\CMS\Backend\Domain\Repository\Localization\LocalizationRepository->getExcludeQueryPart()
* TYPO3\CMS\Backend\Domain\Repository\Localization\LocalizationRepository->getPreviousLocalizedRecordUid()
* TYPO3\CMS\Backend\Domain\Repository\Localization\LocalizationRepository->getRecordLocalization()
* TYPO3\CMS\Backend\Form\FormDataProvider\AbstractItemProvider->sanitizeMaxItems()
* TYPO3\CMS\Backend\Module\AbstractFunctionModule->getBackPath()
* TYPO3\CMS\Backend\Module\AbstractFunctionModule->getDatabaseConnection()
* TYPO3\CMS\Backend\Module\AbstractFunctionModule->incLocalLang()
......@@ -89,6 +90,7 @@ The following PHP class methods that have been previously deprecated for v8 have
* TYPO3\CMS\Backend\Utility\BackendUtility::processParams()
* TYPO3\CMS\Backend\Utility\BackendUtility::replaceL10nModeFields()
* TYPO3\CMS\Backend\Utility\BackendUtility::RTEsetup()
* TYPO3\CMS\Core\Authentication\AbstractUserAuthentication->veriCode()
* TYPO3\CMS\Core\Charset\CharsetConverter->convCapitalize()
* TYPO3\CMS\Core\Charset\CharsetConverter->conv_case()
* TYPO3\CMS\Core\Charset\CharsetConverter->euc_char2byte_pos()
......@@ -107,11 +109,13 @@ The following PHP class methods that have been previously deprecated for v8 have
* TYPO3\CMS\Core\Charset\CharsetConverter->utf8_substr()
* TYPO3\CMS\Core\Core\Bootstrap->loadExtensionTables()
* TYPO3\CMS\Core\Database\RelationHandler->readyForInterface()
* TYPO3\CMS\Core\Database\QueryView->tableWrap()
* TYPO3\CMS\Core\DataHandling\DataHandler::rmComma()
* TYPO3\CMS\Core\DataHandling\DataHandler::destPathFromUploadFolder()
* TYPO3\CMS\Core\DataHandling\DataHandler::noRecordsFromUnallowedTables()
* TYPO3\CMS\Core\Imaging\GraphicalFunctions->createTempSubDir()
* TYPO3\CMS\Core\Imaging\GraphicalFunctions->prependAbsolutePath()
* TYPO3\CMS\Core\Imaging\IconRegistry->getDeprecationSettings()
* TYPO3\CMS\Core\Messaging\FlashMessage->getClass()
* TYPO3\CMS\Core\Messaging\FlashMessage->getIconName()
* TYPO3\CMS\Core\TypoScript\TemplateService->splitConfArray()
......@@ -194,10 +198,14 @@ The following PHP class methods that have been previously deprecated for v8 have
* TYPO3\CMS\Frontend\Page\PageRepository->getPathFromRootline()
* TYPO3\CMS\Frontend\Page\PageRepository::getHash()
* TYPO3\CMS\Frontend\Page\PageRepository::storeHash()
* TYPO3\CMS\IndexedSearch\Indexer->includeCrawlerClass()
* TYPO3\CMS\Lang\LanguageService->addModuleLabels()
* TYPO3\CMS\Lang\LanguageService->getParserFactory()
* TYPO3\CMS\Lang\LanguageService->makeEntities()
* TYPO3\CMS\Lang\LanguageService->overrideLL()
* TYPO3\CMS\Lowlevel\Utility\ArrayBrowser->wrapValue()
* TYPO3\CMS\Recordlist\RecordList\AbstractDatabaseRecordList->makeQueryArray()
* TYPO3\CMS\Taskcenter\Controller\TaskModuleController->printContent()
The following methods changed signature according to previous deprecations in v8:
* TYPO3\CMS\Core\Charset\CharsetConverter->euc_char_mapping() - Third and fourth argument dropped
......@@ -241,6 +249,7 @@ The following public class properties have been dropped:
* TYPO3\CMS\Core\Charset\CharsetConverter->fourByteSets
* TYPO3\CMS\Core\DataHandling\DataHandler->checkWorkspaceCache
* TYPO3\CMS\Core\Imaging\GraphicalFunctions->tempPath
* TYPO3\CMS\Frontend\ContentObject\Menu\AbstractMenuContentObject->parentMenuArr
* TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController->compensateFieldWidth
* TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController->excludeCHashVars
* TYPO3\CMS\Frontend\Controller\TypoScriptFrontendController->scriptParseTime
......@@ -270,6 +279,7 @@ The following configuration options are not evaluated anymore:
* $TYPO3_CONF_VARS[SC_OPTIONS][GLOBAL][cliKeys]
* $TYPO3_CONF_VARS[FE][noPHPscriptInclude]
* $TYPO3_CONF_VARS[FE][maxSessionDataSize]
* $GLOBALS['TYPO3_CONF_VARS_extensionAdded']
The following entry points have been removed:
* typo3/cli_dispatch.phpsh
......@@ -277,6 +287,7 @@ The following entry points have been removed:
The following hooks have been removed:
* $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/class.t3lib_befunc.php']['getFlexFormDSClass']
* $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['t3lib/div/class.t3lib_utility_client.php']['getDeviceType']
* $GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['typo3/class.db_list.inc']['makeQueryArray']
The following functionality has been removed:
* Support for legacy prepared statements within Extbase Persistence within Qom\Statement
......
......@@ -229,15 +229,6 @@ abstract class AbstractMenuContentObject
*/
protected $useCacheHash = false;
/**
* Holds the menuArr of the parent menu, if this menu is a subMenu.
*
* @deprecated since TYPO3 v8, will be removed in TYPO3 v9, please use getter and setter methods.
*
* @var array
*/
public $parentMenuArr = [];
/**
* Array key of the parentMenuItem in the parentMenuArr, if this menu is a subMenu.
*
......
......@@ -2070,17 +2070,6 @@ class Indexer
}
}
/**
* Includes the crawler class
*
* @deprecated since TYPO3 v8, will be removed in TYPO3 v9, autoloader is taking care of that functionality
*/
public function includeCrawlerClass()
{
GeneralUtility::logDeprecatedFunction();
require_once \TYPO3\CMS\Core\Utility\ExtensionManagementUtility::extPath('crawler') . 'class.tx_crawler_lib.php';
}
/********************************
*
* SQL; Submitting words
......
......@@ -88,17 +88,6 @@ class AllConfiguration extends Action\AbstractAction
$data[$sectionName] = [];
foreach ($GLOBALS['TYPO3_CONF_VARS'][$sectionName] as $key => $value) {
// @deprecated since TYPO3 v8, will be removed in TYPO3 v9. The array TYPO3_CONF_VARS_extensionAdded will be removed in v9.
if (isset($GLOBALS['TYPO3_CONF_VARS_extensionAdded'][$sectionName][$key])) {
// Don't allow editing stuff which is added by extensions
// Make sure we fix potentially duplicated entries from older setups
$potentialValue = str_replace(['\' . LF . \'', '\' . LF . \''], [LF, LF], $value);
while (preg_match('/' . preg_quote($GLOBALS['TYPO3_CONF_VARS_extensionAdded'][$sectionName][$key], '/') . '$/', $potentialValue)) {
$potentialValue = preg_replace('/' . preg_quote($GLOBALS['TYPO3_CONF_VARS_extensionAdded'][$sectionName][$key], '/') . '$/', '', $potentialValue);
}
$value = $potentialValue;
}
$description = trim($commentArray[$sectionName][$key]);
$isTextarea = (bool)preg_match('/^(<.*?>)?string \\(textarea\\)/i', $description);
$doNotRender = (bool)preg_match('/^(<.*?>)?string \\(exclude\\)/i', $description);
......
......@@ -129,23 +129,6 @@ class ArrayBrowser
return $output;
}
/**
* Wrapping the value in bold tags etc.
*
* @param string $theValue The title string
* @return string Title string, htmlspecialchars()'ed
* @deprecated since TYPO3 v8, will be removed in TYPO3 v9
*/
public function wrapValue($theValue)
{
GeneralUtility::logDeprecatedFunction();
$wrappedValue = '';
if ((string)$theValue !== '') {
$wrappedValue = htmlspecialchars($theValue);
}
return $wrappedValue;
}
/**
* Wrapping the value in bold tags etc.
*
......
......@@ -658,80 +658,6 @@ class AbstractDatabaseRecordList extends AbstractRecordList
return BackendUtility::thumbCode($row, $table, $field);
}
/**
* Returns the SQL-query array to select the records from a table $table with pid = $id
*
* @param string $table Table name
* @param int $id Page id (NOT USED! $this->pidSelect is used instead)
* @param string $addWhere Additional part for where clause
* @param string $fieldList Field list to select, * for all (for "SELECT [fieldlist] FROM ...")
* @return string[] Returns query array
*
* @deprecated since TYPO3 v8, will be removed in TYPO3 v9. Please use getQueryBuilder()
*/
public function makeQueryArray($table, $id, $addWhere = '', $fieldList = '*')
{
GeneralUtility::logDeprecatedFunction();
$hookObjectsArr = [];
if (is_array($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['typo3/class.db_list.inc']['makeQueryArray'])) {
foreach ($GLOBALS['TYPO3_CONF_VARS']['SC_OPTIONS']['typo3/class.db_list.inc']['makeQueryArray'] as $classRef) {
$hookObjectsArr[] = GeneralUtility::getUserObj($classRef);
}
}
// Set ORDER BY:
$orderBy = $GLOBALS['TCA'][$table]['ctrl']['sortby'] ? 'ORDER BY ' . $GLOBALS['TCA'][$table]['ctrl']['sortby'] : $GLOBALS['TCA'][$table]['ctrl']['default_sortby'];
if ($this->sortField) {
if (in_array($this->sortField, $this->makeFieldList($table, 1))) {
$orderBy = 'ORDER BY ' . $this->sortField;
if ($this->sortRev) {
$orderBy .= ' DESC';
}
}
}
// Set LIMIT:
$limit = $this->iLimit ? ($this->firstElementNumber ? $this->firstElementNumber . ',' : '') . $this->iLimit : '';
// Filtering on displayable pages (permissions):
$pC = $table === 'pages' && $this->perms_clause ? ' AND ' . $this->perms_clause : '';
// Adding search constraints:
$search = $this->makeSearchString($table, $id);
// Compiling query array:
$queryParts = [
'SELECT' => $fieldList,
'FROM' => $table,
'WHERE' => $this->getPageIdConstraint($table) . ' ' . $pC . BackendUtility::deleteClause($table) . BackendUtility::versioningPlaceholderClause($table) . ' ' . $addWhere . ' ' . $search,
'GROUPBY' => '',
'LIMIT' => $limit
];
$tempOrderBy = [];
foreach (QueryHelper::parseOrderBy($orderBy) as $orderPair) {
list($fieldName, $order) = $orderPair;
if ($order !== null) {
$tempOrderBy[] = implode(' ', $orderPair);
} else {
$tempOrderBy[] = $fieldName;
}
}
$queryParts['ORDERBY'] = implode(',', $tempOrderBy);
// Filter out records that are translated, if TSconfig mod.web_list.hideTranslations is set
if ((in_array($table, GeneralUtility::trimExplode(',', $this->hideTranslations)) || $this->hideTranslations === '*') && !empty($GLOBALS['TCA'][$table]['ctrl']['transOrigPointerField']) && $table !== 'pages_language_overlay') {
$queryParts['WHERE'] .= ' AND ' . $GLOBALS['TCA'][$table]['ctrl']['transOrigPointerField'] . '=0 ';
}
// Apply hook as requested in http://forge.typo3.org/issues/16634
foreach ($hookObjectsArr as $hookObj) {
if (method_exists($hookObj, 'makeQueryArray_post')) {
$_params = [
'orderBy' => $orderBy,
'limit' => $limit,
'pC' => $pC,
'search' => $search
];
$hookObj->makeQueryArray_post($queryParts, $this, $table, $id, $addWhere, $fieldList, $_params);
}
}
// Return query:
return $queryParts;
}
/**
* Returns a QueryBuilder configured to select $fields from $table where the pid is restricted
* depending on the current searchlevel setting.
......
......@@ -156,17 +156,6 @@ class TaskModuleController extends BaseScriptClass
$this->moduleTemplate->setTitle($this->getLanguageService()->getLL('title'));
}
/**
* Prints out the module's HTML
*
* @deprecated since TYPO3 v8, will be removed in TYPO3 v9
*/
public function printContent()
{
GeneralUtility::logDeprecatedFunction();
echo $this->content;
}
/**
* Generates the module content by calling the selected task
*/
......
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