From c23095b3533edd62aed26cd904eae73001b76327 Mon Sep 17 00:00:00 2001 From: Mathias Schreiber <mathias.schreiber@wmdb.de> Date: Mon, 2 Nov 2015 22:49:17 +0100 Subject: [PATCH] [TASK] Deprecate ExtendedFileUtility::pushErrorMessagesToFlashMessageQueue Remove usages of ExtendedFileUtility::pushErrorMessagesToFlashMessageQueue and deprecate the public method. Error messages published by ExtendedFileUtility get added to the flash message queue in a translated version so it's unnecessary to publish an untranslated version based on the log entries as well. Resolves: #72175 Releases: master Change-Id: I818541916f182b63151a866590bb1541a0c02d39 Reviewed-on: https://review.typo3.org/45209 Reviewed-by: Daniel Goerz <ervaude@gmail.com> Tested-by: Daniel Goerz <ervaude@gmail.com> Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl> Tested-by: Wouter Wolters <typo3@wouterwolters.nl> --- .../Controller/File/FileController.php | 4 ---- .../Utility/File/ExtendedFileUtility.php | 2 ++ ...typushErrorMessagesToFlashMessageQueue.rst | 20 +++++++++++++++++++ .../Classes/Controller/FileListController.php | 1 - 4 files changed, 22 insertions(+), 5 deletions(-) create mode 100644 typo3/sysext/core/Documentation/Changelog/master/Deprecation-71255-ExtendedFileUtilitypushErrorMessagesToFlashMessageQueue.rst diff --git a/typo3/sysext/backend/Classes/Controller/File/FileController.php b/typo3/sysext/backend/Classes/Controller/File/FileController.php index 4c95a4faa999..2ddf555bb2ec 100644 --- a/typo3/sysext/backend/Classes/Controller/File/FileController.php +++ b/typo3/sysext/backend/Classes/Controller/File/FileController.php @@ -163,8 +163,6 @@ class FileController */ public function finish() { - // Push errors to flash message queue, if there are any - $this->fileProcessor->pushErrorMessagesToFlashMessageQueue(); BackendUtility::setUpdateSignal('updateFolderTree'); if ($this->redirect) { \TYPO3\CMS\Core\Utility\HttpUtility::redirect($this->redirect); @@ -183,8 +181,6 @@ class FileController { $this->main(); - // Push errors to flash message queue, if there are any - $this->fileProcessor->pushErrorMessagesToFlashMessageQueue(); BackendUtility::setUpdateSignal('updateFolderTree'); if ($this->redirect) { diff --git a/typo3/sysext/core/Classes/Utility/File/ExtendedFileUtility.php b/typo3/sysext/core/Classes/Utility/File/ExtendedFileUtility.php index 46f6bd0d7090..e8d1e95df8ce 100644 --- a/typo3/sysext/core/Classes/Utility/File/ExtendedFileUtility.php +++ b/typo3/sysext/core/Classes/Utility/File/ExtendedFileUtility.php @@ -312,9 +312,11 @@ class ExtendedFileUtility extends BasicFileUtility * Adds all log error messages from the operations of this script instance to the FlashMessageQueue * * @return void + * @deprecated since TYPO3 CMS 8, will be removed in TYPO3 CMS 9 */ public function pushErrorMessagesToFlashMessageQueue() { + GeneralUtility::logDeprecatedFunction(); foreach ($this->getErrorMessages() as $msg) { $flashMessage = GeneralUtility::makeInstance( FlashMessage::class, diff --git a/typo3/sysext/core/Documentation/Changelog/master/Deprecation-71255-ExtendedFileUtilitypushErrorMessagesToFlashMessageQueue.rst b/typo3/sysext/core/Documentation/Changelog/master/Deprecation-71255-ExtendedFileUtilitypushErrorMessagesToFlashMessageQueue.rst new file mode 100644 index 000000000000..3d075e574b55 --- /dev/null +++ b/typo3/sysext/core/Documentation/Changelog/master/Deprecation-71255-ExtendedFileUtilitypushErrorMessagesToFlashMessageQueue.rst @@ -0,0 +1,20 @@ +================================================================================= +Deprecation: #71255 - ExtendedFileUtility::pushErrorMessagesToFlashMessageQueue() +================================================================================= + +Description +=========== + +Method ``\TYPO3\CMS\Core\Utility\File\ExtendedFileUtility::pushErrorMessagesToFlashMessageQueue()`` has been marked as deprecated. + + +Affected Installations +====================== + +Instances with custom backend modules that use this method. + + +Migration +========= + +Implement the method by yourself. diff --git a/typo3/sysext/filelist/Classes/Controller/FileListController.php b/typo3/sysext/filelist/Classes/Controller/FileListController.php index fd689aa21071..dad420cf0be5 100644 --- a/typo3/sysext/filelist/Classes/Controller/FileListController.php +++ b/typo3/sysext/filelist/Classes/Controller/FileListController.php @@ -378,7 +378,6 @@ class FileListController extends ActionController $fileProcessor->setExistingFilesConflictMode($this->overwriteExistingFiles); $fileProcessor->start($FILE); $fileProcessor->processData(); - $fileProcessor->pushErrorMessagesToFlashMessageQueue(); } } // Start up filelisting object, include settings. -- GitLab