From 2d920f0cf679bc3f6bb421b34840f4ee9017e321 Mon Sep 17 00:00:00 2001 From: Benni Mack Date: Thu, 2 Aug 2018 12:44:39 +0200 Subject: [PATCH] [TASK] Move RecordHistory into DataHandling namespace The newly created (internal) RecordHistory class is moved to the DataHandling namespace as it is related to all other logic (e.g. DataHandler). Resolves: #85728 Releases: master Change-Id: Ib3cf60541e638586f246d64542d0e19bef7f62e8 Reviewed-on: https://review.typo3.org/57773 Tested-by: TYPO3com Reviewed-by: Frank Naegler Tested-by: Frank Naegler Reviewed-by: Georg Ringer Reviewed-by: Wouter Wolters Tested-by: Wouter Wolters --- .../ElementHistoryController.php | 2 +- .../backend/Classes/History/RecordHistory.php | 2 +- .../core/Classes/DataHandling/DataHandler.php | 2 +- .../History/RecordHistoryStore.php | 34 ++++++++++++++----- .../core/Migrations/Code/ClassAliasMap.php | 3 +- .../SeparateSysHistoryFromSysLogUpdate.php | 2 +- .../Controller/DeletedRecordsController.php | 2 +- 7 files changed, 32 insertions(+), 15 deletions(-) rename typo3/sysext/core/Classes/{ => DataHandling}/History/RecordHistoryStore.php (91%) diff --git a/typo3/sysext/backend/Classes/Controller/ContentElement/ElementHistoryController.php b/typo3/sysext/backend/Classes/Controller/ContentElement/ElementHistoryController.php index ed119e1f1183..b96ee1f1d96a 100644 --- a/typo3/sysext/backend/Classes/Controller/ContentElement/ElementHistoryController.php +++ b/typo3/sysext/backend/Classes/Controller/ContentElement/ElementHistoryController.php @@ -20,7 +20,7 @@ use TYPO3\CMS\Backend\History\RecordHistory; use TYPO3\CMS\Backend\Template\Components\ButtonBar; use TYPO3\CMS\Backend\Template\ModuleTemplate; use TYPO3\CMS\Backend\Utility\BackendUtility; -use TYPO3\CMS\Core\History\RecordHistoryStore; +use TYPO3\CMS\Core\DataHandling\History\RecordHistoryStore; use TYPO3\CMS\Core\Http\HtmlResponse; use TYPO3\CMS\Core\Imaging\Icon; use TYPO3\CMS\Core\Type\Bitmask\Permission; diff --git a/typo3/sysext/backend/Classes/History/RecordHistory.php b/typo3/sysext/backend/Classes/History/RecordHistory.php index a5c50c1e0aee..7b94a3449c9b 100644 --- a/typo3/sysext/backend/Classes/History/RecordHistory.php +++ b/typo3/sysext/backend/Classes/History/RecordHistory.php @@ -18,7 +18,7 @@ use TYPO3\CMS\Backend\Utility\BackendUtility; use TYPO3\CMS\Core\Database\ConnectionPool; use TYPO3\CMS\Core\Database\Query\QueryBuilder; use TYPO3\CMS\Core\DataHandling\DataHandler; -use TYPO3\CMS\Core\History\RecordHistoryStore; +use TYPO3\CMS\Core\DataHandling\History\RecordHistoryStore; use TYPO3\CMS\Core\Type\Bitmask\Permission; use TYPO3\CMS\Core\Utility\GeneralUtility; diff --git a/typo3/sysext/core/Classes/DataHandling/DataHandler.php b/typo3/sysext/core/Classes/DataHandling/DataHandler.php index 5e36bffb38cb..7245df96b0bc 100644 --- a/typo3/sysext/core/Classes/DataHandling/DataHandler.php +++ b/typo3/sysext/core/Classes/DataHandling/DataHandler.php @@ -43,8 +43,8 @@ use TYPO3\CMS\Core\Database\Query\Restriction\DeletedRestriction; use TYPO3\CMS\Core\Database\Query\Restriction\QueryRestrictionContainerInterface; use TYPO3\CMS\Core\Database\ReferenceIndex; use TYPO3\CMS\Core\Database\RelationHandler; +use TYPO3\CMS\Core\DataHandling\History\RecordHistoryStore; use TYPO3\CMS\Core\DataHandling\Localization\DataMapProcessor; -use TYPO3\CMS\Core\History\RecordHistoryStore; use TYPO3\CMS\Core\Html\RteHtmlParser; use TYPO3\CMS\Core\Localization\LanguageService; use TYPO3\CMS\Core\Messaging\FlashMessage; diff --git a/typo3/sysext/core/Classes/History/RecordHistoryStore.php b/typo3/sysext/core/Classes/DataHandling/History/RecordHistoryStore.php similarity index 91% rename from typo3/sysext/core/Classes/History/RecordHistoryStore.php rename to typo3/sysext/core/Classes/DataHandling/History/RecordHistoryStore.php index b47e89126d34..8f5fe712ac65 100644 --- a/typo3/sysext/core/Classes/History/RecordHistoryStore.php +++ b/typo3/sysext/core/Classes/DataHandling/History/RecordHistoryStore.php @@ -1,6 +1,6 @@ \TYPO3\CMS\Backend\Controller\ContextHelpAjaxController::class, 'TYPO3\\CMS\\Sv\\AbstractAuthenticationService' => \TYPO3\CMS\Core\Authentication\AbstractAuthenticationService::class, 'TYPO3\\CMS\\Sv\\AuthenticationService' => \TYPO3\CMS\Core\Authentication\AuthenticationService::class, - 'TYPO3\\CMS\\Core\\Tree\\TableConfiguration\\ExtJsArrayTreeRenderer' => \TYPO3\CMS\Core\Tree\TableConfiguration\ArrayTreeRenderer::class + 'TYPO3\\CMS\\Core\\Tree\\TableConfiguration\\ExtJsArrayTreeRenderer' => \TYPO3\CMS\Core\Tree\TableConfiguration\ArrayTreeRenderer::class, + 'TYPO3\\CMS\\Core\\History\\RecordHistory' => \TYPO3\CMS\Core\DataHandling\History\RecordHistoryStore::class ]; diff --git a/typo3/sysext/install/Classes/Updates/SeparateSysHistoryFromSysLogUpdate.php b/typo3/sysext/install/Classes/Updates/SeparateSysHistoryFromSysLogUpdate.php index d3cc6a9ba23f..24f4c3d10f14 100644 --- a/typo3/sysext/install/Classes/Updates/SeparateSysHistoryFromSysLogUpdate.php +++ b/typo3/sysext/install/Classes/Updates/SeparateSysHistoryFromSysLogUpdate.php @@ -17,7 +17,7 @@ namespace TYPO3\CMS\Install\Updates; use TYPO3\CMS\Core\Database\Connection; use TYPO3\CMS\Core\Database\ConnectionPool; -use TYPO3\CMS\Core\History\RecordHistoryStore; +use TYPO3\CMS\Core\DataHandling\History\RecordHistoryStore; use TYPO3\CMS\Core\Utility\GeneralUtility; /** diff --git a/typo3/sysext/recycler/Classes/Controller/DeletedRecordsController.php b/typo3/sysext/recycler/Classes/Controller/DeletedRecordsController.php index f5ed3b84f70e..dce39202a0f9 100644 --- a/typo3/sysext/recycler/Classes/Controller/DeletedRecordsController.php +++ b/typo3/sysext/recycler/Classes/Controller/DeletedRecordsController.php @@ -19,7 +19,7 @@ use TYPO3\CMS\Backend\Utility\BackendUtility; use TYPO3\CMS\Core\Cache\CacheManager; use TYPO3\CMS\Core\Database\ConnectionPool; use TYPO3\CMS\Core\DataHandling\DataHandler; -use TYPO3\CMS\Core\History\RecordHistoryStore; +use TYPO3\CMS\Core\DataHandling\History\RecordHistoryStore; use TYPO3\CMS\Core\Imaging\Icon; use TYPO3\CMS\Core\Imaging\IconFactory; use TYPO3\CMS\Core\Utility\GeneralUtility; -- 2.20.1