Commit c8cb053c authored by Benni Mack's avatar Benni Mack Committed by Frank Nägler
Browse files

[BUGFIX] Streamline trigger_error messages

This patch streamlines all deprecation messages and follow the
following rules.

1. All @deprecated should contain
@deprecated since TYPO3 xx, will be removed in TYPO3 v10.0 (not "core v10" or just "v10"

2. trigger_error()
- All trigger_error() messages MUST end with a "." (dot).
- Never use "This method" but the method name (enjoy the logs otherwise)
- "has been deprecated" can be spared - we KNOW it's deprecated once its in the deprecation log. Instead "Will be removed in TYPO3 v10.0" SHOULD be in the log file.
- Do not use "__METHOD__" or some other "magic".

Resolves: #86488
Releases: master
Change-Id: I6a34593ff89ecafe649366d60d725daa3aa6676c
Reviewed-on: https://review.typo3.org/58494

Reviewed-by: Wouter Wolters's avatarWouter Wolters <typo3@wouterwolters.nl>
Tested-by: Wouter Wolters's avatarWouter Wolters <typo3@wouterwolters.nl>
Reviewed-by: Frank Nägler's avatarFrank Naegler <frank.naegler@typo3.org>
Tested-by: Frank Nägler's avatarFrank Naegler <frank.naegler@typo3.org>
Tested-by: default avatarTYPO3com <no-reply@typo3.com>
parent dd599d79
......@@ -23,7 +23,7 @@ namespace TYPO3\CMS\Adminpanel\ModuleApi;
* about the current state (for example the log module provides the number of warnings and errors directly).
*
* Be aware that modules with submodules at the moment can only render one short info (the one of the "parent" module).
* This will likely change in v10.
* This will likely change in TYPO3 v10.0.
*/
interface ShortInfoProviderInterface
{
......
......@@ -109,7 +109,7 @@ class AdminPanelView
[] as $className
) {
trigger_error(
'The hook $GLOBALS[\'TYPO3_CONF_VARS\'][\'SC_OPTIONS\'][\'tslib/class.tslib_adminpanel.php\'][\'extendAdminPanel\'] is deprecated, register an AdminPanelModule instead.',
'The hook $GLOBALS[TYPO3_CONF_VARS][SC_OPTIONS][tslib/class.tslib_adminpanel.php][extendAdminPanel] will be removed in TYPO3 v10.0, register an AdminPanelModule instead.',
E_USER_DEPRECATED
);
$hookObject = GeneralUtility::makeInstance($className);
......@@ -135,7 +135,7 @@ class AdminPanelView
/**
* Render a single module with header panel
*
* @deprecated Since TYPO3 v9 - only used in deprecated hook call (which triggers the corresponding deprecation error)
* @deprecated since TYPO3 v9 - only used in deprecated hook call (which triggers the corresponding deprecation error)
* @param ModuleInterface $module
* @return string
*/
......@@ -173,7 +173,7 @@ class AdminPanelView
/**
* Wraps a string in a link which will open/close a certain part of the Admin Panel
*
* @deprecated Since TYPO3 v9 - only used in deprecated hook call (which triggers the corresponding deprecation error)
* @deprecated since TYPO3 v9, will be removed in TYPO3 v10.0. Only used in deprecated hook call (which triggers the corresponding deprecation error)
* @param ModuleInterface $module
* @return string
*/
......@@ -203,13 +203,13 @@ class AdminPanelView
/**
* Creates the tool bar links for the "edit" section of the Admin Panel.
*
* @deprecated since TYPO3 v9, will be removed in TYPO3 v10. Use EditToolbarService instead or create buttons via fluid
* @deprecated since TYPO3 v9, will be removed in TYPO3 v10.0. Use EditToolbarService instead or create buttons via fluid
* @return string A string containing images wrapped in <a>-tags linking them to proper functions.
*/
public function ext_makeToolBar(): string
{
trigger_error(
'Deprecated since TYPO3 v9, use fluid and backend uri builder to create a toolbar',
'AdminPanelView::ext_makeToolBar() will be removed in TYPO3 v10.0, use fluid and backend uri builder to create a toolbar.',
E_USER_DEPRECATED
);
$editToolbarService = GeneralUtility::makeInstance(EditToolbarService::class);
......@@ -221,7 +221,7 @@ class AdminPanelView
*
* @param string $key Key for a label in the $LOCAL_LANG array of "EXT:core/Resources/Private/Language/locallang_tsfe.xlf
* @param bool $convertWithHtmlspecialchars If TRUE the language-label will be sent through htmlspecialchars
* @deprecated Since TYPO3 v9, will be removed in TYPO3 v10.0 - only used in deprecated methods
* @deprecated since TYPO3 v9, will be removed in TYPO3 v10.0 - only used in deprecated methods
* @return string The value for the $key
*/
protected function extGetLL($key, $convertWithHtmlspecialchars = true)
......@@ -237,14 +237,12 @@ class AdminPanelView
* Add an additional stylesheet
*
* @return string
* @deprecated Since TYPO3 v9, will be removed in TYPO3 v10.0 - implement AdminPanelModules via the new API (see AdminPanelModuleInterface)
* @deprecated since TYPO3 v9, will be removed in TYPO3 v10.0 - implement AdminPanelModules via the new API (see AdminPanelModuleInterface)
*/
public function getAdminPanelHeaderData()
{
trigger_error(
'AdminPanelView->' .
__METHOD__ .
' will be removed in TYPO3 v10.0. Implement AdminPanelModules via the new API (see AdminPanelModuleInterface).',
'AdminPanelView->getAdminPanelHeaderData() will be removed in TYPO3 v10.0. Implement AdminPanelModules via the new API (see AdminPanelModuleInterface).',
E_USER_DEPRECATED
);
$result = '';
......@@ -261,14 +259,12 @@ class AdminPanelView
*
* @param string $key The module key, eg. "edit", "preview", "info" etc.
* @return bool
* @deprecated Since TYPO3 v9, will be removed in TYPO3 v10.0 - implement AdminPanelModules via the new API (see AdminPanelModuleInterface)
* @deprecated since TYPO3 v9, will be removed in TYPO3 v10.0 - implement AdminPanelModules via the new API (see AdminPanelModuleInterface)
*/
public function isAdminModuleEnabled($key)
{
trigger_error(
'AdminPanelView->' .
__METHOD__ .
' will be removed in TYPO3 v10.0. Implement AdminPanelModules via the new API (see AdminPanelModuleInterface).',
'AdminPanelView->isAdminModuleEnabled() will be removed in TYPO3 v10.0. Implement AdminPanelModules via the new API (see AdminPanelModuleInterface).',
E_USER_DEPRECATED
);
$result = false;
......@@ -286,14 +282,12 @@ class AdminPanelView
/**
* Saves any change in settings made in the Admin Panel.
*
* @deprecated Since TYPO3 v9, will be removed in TYPO3 v10.0 - implement AdminPanelModules via the new API (see AdminPanelModuleInterface)
* @deprecated since TYPO3 v9, will be removed in TYPO3 v10.0 - implement AdminPanelModules via the new API (see AdminPanelModuleInterface)
*/
public function saveConfigOptions()
{
trigger_error(
'AdminPanelView->' .
__METHOD__ .
' will be removed in TYPO3 v10.0. Implement AdminPanelModules via the new API (see AdminPanelModuleInterface).',
'AdminPanelView->saveConfigOptions() will be removed in TYPO3 v10.0. Implement AdminPanelModules via the new API (see AdminPanelModuleInterface).',
E_USER_DEPRECATED
);
$input = GeneralUtility::_GP('TSFE_ADMIN_PANEL');
......@@ -327,18 +321,12 @@ class AdminPanelView
* @param string $sectionName Module key
* @param string $val Setting key
* @return mixed The setting value
* @deprecated Since TYPO3 v9, will be removed in TYPO3 v10.0 - implement AdminPanelModules via the new API (see AdminPanelModuleInterface)
* @deprecated since TYPO3 v9, will be removed in TYPO3 v10.0 - implement AdminPanelModules via the new API (see AdminPanelModuleInterface)
*/
public function extGetFeAdminValue($sectionName, $val = '')
{
trigger_error(
'AdminPanelView->' .
__METHOD__ .
' will be removed in TYPO3 v10.0. Implement AdminPanelModules via the new API (see AdminPanelModuleInterface).',
E_USER_DEPRECATED
);
trigger_error(
'Deprecated since TYPO3 v9 - ',
'AdminPanelView->extGetFeAdminValue() will be removed in TYPO3 v10.0. Implement AdminPanelModules via the new API (see AdminPanelModuleInterface).',
E_USER_DEPRECATED
);
if (!$this->isAdminModuleEnabled($sectionName)) {
......@@ -385,9 +373,7 @@ class AdminPanelView
public function forcePreview()
{
trigger_error(
'AdminPanelView->' .
__METHOD__ .
' will be removed in TYPO3 v10.0. Use new AdminPanel Preview Module instead.',
'AdminPanelView->forcePreview() will be removed in TYPO3 v10.0. Use new AdminPanel Preview Module instead.',
E_USER_DEPRECATED
);
$this->ext_forcePreview = true;
......@@ -403,7 +389,7 @@ class AdminPanelView
public function isAdminModuleOpen($key)
{
trigger_error(
'AdminPanelView->' . __METHOD__ . ' will be removed in TYPO3 v10.0. Use new AdminPanel API instead.',
'AdminPanelView->isAdminModuleOpen() will be removed in TYPO3 v10.0. Use new AdminPanel API instead.',
E_USER_DEPRECATED
);
return $this->getBackendUser()->uc['AdminPanel']['display_top'] &&
......@@ -426,7 +412,7 @@ class AdminPanelView
public function extGetItem($title, $content = '', $checkbox = '', $outerDivClass = null, $innerDivClass = null)
{
trigger_error(
'AdminPanelView->' . __METHOD__ . ' will be removed in TYPO3 v10.0. Use new AdminPanel API instead.',
'AdminPanelView->extGetItem() will be removed in TYPO3 v10.0. Use new AdminPanel API instead.',
E_USER_DEPRECATED
);
$title = $title ? '<label for="' . htmlspecialchars($title) . '">' . $this->extGetLL($title) . '</label>' : '';
......@@ -450,7 +436,7 @@ class AdminPanelView
public function extGetHead($sectionSuffix)
{
trigger_error(
'AdminPanelView->' . __METHOD__ . ' will be removed in TYPO3 v10.0. Use new AdminPanel API instead.',
'AdminPanelView->extGetHead() will be removed in TYPO3 v10.0. Use new AdminPanel API instead.',
E_USER_DEPRECATED
);
return $this->linkSectionHeader($sectionSuffix, $this->extGetLL($sectionSuffix));
......@@ -469,7 +455,7 @@ class AdminPanelView
public function linkSectionHeader($sectionSuffix, $sectionTitle, $className = '')
{
trigger_error(
'AdminPanelView->' . __METHOD__ . ' will be removed in TYPO3 v10.0. Use new AdminPanel API instead.',
'AdminPanelView->linkSectionHeader() will be removed in TYPO3 v10.0. Use new AdminPanel API instead.',
E_USER_DEPRECATED
);
$onclick = 'document.TSFE_ADMIN_PANEL_FORM[' .
......
......@@ -17,7 +17,7 @@ namespace TYPO3\CMS\Adminpanel\View;
/**
* Interface for classes which hook into AdminPanelView
*
* @deprecated since v9 will be removed in v10 - see AdminPanelModuleInterface
* @deprecated since TYPO3 v9 will be removed in TYPO3 v10.0 - see AdminPanelModuleInterface
*/
interface AdminPanelViewHookInterface
{
......
......@@ -24,6 +24,8 @@ use TYPO3\CMS\Core\Utility\GeneralUtility;
/**
* Contains translation tools
*
* @internal The whole class is subject to be removed, fetch all language info from the current site object.
*/
class TranslationConfigurationProvider
{
......@@ -187,11 +189,11 @@ class TranslationConfigurationProvider
*
* @param string $table The table name
* @return string
* @deprecated since TYPO3 v9, will be removed in TYPO3 v10 as foreign translation table is not supported anymore
* @deprecated since TYPO3 v9, will be removed in TYPO3 v10.0 as foreign translation table is not supported anymore
*/
public function getTranslationTable($table)
{
trigger_error('getTranslationTable() will be removed in TYPO3 v10, as the translation table is always the same as the original table.', E_USER_DEPRECATED);
trigger_error('TranslationConfigurationProvider->getTranslationTable() will be removed in TYPO3 v10.0, as the translation table is always the same as the original table.', E_USER_DEPRECATED);
return BackendUtility::isTableLocalizable($table) ? $table : '';
}
......@@ -200,11 +202,11 @@ class TranslationConfigurationProvider
*
* @param string $table The table name
* @return bool
* @deprecated since TYPO3 v9, will be removed in TYPO3 v10 as foreign translation table is not supported anymore
* @deprecated since TYPO3 v9, will be removed in TYPO3 v10.0 as foreign translation table is not supported anymore
*/
public function isTranslationInOwnTable($table)
{
trigger_error('isTranslationInOwnTable() will be removed in TYPO3 v10, as the translation table is always the same as the original table.', E_USER_DEPRECATED);
trigger_error('TranslationConfigurationProvider->isTranslationInOwnTable() will be removed in TYPO3 v10.0, as the translation table is always the same as the original table.', E_USER_DEPRECATED);
return $GLOBALS['TCA'][$table]['ctrl']['languageField'] && $GLOBALS['TCA'][$table]['ctrl']['transOrigPointerField'];
}
......@@ -215,11 +217,11 @@ class TranslationConfigurationProvider
*
* @param string $table The table name
* @return string Translation foreign table
* @deprecated since TYPO3 v9, will be removed in TYPO3 v10 as foreign translation table is not supported anymore
* @deprecated since TYPO3 v9, will be removed in TYPO3 v10.0 as foreign translation table is not supported anymore
*/
public function foreignTranslationTable($table)
{
trigger_error('foreignTranslationTable() will be removed in TYPO3 v10, as the translation table is always the same as the original table.', E_USER_DEPRECATED);
trigger_error('TranslationConfigurationProvider->foreignTranslationTable() will be removed in TYPO3 v10.0, as the translation table is always the same as the original table.', E_USER_DEPRECATED);
return '';
}
......
......@@ -77,7 +77,7 @@ class ConditionMatcher extends AbstractConditionMatcher
protected function evaluateCondition($string)
{
if ($this->strictSyntaxEnabled()) {
trigger_error('The old condition syntax has been deprecated and will be removed in TYPO3 CMS 10, use the new expression language. condition: [' . $string . ']', E_USER_DEPRECATED);
trigger_error('The old condition syntax will be removed in TYPO3 v10.0, use the new expression language. Used condition: [' . $string . '].', E_USER_DEPRECATED);
}
list($key, $value) = GeneralUtility::trimExplode('=', $string, false, 2);
......
......@@ -47,7 +47,7 @@ class BackendController
* @var array
*/
private $deprecatedPublicMethods = [
'render' => 'Using BackendController::render() is deprecated and will not be possible anymore in TYPO3 v10.',
'render' => 'Using BackendController::render() is deprecated and will not be possible anymore in TYPO3 v10.0.',
];
/**
......
......@@ -46,7 +46,7 @@ class ElementInformationController
* @var array
*/
private $deprecatedPublicMethods = [
'getLabelForTableColumn' => 'Using ElementInformationController::getLabelForTableColumn() is deprecated and will not be possible anymore in TYPO3 v10.',
'getLabelForTableColumn' => 'Using ElementInformationController::getLabelForTableColumn() is deprecated and will not be possible anymore in TYPO3 v10.0.',
];
/**
......@@ -138,9 +138,9 @@ class ElementInformationController
$this->iconFactory = GeneralUtility::makeInstance(IconFactory::class);
$GLOBALS['SOBE'] = $this;
// @deprecated since v9, will be obsolete in v10 with removal of init()
// @deprecated since TYPO3 v9, will be obsolete in TYPO3 v10.0 with removal of init()
$request = $GLOBALS['TYPO3_REQUEST'];
// @deprecated since v9, will be moved out of __construct() in v10
// @deprecated since TYPO3 v9, will be moved out of __construct() in TYPO3 v10.0
$this->init($request);
}
......@@ -167,10 +167,10 @@ class ElementInformationController
{
if ($request === null) {
// Missing argument? This method must have been called from outside.
// Method will be protected and $request mandatory in v10, giving core freedom to move stuff around
// Method will be protected and $request mandatory in TYPO3 v10.0, giving core freedom to move stuff around
// New v10 signature: "protected function init(ServerRequestInterface $request): void"
// @deprecated since TYPO3 v9, method argument $request will be set to mandatory
trigger_error('Method init() will be set to protected in v10. Do not call from other extension', E_USER_DEPRECATED);
trigger_error('ElementInformationController->init() will be set to protected in TYPO3 v10.0. Do not call from other extension.', E_USER_DEPRECATED);
$request = $GLOBALS['TYPO3_REQUEST'];
}
......@@ -250,7 +250,7 @@ class ElementInformationController
if ($request === null) {
// Missing argument? This method must have been called from outside.
// @deprecated since TYPO3 v9, method argument $request will be set to mandatory
trigger_error('Method main() will be set to protected in v10. Do not call from other extension', E_USER_DEPRECATED);
trigger_error('ElementInformationController->main() will be set to protected in TYPO3 v10.0. Do not call from other extension.', E_USER_DEPRECATED);
$request = $GLOBALS['TYPO3_REQUEST'];
}
......
......@@ -118,9 +118,9 @@ class MoveElementController
$this->moduleTemplate = GeneralUtility::makeInstance(ModuleTemplate::class);
$this->getLanguageService()->includeLLFile('EXT:core/Resources/Private/Language/locallang_misc.xlf');
// @deprecated since v9, will be obsolete in v10 with removal of init()
// @deprecated since TYPO3 v9, will be obsolete in TYPO3 v10.0 with removal of init()
$request = $GLOBALS['TYPO3_REQUEST'];
// @deprecated since v9, will be moved out of __construct() in v10
// @deprecated since TYPO3 v9, will be moved out of __construct() in TYPO3 v10.0
$this->init($request);
}
......@@ -146,8 +146,8 @@ class MoveElementController
public function init(ServerRequestInterface $request = null)
{
if ($request === null) {
// Method signature in v10: protected function init(ServerRequestInterface $request)
trigger_error('Method init() will be set to protected in v10. Do not call from other extension', E_USER_DEPRECATED);
// Method signature in TYPO3 v10.0: protected function init(ServerRequestInterface $request)
trigger_error('MoveElementController->init() will be set to protected in TYPO3 v10.0. Do not call from other extension.', E_USER_DEPRECATED);
$request = $GLOBALS['TYPO3_REQUEST'];
}
......@@ -287,11 +287,11 @@ class MoveElementController
/**
* Creating the module output.
*
* @deprecated since v9, will be removed in v10
* @deprecated since TYPO3 v9, will be removed in TYPO3 v10.0
*/
public function main()
{
trigger_error('Method main() will be replaced by protected method renderContent() in v10. Do not call from other extension', E_USER_DEPRECATED);
trigger_error('MoveElementController->main() will be replaced by protected method renderContent() in TYPO3 v10.0. Do not call from other extension.', E_USER_DEPRECATED);
$this->renderContent();
}
......
......@@ -167,9 +167,9 @@ class NewContentElementController
$this->view = $this->getFluidTemplateObject();
$this->menuItemView = $this->getFluidTemplateObject('MenuItem.html');
// @deprecated since v9, will be obsolete in v10 with removal of init()
// @deprecated since TYPO3 v9, will be obsolete in TYPO3 v10.0 with removal of init()
$request = $GLOBALS['TYPO3_REQUEST'];
// @deprecated since v9, will be moved out of __construct() in v10
// @deprecated since TYPO3 v9, will be moved out of __construct() in TYPO3 v10.0
$this->init($request);
}
......@@ -181,8 +181,8 @@ class NewContentElementController
public function init(ServerRequestInterface $request = null)
{
if ($request === null) {
// Method signature in v10: protected function init(ServerRequestInterface $request)
trigger_error('Method init() will be set to protected in v10. Do not call from other extension', E_USER_DEPRECATED);
// Method signature in TYPO3 v10.0: protected function init(ServerRequestInterface $request)
trigger_error('NewContentElementController->init() will be set to protected in TYPO3 v10.0. Do not call from other extension.', E_USER_DEPRECATED);
$request = $GLOBALS['TYPO3_REQUEST'];
}
......@@ -252,7 +252,7 @@ class NewContentElementController
*/
public function main()
{
trigger_error('Method main() will be replaced by protected method prepareContent() in v10. Do not call from other extension', E_USER_DEPRECATED);
trigger_error('NewContentElementController->main() will be replaced by protected method prepareContent() in TYPO3 v10.0. Do not call from other extension.', E_USER_DEPRECATED);
$this->prepareContent('window');
}
......@@ -264,7 +264,7 @@ class NewContentElementController
*/
public function wizardArray()
{
trigger_error('Method wizardArray() will be replaced by protected method getWizards() in v10. Do not call from other extension', E_USER_DEPRECATED);
trigger_error('NewContentElementController->wizardArray() will be replaced by protected method getWizards() in TYPO3 v10.0. Do not call from other extension.', E_USER_DEPRECATED);
return $this->getWizards();
}
......@@ -274,7 +274,7 @@ class NewContentElementController
*/
public function wizard_appendWizards($wizardElements)
{
trigger_error('Method wizard_appendWizards() will be replaced by protected method getAppendWizards() in v10. Do not call from other extension', E_USER_DEPRECATED);
trigger_error('NewContentElementController->wizard_appendWizards() will be replaced by protected method getAppendWizards() in TYPO3 v10.0. Do not call from other extension.', E_USER_DEPRECATED);
return $this->getAppendWizards($wizardElements);
}
......@@ -286,7 +286,7 @@ class NewContentElementController
*/
public function wizard_getItem($groupKey, $itemKey, $itemConf)
{
trigger_error('Method wizard_getItem() will be replaced by protected method getWizardItem() in v10. Do not call from other extension', E_USER_DEPRECATED);
trigger_error('NewContentElementController->wizard_getItem() will be replaced by protected method getWizardItem() in TYPO3 v10.0. Do not call from other extension.', E_USER_DEPRECATED);
return $this->getWizardItem($groupKey, $itemKey, $itemConf);
}
......@@ -297,7 +297,7 @@ class NewContentElementController
*/
public function wizard_getGroupHeader($groupKey, $wizardGroup)
{
trigger_error('Method wizard_getGroupHeader() will be replaced by protected method getWizardGroupHeader() in v10. Do not call from other extension', E_USER_DEPRECATED);
trigger_error('NewContentElementController->wizard_getGroupHeader() will be replaced by protected method getWizardGroupHeader() in TYPO3 v10.0. Do not call from other extension.', E_USER_DEPRECATED);
return $this->getWizardGroupHeader($wizardGroup);
}
......@@ -311,7 +311,7 @@ class NewContentElementController
*/
public function removeInvalidElements(&$wizardItems)
{
trigger_error('Method removeInvalidElements() will be replaced by protected method removeInvalidWizardItems() in v10. Do not call from other extension', E_USER_DEPRECATED);
trigger_error('NewContentElementController->removeInvalidElements() will be replaced by protected method removeInvalidWizardItems() in TYPO3 v10.0. Do not call from other extension.', E_USER_DEPRECATED);
$this->removeInvalidWizardItems($wizardItems);
}
......
......@@ -46,7 +46,7 @@ class CreateFolderController
* @var array
*/
private $deprecatedPublicMethods = [
'main' => 'Using CreateFolderController::main() is deprecated and will not be possible anymore in TYPO3 v10.',
'main' => 'Using CreateFolderController::main() is deprecated and will not be possible anymore in TYPO3 v10.0.',
];
/**
......@@ -70,7 +70,7 @@ class CreateFolderController
* Name of the filemount
*
* @var string
* @deprecated since v9, will be removed in v10, unused
* @deprecated since TYPO3 v9, will be removed in TYPO3 v10.0, unused
*/
protected $title;
......@@ -109,7 +109,7 @@ class CreateFolderController
* Accumulating content
*
* @var string
* @deprecated since v9, will be removed in v10, unused
* @deprecated since TYPO3 v9, will be removed in TYPO3 v10.0, unused
*/
protected $content;
......@@ -126,7 +126,7 @@ class CreateFolderController
public function __construct()
{
$this->moduleTemplate = GeneralUtility::makeInstance(ModuleTemplate::class);
// @deprecated since v9, will be moved out of __construct() in v10
// @deprecated since TYPO3 v9, will be moved out of __construct() in TYPO3 v10.0
$this->init($GLOBALS['TYPO3_REQUEST']);
}
......
......@@ -50,7 +50,7 @@ class EditFileController
* @var array
*/
private $deprecatedPublicMethods = [
'main' => 'Using EditFileController::main() is deprecated and will not be possible anymore in TYPO3 v10.',
'main' => 'Using EditFileController::main() is deprecated and will not be possible anymore in TYPO3 v10.0.',
];
/**
......@@ -80,7 +80,7 @@ class EditFileController
* Document template object
*
* @var DocumentTemplate
* @deprecated since v9, will be removed in v10, unused
* @deprecated since TYPO3 v9, will be removed in TYPO3 v10.0, unused
*/
protected $doc;
......@@ -125,7 +125,7 @@ class EditFileController
public function __construct()
{
$this->moduleTemplate = GeneralUtility::makeInstance(ModuleTemplate::class);
// @deprecated since v9, will be moved out of __construct() in v10
// @deprecated since TYPO3 v9, will be moved out of __construct() in TYPO3 v10.0
$this->init($GLOBALS['TYPO3_REQUEST']);
}
......@@ -336,11 +336,11 @@ class EditFileController
/**
* Builds the buttons for the docheader and returns them as an
*
* @deprecated since TYPO3 v9, will be set protected in TYPO3 v10
* @deprecated since TYPO3 v9, will be set protected in TYPO3 v10.0
*/
public function getButtons()
{
trigger_error('Method getButtons() will be replaced by protected method getButtonsInternal() in v10. Do not call from other extension', E_USER_DEPRECATED);
trigger_error('EditFileController->getButtons() will be replaced by protected method getButtonsInternal() in TYPO3 v10.0. Do not call from other extension.', E_USER_DEPRECATED);
$this->getButtonsInternal();
}
......
......@@ -49,8 +49,8 @@ class FileController
* @var array
*/
private $deprecatedPublicMethods = [
'initClipboard' => 'Using FileController::initClipboard() is deprecated and will not be possible anymore in TYPO3 v10.',
'main' => 'Using FileController::main() is deprecated and will not be possible anymore in TYPO3 v10.',
'initClipboard' => 'Using FileController::initClipboard() is deprecated and will not be possible anymore in TYPO3 v10.0.',
'main' => 'Using FileController::main() is deprecated and will not be possible anymore in TYPO3 v10.0.',
];
/**
......@@ -102,7 +102,7 @@ class FileController
*/
public function __construct()
{
// @deprecated since v9, will be moved out of __construct() in v10
// @deprecated since TYPO3 v9, will be moved out of __construct() in TYPO3 v10.0
$this->init($GLOBALS['TYPO3_REQUEST']);
}
......@@ -264,11 +264,11 @@ class FileController
* Redirecting the user after the processing has been done.
* Might also display error messages directly, if any.
*
* @deprecated since TYPO3 v9. Will be removed in v10.
* @deprecated since TYPO3 v9. Will be removed in TYPO3 v10.0.
*/
public function finish()
{
trigger_error('Method finish() will be removed in v10. Do not call from other extension', E_USER_DEPRECATED);
trigger_error('FileController->finish() will be removed in TYPO3 v10.0. Do not call from other extension.', E_USER_DEPRECATED);
BackendUtility::setUpdateSignal('updateFolderTree');
if ($this->redirect) {
HttpUtility::redirect($this->redirect);
......
......@@ -93,7 +93,7 @@ class FileUploadController
$this->moduleTemplate = GeneralUtility::makeInstance(ModuleTemplate::class);
$this->getLanguageService()->includeLLFile('EXT:core/Resources/Private/Language/locallang_misc.xlf');
// @deprecated since v9, will be moved out of __construct() in v10
// @deprecated since TYPO3 v9, will be moved out of __construct() in TYPO3 v10.0
$this->init($GLOBALS['TYPO3_REQUEST']);
}
......@@ -112,11 +112,11 @@ class FileUploadController
/**
* Main function, rendering the upload file form fields
*
* @deprecated since v9, will be removed in v10
* @deprecated since TYPO3 v9, will be removed in TYPO3 v10.0
*/
public function main()
{
trigger_error('Method main() will be replaced by protected method renderContent() in v10. Do not call from other extension', E_USER_DEPRECATED);
trigger_error('FileUploadController->main() will be replaced by protected method renderContent() in TYPO3 v10.0. Do not call from other extension.', E_USER_DEPRECATED);
$this->renderContent();
}
......@@ -124,11 +124,11 @@ class FileUploadController
* This function renders the upload form
*
* @return string The HTML form as a string, ready for outputting
* @deprecated since v9, will be removed in v10
* @deprecated since TYPO3 v9, will be removed in TYPO3 v10.0
*/
public function renderUploadForm()
{
trigger_error('Method renderUploadForm() will be replaced by protected method renderUploadFormInternal() in v10. Do not call from other extension', E_USER_DEPRECATED);
trigger_error('FileUploadController->renderUploadForm() will be replaced by protected method renderUploadFormInternal() in TYPO3 v10.0. Do not call from other extension.', E_USER_DEPRECATED);
return $this->renderUploadFormInternal();
}
......
......@@ -99,7 +99,7 @@ class RenameFileController
{
$this->moduleTemplate = GeneralUtility::makeInstance(ModuleTemplate::class);
// @deprecated since v9, will be moved out of __construct() in v10
// @deprecated since TYPO3 v9, will be moved out of __construct() in TYPO3 v10.0
$this->init($GLOBALS['TYPO3_REQUEST']);
}
......@@ -119,11 +119,11 @@ class RenameFileController
/**
* Main function, rendering the content of the rename form
*
* @deprecated since v9, will be removed in v10
* @deprecated since TYPO3 v9, will be removed in TYPO3 v10.0
*/
public function main()
{
trigger_error('Method main() will be replaced by protected method renderContent() in v10. Do not call from other extension', E_USER_DEPRECATED);
trigger_error('RenameFileController->main() will be replaced by protected method renderContent() in TYPO3 v10.0. Do not call from other extension.', E_USER_DEPRECATED);
$this->renderContent();
}
......
......@@ -103,7 +103,7 @@ class ReplaceFileController
{
$this->moduleTemplate = GeneralUtility::makeInstance(ModuleTemplate::class);
// @deprecated since v9, will be moved out of __construct() in v10
// @deprecated since TYPO3 v9, will be moved out of __construct() in TYPO3 v10.0
$this->init($GLOBALS['TYPO3_REQUEST']);
}
......@@ -124,7 +124,7 @@ class ReplaceFileController
*/