From 46b5493781fd4f241901e3e19de487ad01b1a818 Mon Sep 17 00:00:00 2001 From: Christian Kuhn Date: Mon, 14 Jan 2019 16:06:11 +0100 Subject: [PATCH] [!!!][TASK] Remove deprecated code from backend Controller/File Resolves: #87431 Releases: master Change-Id: Idb7a87bce6d7edee409bc24348b185ea51c17de2 Reviewed-on: https://review.typo3.org/59428 Tested-by: TYPO3com Reviewed-by: Wouter Wolters Tested-by: Wouter Wolters Reviewed-by: Benni Mack Tested-by: Benni Mack --- .../File/CreateFolderController.php | 52 +-------------- .../Controller/File/FileController.php | 43 ++---------- .../Controller/File/FileUploadController.php | 58 +---------------- .../Controller/File/RenameFileController.php | 65 +------------------ .../Controller/File/ReplaceFileController.php | 61 +---------------- ...g-87193-DeprecatedFunctionalityRemoved.rst | 27 ++++++++ .../Php/MethodCallMatcher.php | 3 + .../Php/PropertyProtectedMatcher.php | 10 +++ .../Php/PropertyPublicMatcher.php | 4 ++ 9 files changed, 59 insertions(+), 264 deletions(-) diff --git a/typo3/sysext/backend/Classes/Controller/File/CreateFolderController.php b/typo3/sysext/backend/Classes/Controller/File/CreateFolderController.php index 620f5cea2eae..8a66ef77e703 100644 --- a/typo3/sysext/backend/Classes/Controller/File/CreateFolderController.php +++ b/typo3/sysext/backend/Classes/Controller/File/CreateFolderController.php @@ -20,8 +20,6 @@ use TYPO3\CMS\Backend\Routing\UriBuilder; use TYPO3\CMS\Backend\Template\ModuleTemplate; use TYPO3\CMS\Backend\Utility\BackendUtility; -use TYPO3\CMS\Core\Compatibility\PublicMethodDeprecationTrait; -use TYPO3\CMS\Core\Compatibility\PublicPropertyDeprecationTrait; use TYPO3\CMS\Core\Http\HtmlResponse; use TYPO3\CMS\Core\Imaging\Icon; use TYPO3\CMS\Core\Localization\LanguageService; @@ -40,41 +38,11 @@ */ class CreateFolderController { - use PublicMethodDeprecationTrait; - use PublicPropertyDeprecationTrait; - - /** - * @var array - */ - private $deprecatedPublicMethods = [ - 'main' => 'Using CreateFolderController::main() is deprecated and will not be possible anymore in TYPO3 v10.0.', - ]; - - /** - * @var array - */ - private $deprecatedPublicProperties = [ - 'number' => 'Using $number of class CreateFolderController from outside is discouraged, as this variable is only used for internal storage.', - 'folderNumber' => 'Using $folderNumber of class CreateFolderController from outside is discouraged, as this variable is only used for internal storage.', - 'target' => 'Using $target of class CreateFolderController from outside is discouraged, as this variable is only used for internal storage.', - 'content' => 'Using $content of class CreateFolderController from outside is discouraged, as this variable is only used for internal storage.', - 'returnUrl' => 'Using $content of class CreateFolderController from outside is discouraged, as this variable is only used for internal storage.', - 'title' => 'Using $content of class CreateFolderController from outside is discouraged, as this variable is only used for internal storage.', - ]; - /** * @var int */ protected $folderNumber = 10; - /** - * Name of the filemount - * - * @var string - * @deprecated since TYPO3 v9, will be removed in TYPO3 v10.0, unused - */ - protected $title; - /** * @var int */ @@ -106,14 +74,6 @@ class CreateFolderController */ protected $pathInfo; - /** - * Accumulating content - * - * @var string - * @deprecated since TYPO3 v9, will be removed in TYPO3 v10.0, unused - */ - protected $content; - /** * ModuleTemplate object * @@ -121,16 +81,6 @@ class CreateFolderController */ protected $moduleTemplate; - /** - * Constructor - */ - public function __construct() - { - $this->moduleTemplate = GeneralUtility::makeInstance(ModuleTemplate::class); - // @deprecated since TYPO3 v9, will be moved out of __construct() in TYPO3 v10.0 - $this->init($GLOBALS['TYPO3_REQUEST']); - } - /** * Processes the request, currently everything is handled and put together via "main()" * @@ -139,6 +89,8 @@ public function __construct() */ public function mainAction(ServerRequestInterface $request): ResponseInterface { + $this->moduleTemplate = GeneralUtility::makeInstance(ModuleTemplate::class); + $this->init($request); $this->main(); return new HtmlResponse($this->moduleTemplate->renderContent()); } diff --git a/typo3/sysext/backend/Classes/Controller/File/FileController.php b/typo3/sysext/backend/Classes/Controller/File/FileController.php index a9dcddea6f09..01eada3da3c1 100644 --- a/typo3/sysext/backend/Classes/Controller/File/FileController.php +++ b/typo3/sysext/backend/Classes/Controller/File/FileController.php @@ -21,7 +21,6 @@ use TYPO3\CMS\Backend\Routing\UriBuilder; use TYPO3\CMS\Backend\Utility\BackendUtility; use TYPO3\CMS\Core\Authentication\BackendUserAuthentication; -use TYPO3\CMS\Core\Compatibility\PublicMethodDeprecationTrait; use TYPO3\CMS\Core\Http\HtmlResponse; use TYPO3\CMS\Core\Http\JsonResponse; use TYPO3\CMS\Core\Http\RedirectResponse; @@ -34,7 +33,6 @@ use TYPO3\CMS\Core\Resource\ResourceFactory; use TYPO3\CMS\Core\Utility\File\ExtendedFileUtility; use TYPO3\CMS\Core\Utility\GeneralUtility; -use TYPO3\CMS\Core\Utility\HttpUtility; /** * Gateway for TCE (TYPO3 Core Engine) file-handling through POST forms. @@ -44,16 +42,6 @@ */ class FileController { - use PublicMethodDeprecationTrait; - - /** - * @var array - */ - private $deprecatedPublicMethods = [ - '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.', - ]; - /** * Array of file-operations. * @@ -98,15 +86,6 @@ class FileController */ protected $fileData; - /** - * Constructor - */ - public function __construct() - { - // @deprecated since TYPO3 v9, will be moved out of __construct() in TYPO3 v10.0 - $this->init($GLOBALS['TYPO3_REQUEST']); - } - /** * Injects the request object for the current request or subrequest * As this controller goes only through the main() method, it just redirects to the given URL afterwards. @@ -116,6 +95,7 @@ public function __construct() */ public function mainAction(ServerRequestInterface $request): ResponseInterface { + $this->init($request); $this->main(); BackendUtility::setUpdateSignal('updateFolderTree'); @@ -138,15 +118,14 @@ public function mainAction(ServerRequestInterface $request): ResponseInterface /** * Handles the actual process from within the ajaxExec function - * therefore, it does exactly the same as the real typo3/tce_file.php - * but without calling the "finish" method, thus makes it simpler to deal with the - * actual return value + * therefore, it does exactly the same as the real typo3/tce_file.php. * * @param ServerRequestInterface $request * @return ResponseInterface */ public function processAjaxRequest(ServerRequestInterface $request): ResponseInterface { + $this->init($request); $this->main(); $errors = $this->fileProcessor->getErrorMessages(); if (!empty($errors)) { @@ -175,6 +154,7 @@ public function processAjaxRequest(ServerRequestInterface $request): ResponseInt */ public function fileExistsInFolderAction(ServerRequestInterface $request): ResponseInterface { + $this->init($request); $fileName = $request->getParsedBody()['fileName'] ?? $request->getQueryParams()['fileName'] ?? null; $fileTarget = $request->getParsedBody()['fileTarget'] ?? $request->getQueryParams()['fileTarget'] ?? null; @@ -277,21 +257,6 @@ protected function getFileEditRedirect(File $file): ?string return (string)$uriBuilder->buildUriFromRoute('file_edit', $urlParameters); } - /** - * 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 TYPO3 v10.0. - */ - public function finish() - { - 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); - } - } - /** * Flatten result value from FileProcessor * diff --git a/typo3/sysext/backend/Classes/Controller/File/FileUploadController.php b/typo3/sysext/backend/Classes/Controller/File/FileUploadController.php index 8e83722d35c0..a4c52de97976 100644 --- a/typo3/sysext/backend/Classes/Controller/File/FileUploadController.php +++ b/typo3/sysext/backend/Classes/Controller/File/FileUploadController.php @@ -18,7 +18,6 @@ use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ServerRequestInterface; use TYPO3\CMS\Backend\Template\ModuleTemplate; -use TYPO3\CMS\Core\Compatibility\PublicPropertyDeprecationTrait; use TYPO3\CMS\Core\Http\HtmlResponse; use TYPO3\CMS\Core\Imaging\Icon; use TYPO3\CMS\Core\Localization\LanguageService; @@ -32,25 +31,6 @@ */ class FileUploadController { - use PublicPropertyDeprecationTrait; - - /** - * @var array - */ - protected $deprecatedPublicProperties = [ - 'title' => 'Using $title of class FileUploadController from outside is discouraged as this variable is only used for internal storage.', - 'target' => 'Using $target of class FileUploadController from outside is discouraged as this variable is only used for internal storage.', - 'returnUrl' => 'Using $returnUrl of class FileUploadController from outside is discouraged as this variable is only used for internal storage.', - 'content' => 'Using $content of class FileUploadController from outside is discouraged as this variable is only used for internal storage.', - ]; - - /** - * Name of the filemount - * - * @var string - */ - protected $title; - /** * Set with the target path inputted in &target * @@ -86,18 +66,6 @@ class FileUploadController */ protected $moduleTemplate; - /** - * Constructor - */ - public function __construct() - { - $this->moduleTemplate = GeneralUtility::makeInstance(ModuleTemplate::class); - $this->getLanguageService()->includeLLFile('EXT:core/Resources/Private/Language/locallang_misc.xlf'); - - // @deprecated since TYPO3 v9, will be moved out of __construct() in TYPO3 v10.0 - $this->init($GLOBALS['TYPO3_REQUEST']); - } - /** * Processes the request, currently everything is handled and put together via "renderContent()" * @@ -106,33 +74,13 @@ public function __construct() */ public function mainAction(ServerRequestInterface $request): ResponseInterface { + $this->moduleTemplate = GeneralUtility::makeInstance(ModuleTemplate::class); + $this->getLanguageService()->includeLLFile('EXT:core/Resources/Private/Language/locallang_misc.xlf'); + $this->init($request); $this->renderContent(); return new HtmlResponse($this->moduleTemplate->renderContent()); } - /** - * Main function, rendering the upload file form fields - * - * @deprecated since TYPO3 v9, will be removed in TYPO3 v10.0 - */ - public function main() - { - 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(); - } - - /** - * This function renders the upload form - * - * @return string The HTML form as a string, ready for outputting - * @deprecated since TYPO3 v9, will be removed in TYPO3 v10.0 - */ - public function renderUploadForm() - { - 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(); - } - /** * Initialize * diff --git a/typo3/sysext/backend/Classes/Controller/File/RenameFileController.php b/typo3/sysext/backend/Classes/Controller/File/RenameFileController.php index 72c2c32d73cb..ddf06438107e 100644 --- a/typo3/sysext/backend/Classes/Controller/File/RenameFileController.php +++ b/typo3/sysext/backend/Classes/Controller/File/RenameFileController.php @@ -18,9 +18,7 @@ use Psr\Http\Message\ResponseInterface; use Psr\Http\Message\ServerRequestInterface; use TYPO3\CMS\Backend\Template\Components\ButtonBar; -use TYPO3\CMS\Backend\Template\DocumentTemplate; use TYPO3\CMS\Backend\Template\ModuleTemplate; -use TYPO3\CMS\Core\Compatibility\PublicPropertyDeprecationTrait; use TYPO3\CMS\Core\Http\HtmlResponse; use TYPO3\CMS\Core\Imaging\Icon; use TYPO3\CMS\Core\Localization\LanguageService; @@ -37,25 +35,6 @@ */ class RenameFileController { - use PublicPropertyDeprecationTrait; - - /** - * @var array - */ - protected $deprecatedPublicProperties = [ - 'title' => 'Using $title of class RenameFileController from outside is discouraged as this variable is only used for internal storage.', - 'target' => 'Using $target of class RenameFileController from outside is discouraged as this variable is only used for internal storage.', - 'returnUrl' => 'Using $returnUrl of class RenameFileController from outside is discouraged as this variable is only used for internal storage.', - 'content' => 'Using $content of class RenameFileController from outside is discouraged as this variable is only used for internal storage.', - ]; - - /** - * Name of the filemount - * - * @var string - */ - protected $title; - /** * Target path * @@ -78,14 +57,6 @@ class RenameFileController */ protected $returnUrl; - /** - * Accumulating content - * - * @var string - * @internal - */ - protected $content; - /** * ModuleTemplate object * @@ -93,17 +64,6 @@ class RenameFileController */ protected $moduleTemplate; - /** - * Constructor - */ - public function __construct() - { - $this->moduleTemplate = GeneralUtility::makeInstance(ModuleTemplate::class); - - // @deprecated since TYPO3 v9, will be moved out of __construct() in TYPO3 v10.0 - $this->init($GLOBALS['TYPO3_REQUEST']); - } - /** * Processes the request, currently everything is handled and put together via "renderContent()" * @@ -112,22 +72,12 @@ public function __construct() */ public function mainAction(ServerRequestInterface $request): ResponseInterface { + $this->moduleTemplate = GeneralUtility::makeInstance(ModuleTemplate::class); + $this->init($request); $this->renderContent(); - return new HtmlResponse($this->moduleTemplate->renderContent()); } - /** - * Main function, rendering the content of the rename form - * - * @deprecated since TYPO3 v9, will be removed in TYPO3 v10.0 - */ - public function main() - { - 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(); - } - /** * Initialize * @@ -259,8 +209,7 @@ protected function renderContent(): void 'EXT:backend/Resources/Private/Templates/File/RenameFile.html' )); $view->assignMultiple($assigns); - $this->content = $view->render(); - $this->moduleTemplate->setContent($this->content); + $this->moduleTemplate->setContent($view->render()); } /** @@ -270,12 +219,4 @@ protected function getLanguageService(): LanguageService { return $GLOBALS['LANG']; } - - /** - * @return DocumentTemplate - */ - protected function getDocumentTemplate(): DocumentTemplate - { - return $GLOBALS['TBE_TEMPLATE']; - } } diff --git a/typo3/sysext/backend/Classes/Controller/File/ReplaceFileController.php b/typo3/sysext/backend/Classes/Controller/File/ReplaceFileController.php index ecd4c2854521..cbefc8f1d954 100644 --- a/typo3/sysext/backend/Classes/Controller/File/ReplaceFileController.php +++ b/typo3/sysext/backend/Classes/Controller/File/ReplaceFileController.php @@ -19,7 +19,6 @@ use Psr\Http\Message\ServerRequestInterface; use TYPO3\CMS\Backend\Routing\UriBuilder; use TYPO3\CMS\Backend\Template\ModuleTemplate; -use TYPO3\CMS\Core\Compatibility\PublicPropertyDeprecationTrait; use TYPO3\CMS\Core\Http\HtmlResponse; use TYPO3\CMS\Core\Imaging\Icon; use TYPO3\CMS\Core\Localization\LanguageService; @@ -35,33 +34,6 @@ */ class ReplaceFileController { - use PublicPropertyDeprecationTrait; - - /** - * @var array - */ - protected $deprecatedPublicProperties = [ - 'doc' => 'Using $doc of class ReplaceFileController from outside is discouraged as this variable is only used for internal storage.', - 'title' => 'Using $title of class ReplaceFileController from outside is discouraged as this variable is only used for internal storage.', - 'uid' => 'Using $uid of class ReplaceFileController from outside is discouraged as this variable is only used for internal storage.', - 'returnUrl' => 'Using $returnUrl of class ReplaceFileController from outside is discouraged as this variable is only used for internal storage.', - 'content' => 'Using $content of class ReplaceFileController from outside is discouraged as this variable is only used for internal storage.', - ]; - - /** - * Document template object - * - * @var \TYPO3\CMS\Backend\Template\DocumentTemplate - */ - protected $doc; - - /** - * Name of the filemount - * - * @var string - */ - protected $title; - /** * sys_file uid * @@ -83,13 +55,6 @@ class ReplaceFileController */ protected $returnUrl; - /** - * Accumulating content - * - * @var string - */ - protected $content; - /** * ModuleTemplate object * @@ -97,17 +62,6 @@ class ReplaceFileController */ protected $moduleTemplate; - /** - * Constructor - */ - public function __construct() - { - $this->moduleTemplate = GeneralUtility::makeInstance(ModuleTemplate::class); - - // @deprecated since TYPO3 v9, will be moved out of __construct() in TYPO3 v10.0 - $this->init($GLOBALS['TYPO3_REQUEST']); - } - /** * Processes the request, currently everything is handled and put together via "main()" * @@ -116,19 +70,12 @@ public function __construct() */ public function mainAction(ServerRequestInterface $request): ResponseInterface { + $this->moduleTemplate = GeneralUtility::makeInstance(ModuleTemplate::class); + $this->init($request); $this->renderContent(); return new HtmlResponse($this->moduleTemplate->renderContent()); } - /** - * Main function, rendering the content of the replace form - */ - public function main() - { - trigger_error('ReplaceFileController->main() will be replaced by protected method renderContent() in TYPO3 v10.0. Do not call from other extension.', E_USER_DEPRECATED); - $this->renderContent(); - } - /** * Init * @@ -227,9 +174,7 @@ protected function renderContent(): void 'EXT:backend/Resources/Private/Templates/File/ReplaceFile.html' )); $view->assignMultiple($assigns); - $this->content = $view->render(); - - $this->moduleTemplate->setContent($this->content); + $this->moduleTemplate->setContent($view->render()); } /** 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 df6f9d74f1c2..a6c44d3574aa 100644 --- a/typo3/sysext/core/Documentation/Changelog/master/Breaking-87193-DeprecatedFunctionalityRemoved.rst +++ b/typo3/sysext/core/Documentation/Changelog/master/Breaking-87193-DeprecatedFunctionalityRemoved.rst @@ -206,6 +206,11 @@ The following PHP class methods that have been previously deprecated for v9 have * :php:`TYPO3\CMS\Backend\Controller\EditDocumentController->openInNewWindowLink()` * :php:`TYPO3\CMS\Backend\Controller\EditDocumentController->setDocument()` * :php:`TYPO3\CMS\Backend\Controller\EditDocumentController->shortCutLink()` +* :php:`TYPO3\CMS\Backend\Controller\File\FileController->finish()` +* :php:`TYPO3\CMS\Backend\Controller\File\FileUploadController->main()` +* :php:`TYPO3\CMS\Backend\Controller\File\FileUploadController->renderUploadForm()` +* :php:`TYPO3\CMS\Backend\Controller\File\RenameFileController->main()` +* :php:`TYPO3\CMS\Backend\Controller\File\ReplaceFileController->main()` * :php:`TYPO3\CMS\Backend\Controller\FileSystemNavigationFrameController->initPage()` * :php:`TYPO3\CMS\Backend\Controller\FileSystemNavigationFrameController->main()` * :php:`TYPO3\CMS\Backend\Controller\LoginController->main()` @@ -517,6 +522,14 @@ The following public class properties have been dropped: * :php:`TYPO3\CMS\Backend\Controller\EditDocumentController->popViewId_addParams` * :php:`TYPO3\CMS\Backend\Controller\EditDocumentController->redirect` * :php:`TYPO3\CMS\Backend\Controller\EditDocumentController->template` +* :php:`TYPO3\CMS\Backend\Controller\File\CreateFolderController->content` +* :php:`TYPO3\CMS\Backend\Controller\File\CreateFolderController->title` +* :php:`TYPO3\CMS\Backend\Controller\File\FileUploadController->title` +* :php:`TYPO3\CMS\Backend\Controller\File\RenameFileController->content` +* :php:`TYPO3\CMS\Backend\Controller\File\RenameFileController->title` +* :php:`TYPO3\CMS\Backend\Controller\File\ReplaceFileController->content` +* :php:`TYPO3\CMS\Backend\Controller\File\ReplaceFileController->doc` +* :php:`TYPO3\CMS\Backend\Controller\File\ReplaceFileController->title` * :php:`TYPO3\CMS\Backend\FrontendBackendUserAuthentication->extAdmEnabled` * :php:`TYPO3\CMS\Backend\FrontendBackendUserAuthentication->adminPanel` * :php:`TYPO3\CMS\Backend\FrontendBackendUserAuthentication->frontendEdit` @@ -652,7 +665,10 @@ The following class methods have changed visibility: * :php:`TYPO3\CMS\Backend\Controller\EditDocumentController->makeEditForm()` changed from public to protected * :php:`TYPO3\CMS\Backend\Controller\EditDocumentController->preInit()` changed from public to protected * :php:`TYPO3\CMS\Backend\Controller\EditDocumentController->processData()` changed from public to protected +* :php:`TYPO3\CMS\Backend\Controller\File\CreateFolderController->main()` changed from public to protected * :php:`TYPO3\CMS\Backend\Controller\File\EditFileController->main()` changed from public to protected +* :php:`TYPO3\CMS\Backend\Controller\File\FileController->initClipboard()` changed from public to protected +* :php:`TYPO3\CMS\Backend\Controller\File\FileController->main()` changed from public to protected * :php:`TYPO3\CMS\Backend\Controller\PageLayoutController->clearCache()` changed from public to protected * :php:`TYPO3\CMS\Backend\Controller\PageLayoutController->contentIsNotLockedForEditors()` changed from public to protected * :php:`TYPO3\CMS\Backend\Controller\PageLayoutController->getLocalizedPageTitle()` changed from public to protected @@ -849,12 +865,23 @@ The following class properties have changed visibility: * :php:`TYPO3\CMS\Backend\Controller\EditDocumentController->viewId` changed from public to protected * :php:`TYPO3\CMS\Backend\Controller\EditDocumentController->viewId_addParams` changed from public to protected * :php:`TYPO3\CMS\Backend\Controller\EditDocumentController->viewUrl` changed from public to protected +* :php:`TYPO3\CMS\Backend\Controller\File\CreateFolderController->folderNumber` changed from public to protected +* :php:`TYPO3\CMS\Backend\Controller\File\CreateFolderController->number` changed from public to protected +* :php:`TYPO3\CMS\Backend\Controller\File\CreateFolderController->returnUrl` changed from public to protected +* :php:`TYPO3\CMS\Backend\Controller\File\CreateFolderController->target` changed from public to protected * :php:`TYPO3\CMS\Backend\Controller\File\EditFileController->origTarget` changed from public to protected * :php:`TYPO3\CMS\Backend\Controller\File\EditFileController->target` changed from public to protected * :php:`TYPO3\CMS\Backend\Controller\File\EditFileController->returnUrl` changed from public to protected * :php:`TYPO3\CMS\Backend\Controller\File\EditFileController->content` changed from public to protected * :php:`TYPO3\CMS\Backend\Controller\File\EditFileController->title` changed from public to protected * :php:`TYPO3\CMS\Backend\Controller\File\EditFileController->doc` changed from public to protected +* :php:`TYPO3\CMS\Backend\Controller\File\FileUploadController->content` changed from public to protected +* :php:`TYPO3\CMS\Backend\Controller\File\FileUploadController->returnUrl` changed from public to protected +* :php:`TYPO3\CMS\Backend\Controller\File\FileUploadController->target` changed from public to protected +* :php:`TYPO3\CMS\Backend\Controller\File\RenameFileController->returnUrl` changed from public to protected +* :php:`TYPO3\CMS\Backend\Controller\File\RenameFileController->target` changed from public to protected +* :php:`TYPO3\CMS\Backend\Controller\File\ReplaceFileController->returnUrl` changed from public to protected +* :php:`TYPO3\CMS\Backend\Controller\File\ReplaceFileController->uid` changed from public to protected * :php:`TYPO3\CMS\Backend\Controller\FileSystemNavigationFrameController->content` changed from public to protected * :php:`TYPO3\CMS\Backend\Controller\FileSystemNavigationFrameController->foldertree` changed from public to protected * :php:`TYPO3\CMS\Backend\Controller\FileSystemNavigationFrameController->currentSubScript` changed from public to protected diff --git a/typo3/sysext/install/Configuration/ExtensionScanner/Php/MethodCallMatcher.php b/typo3/sysext/install/Configuration/ExtensionScanner/Php/MethodCallMatcher.php index 5bbe0a23f58f..5f7e4c155181 100644 --- a/typo3/sysext/install/Configuration/ExtensionScanner/Php/MethodCallMatcher.php +++ b/typo3/sysext/install/Configuration/ExtensionScanner/Php/MethodCallMatcher.php @@ -2242,6 +2242,7 @@ 'maximumNumberOfArguments' => 0, 'restFiles' => [ 'Deprecation-84326-ProtectedMethodsAndPropertiesInFileUploadController.rst', + 'Breaking-87193-DeprecatedFunctionalityRemoved.rst', ], ], 'TYPO3\CMS\Backend\Controller\File\FileController->initClipboard' => [ @@ -2249,6 +2250,7 @@ 'maximumNumberOfArguments' => 0, 'restFiles' => [ 'Deprecation-84324-UseServerRequestInterfaceInFileFileController.rst', + 'Breaking-87193-DeprecatedFunctionalityRemoved.rst', ], ], 'TYPO3\CMS\Backend\Controller\File\FileController->finish' => [ @@ -2256,6 +2258,7 @@ 'maximumNumberOfArguments' => 0, 'restFiles' => [ 'Deprecation-84324-UseServerRequestInterfaceInFileFileController.rst', + 'Breaking-87193-DeprecatedFunctionalityRemoved.rst', ], ], 'TYPO3\CMS\Backend\Controller\SimpleDataHandlerController->initClipboard' => [ diff --git a/typo3/sysext/install/Configuration/ExtensionScanner/Php/PropertyProtectedMatcher.php b/typo3/sysext/install/Configuration/ExtensionScanner/Php/PropertyProtectedMatcher.php index 754e5a5527a0..8365d6a18b43 100644 --- a/typo3/sysext/install/Configuration/ExtensionScanner/Php/PropertyProtectedMatcher.php +++ b/typo3/sysext/install/Configuration/ExtensionScanner/Php/PropertyProtectedMatcher.php @@ -399,36 +399,43 @@ 'TYPO3\CMS\Backend\Controller\File\FileUploadController->title' => [ 'restFiles' => [ 'Deprecation-84326-ProtectedMethodsAndPropertiesInFileUploadController.rst', + 'Breaking-87193-DeprecatedFunctionalityRemoved.rst', ], ], 'TYPO3\CMS\Backend\Controller\File\FileUploadController->target' => [ 'restFiles' => [ 'Deprecation-84326-ProtectedMethodsAndPropertiesInFileUploadController.rst', + 'Breaking-87193-DeprecatedFunctionalityRemoved.rst', ], ], 'TYPO3\CMS\Backend\Controller\File\FileUploadController->returnUrl' => [ 'restFiles' => [ 'Deprecation-84326-ProtectedMethodsAndPropertiesInFileUploadController.rst', + 'Breaking-87193-DeprecatedFunctionalityRemoved.rst', ], ], 'TYPO3\CMS\Backend\Controller\File\ReplaceFileController->doc' => [ 'restFiles' => [ 'Deprecation-84334-ProtectedMethodsAndPropertiesInReplaceFileController.rst', + 'Breaking-87193-DeprecatedFunctionalityRemoved.rst', ], ], 'TYPO3\CMS\Backend\Controller\File\ReplaceFileController->title' => [ 'restFiles' => [ 'Deprecation-84334-ProtectedMethodsAndPropertiesInReplaceFileController.rst', + 'Breaking-87193-DeprecatedFunctionalityRemoved.rst', ], ], 'TYPO3\CMS\Backend\Controller\File\ReplaceFileController->uid' => [ 'restFiles' => [ 'Deprecation-84334-ProtectedMethodsAndPropertiesInReplaceFileController.rst', + 'Breaking-87193-DeprecatedFunctionalityRemoved.rst', ], ], 'TYPO3\CMS\Backend\Controller\File\ReplaceFileController->returnUrl' => [ 'restFiles' => [ 'Deprecation-84334-ProtectedMethodsAndPropertiesInReplaceFileController.rst', + 'Breaking-87193-DeprecatedFunctionalityRemoved.rst', ], ], 'TYPO3\CMS\Backend\Controller\Wizard\AddController->processDataFlag' => [ @@ -449,16 +456,19 @@ 'TYPO3\CMS\Backend\Controller\File\RenameFileController->title' => [ 'restFiles' => [ 'Deprecation-84332-ProtectedMethodsAndPropertiesInRenameFileController.rst', + 'Breaking-87193-DeprecatedFunctionalityRemoved.rst', ], ], 'TYPO3\CMS\Backend\Controller\File\RenameFileController->target' => [ 'restFiles' => [ 'Deprecation-84332-ProtectedMethodsAndPropertiesInRenameFileController.rst', + 'Breaking-87193-DeprecatedFunctionalityRemoved.rst', ], ], 'TYPO3\CMS\Backend\Controller\File\RenameFileController->returnUrl' => [ 'restFiles' => [ 'Deprecation-84332-ProtectedMethodsAndPropertiesInRenameFileController.rst', + 'Breaking-87193-DeprecatedFunctionalityRemoved.rst', ], ], 'TYPO3\CMS\Backend\Controller\NewRecordController->pidInfo' => [ diff --git a/typo3/sysext/install/Configuration/ExtensionScanner/Php/PropertyPublicMatcher.php b/typo3/sysext/install/Configuration/ExtensionScanner/Php/PropertyPublicMatcher.php index 28eb4bc11b7f..7aa6b5904386 100644 --- a/typo3/sysext/install/Configuration/ExtensionScanner/Php/PropertyPublicMatcher.php +++ b/typo3/sysext/install/Configuration/ExtensionScanner/Php/PropertyPublicMatcher.php @@ -360,21 +360,25 @@ 'TYPO3\CMS\Backend\Controller\File\CreateFolderController->number' => [ 'restFiles' => [ 'Deprecation-84289-UseServerRequestInterfaceInFileCreateFolderController.rst', + 'Breaking-87193-DeprecatedFunctionalityRemoved.rst', ], ], 'TYPO3\CMS\Backend\Controller\File\CreateFolderController->folderNumber' => [ 'restFiles' => [ 'Deprecation-84289-UseServerRequestInterfaceInFileCreateFolderController.rst', + 'Breaking-87193-DeprecatedFunctionalityRemoved.rst', ], ], 'TYPO3\CMS\Backend\Controller\File\CreateFolderController->target' => [ 'restFiles' => [ 'Deprecation-84289-UseServerRequestInterfaceInFileCreateFolderController.rst', + 'Breaking-87193-DeprecatedFunctionalityRemoved.rst', ], ], 'TYPO3\CMS\Backend\Controller\File\CreateFolderController->content' => [ 'restFiles' => [ 'Deprecation-84289-UseServerRequestInterfaceInFileCreateFolderController.rst', + 'Breaking-87193-DeprecatedFunctionalityRemoved.rst', ], ], 'TYPO3\CMS\Backend\Controller\File\EditFileController->origTarget' => [