From 30685c9227d383e806d4eacd8654365d60a79ba8 Mon Sep 17 00:00:00 2001 From: Steve Boyd Date: Fri, 20 Jan 2023 17:13:11 +1300 Subject: [PATCH] MNT Remove legacy upgrader config --- .upgrade.yml | 154 ------------------ _config/legacy.yml | 8 - code/Controllers/CMSMain.php | 2 - code/Controllers/ContentController.php | 1 - code/Controllers/ModelAsController.php | 2 - code/Controllers/RootURLController.php | 2 - code/Model/SiteTree.php | 1 - .../ContentControllerSearchExtension.php | 1 - code/Search/SearchForm.php | 1 - tests/php/Search/ZZZSearchFormTest.php | 12 -- 10 files changed, 184 deletions(-) delete mode 100644 .upgrade.yml delete mode 100644 _config/legacy.yml diff --git a/.upgrade.yml b/.upgrade.yml deleted file mode 100644 index e04a647e..00000000 --- a/.upgrade.yml +++ /dev/null @@ -1,154 +0,0 @@ -mappings: - CMSBatchAction_Publish: SilverStripe\CMS\BatchActions\CMSBatchAction_Publish - CMSBatchAction_Unpublish: SilverStripe\CMS\BatchActions\CMSBatchAction_Unpublish - CMSBatchAction_Archive: SilverStripe\CMS\BatchActions\CMSBatchAction_Archive - CMSBatchAction_Restore: SilverStripe\CMS\BatchActions\CMSBatchAction_Restore - CMSMain: SilverStripe\CMS\Controllers\CMSMain - CMSPageAddController: SilverStripe\CMS\Controllers\CMSPageAddController - CMSPageEditController: SilverStripe\CMS\Controllers\CMSPageEditController - CMSPageHistoryController: SilverStripe\CMS\Controllers\CMSPageHistoryController - CMSPagesController: SilverStripe\CMS\Controllers\CMSPagesController - CMSPageSettingsController: SilverStripe\CMS\Controllers\CMSPageSettingsController - CMSSiteTreeFilter: SilverStripe\CMS\Controllers\CMSSiteTreeFilter - CMSSiteTreeFilter_PublishedPages: SilverStripe\CMS\Controllers\CMSSiteTreeFilter_PublishedPages - CMSSiteTreeFilter_DeletedPages: SilverStripe\CMS\Controllers\CMSSiteTreeFilter_DeletedPages - CMSSiteTreeFilter_ChangedPages: SilverStripe\CMS\Controllers\CMSSiteTreeFilter_ChangedPages - CMSSiteTreeFilter_StatusRemovedFromDraftPages: SilverStripe\CMS\Controllers\CMSSiteTreeFilter_StatusRemovedFromDraftPages - CMSSiteTreeFilter_StatusDraftPages: SilverStripe\CMS\Controllers\CMSSiteTreeFilter_StatusDraftPages - CMSSiteTreeFilter_StatusDeletedPages: SilverStripe\CMS\Controllers\CMSSiteTreeFilter_StatusDeletedPages - CMSSiteTreeFilter_Search: SilverStripe\CMS\Controllers\CMSSiteTreeFilter_Search - ContentController: SilverStripe\CMS\Controllers\ContentController - ErrorPageControllerExtension: SilverStripe\ErrorPage\ErrorPageControllerExtension - ErrorPageFileExtension: SilverStripe\ErrorPage\ErrorPageFileExtension - LeftAndMainPageIconsExtension: SilverStripe\CMS\Controllers\LeftAndMainPageIconsExtension - ModelAsController: SilverStripe\CMS\Controllers\ModelAsController - OldPageRedirector: SilverStripe\CMS\Controllers\OldPageRedirector - RootURLController: SilverStripe\CMS\Controllers\RootURLController - SilverStripeNavigator: SilverStripe\CMS\Controllers\SilverStripeNavigator - SilverStripeNavigatorItem: SilverStripe\CMS\Controllers\SilverStripeNavigatorItem - SilverStripeNavigatorItem_CMSLink: SilverStripe\CMS\Controllers\SilverStripeNavigatorItem_CMSLink - SilverStripeNavigatorItem_StageLink: SilverStripe\CMS\Controllers\SilverStripeNavigatorItem_StageLink - SilverStripeNavigatorItem_LiveLink: SilverStripe\CMS\Controllers\SilverStripeNavigatorItem_LiveLink - SilverStripeNavigatorItem_ArchiveLink: SilverStripe\CMS\Controllers\SilverStripeNavigatorItem_ArchiveLink - SiteTreeURLSegmentField: SilverStripe\CMS\Forms\SiteTreeURLSegmentField - SiteTreeURLSegmentField_Readonly: SilverStripe\CMS\Forms\SiteTreeURLSegmentField_Readonly - CurrentPageIdentifier: SilverStripe\CMS\Model\CurrentPageIdentifier - ErrorPage: SilverStripe\ErrorPage\ErrorPage - ErrorPage_Controller: SilverStripe\ErrorPage\ErrorPageController - RedirectorPage: SilverStripe\CMS\Model\RedirectorPage - RedirectorPage_Controller: SilverStripe\CMS\Model\RedirectorPageController - SiteTree: SilverStripe\CMS\Model\SiteTree - SiteTreeExtension: SilverStripe\CMS\Model\SiteTreeExtension - SiteTreeLinkTracking: SilverStripe\CMS\Model\SiteTreeLinkTracking - SiteTreeLinkTracking_Parser: SilverStripe\CMS\Model\SiteTreeLinkTracking_Parser - VirtualPage: SilverStripe\CMS\Model\VirtualPage - BrokenFilesReport: SilverStripe\CMS\Reports\BrokenFilesReport - SideReport_BrokenFiles: SilverStripe\CMS\Reports\BrokenFilesReport - BrokenLinksReport: SilverStripe\CMS\Reports\BrokenLinksReport - SideReport_BrokenLinks: SilverStripe\CMS\Reports\BrokenLinksReport - BrokenRedirectorPagesReport: SilverStripe\CMS\Reports\BrokenRedirectorPagesReport - SideReport_BrokenRedirectorPages: SilverStripe\CMS\Reports\BrokenRedirectorPagesReport - BrokenVirtualPagesReport: SilverStripe\CMS\Reports\BrokenVirtualPagesReport - SideReport_BrokenVirtualPages: SilverStripe\CMS\Reports\BrokenVirtualPagesReport - EmptyPagesReport: SilverStripe\CMS\Reports\EmptyPagesReport - SideReport_EmptyPages: SilverStripe\CMS\Reports\EmptyPagesReport - RecentlyEditedReport: SilverStripe\CMS\Reports\RecentlyEditedReport - SideReport_RecentlyEdited: SilverStripe\CMS\Reports\RecentlyEditedReport - ContentControllerSearchExtension: SilverStripe\CMS\Search\ContentControllerSearchExtension - SearchForm: SilverStripe\CMS\Search\SearchForm - AssetAdmin: SilverStripe\AssetAdmin\Controller\AssetAdmin - AssetTableField: SilverStripe\AssetAdmin\Controller\AssetAdmin - CMSAddPageController: SilverStripe\CMS\Controllers\CMSPageAddController - CMSBatchActions: SilverStripe\Admin\CMSBatchAction - CMSSearch: SilverStripe\CMS\Search\SearchForm - ContentControl: SilverStripe\CMS\Controllers\ContentController - Permissions: SilverStripe\Security\Permission - SITETREE: SilverStripe\CMS\Model\SiteTree - CMSMain_left_ss: SilverStripe\CMS\Controllers\CMSMain - CMSPageHistoryController_versions_ss: SilverStripe\CMS\Controllers\CMSPageHistoryController - CMSPagesController_ContentToolbar_ss: SilverStripe\CMS\Controllers\CMSPageHistoryController - CMSSIteTreeFilter_PublishedPages: SilverStripe\CMS\Controllers\CMSSIteTreeFilter_PublishedPages - URLSegmentField: SilverStripe\CMS\Forms\SiteTreeURLSegmentField - CMSPagesController_Tools_ss: SilverStripe\CMS\Controllers\CMSPagesController - LeftAndMain: SilverStripe\Admin\LeftAndMain - CMSBatchActionsTest: SilverStripe\CMS\Tests\CMSBatchActionsTest - CMSMainTest: SilverStripe\CMS\Tests\CMSMainTest - CMSMainTest_ClassA: SilverStripe\CMS\Tests\CMSMainTest_ClassA - CMSMainTest_ClassB: SilverStripe\CMS\Tests\CMSMainTest_ClassB - CMSMainTest_HiddenClass: SilverStripe\CMS\Tests\CMSMainTest_HiddenClass - CMSMainTest_NotRoot: SilverStripe\CMS\Tests\CMSMainTest_NotRoot - CMSPageHistoryControllerTest: SilverStripe\CMS\Tests\CMSPageHistoryControllerTest - CMSSiteTreeFilterTest: SilverStripe\CMS\Tests\CMSSiteTreeFilterTest - CMSTreeTest: SilverStripe\CMS\Tests\CMSTreeTest - ContentControllerPermissionsTest: SilverStripe\CMS\Tests\ContentControllerPermissionsTest - ContentControllerSearchExtensionTest: SilverStripe\CMS\Tests\ContentControllerSearchExtensionTest - ContentControllerTest: SilverStripe\CMS\Tests\ContentControllerTest - ContentControllerTest_Page: SilverStripe\CMS\Tests\ContentControllerTest_Page - ContentControllerTest_PageController: SilverStripe\CMS\Tests\ContentControllerTest_PageController - ContentControllerTestPage: SilverStripe\CMS\Tests\ContentControllerTestPage - ContentControllerTestPageController: SilverStripe\CMS\Tests\ContentControllerTestPageController - ContentControllerTestPageWithoutController: SilverStripe\CMS\Tests\ContentControllerTestPageWithoutController - ModelAsControllerTest: SilverStripe\CMS\Tests\ModelAsControllerTest - RootURLControllerTest: SilverStripe\CMS\Tests\RootURLControllerTest - SilverStripeNavigatorTest: SilverStripe\CMS\Tests\SilverStripeNavigatorTest - SilverStripeNavigatorTest_ProtectedTestItem: SilverStripe\CMS\Tests\SilverStripeNavigatorTest_ProtectedTestItem - SilverStripeNavigatorTest_TestItem: SilverStripe\CMS\Tests\SilverStripeNavigatorTest_TestItem - FileLinkTrackingTest: SilverStripe\CMS\Tests\FileLinkTrackingTest - RedirectorPageTest: SilverStripe\CMS\Tests\RedirectorPageTest - RedirectorPageTest_RedirectExtension: SilverStripe\CMS\Tests\RedirectorPageTest_RedirectExtension - SiteTreeActionsTest: SilverStripe\CMS\Tests\SiteTreeActionsTest - SiteTreeActionsTest_Page: SilverStripe\CMS\Tests\SiteTreeActionsTest_Page - SiteTreeBacklinksTest: SilverStripe\CMS\Tests\SiteTreeBacklinksTest - SiteTreeBacklinksTest_DOD: SilverStripe\CMS\Tests\SiteTreeBacklinksTest_DOD - SiteTreeBrokenLinksTest: SilverStripe\CMS\Tests\SiteTreeBrokenLinksTest - SiteTreeHTMLEditorFieldTest: SilverStripe\CMS\Tests\SiteTreeHTMLEditorFieldTest - SiteTreeLinkTrackingTest: SilverStripe\CMS\Tests\SiteTreeLinkTrackingTest - SiteTreePermissionsTest: SilverStripe\CMS\Tests\SiteTreePermissionsTest - SiteTreeTest: SilverStripe\CMS\Tests\SiteTreeTest - SiteTreeTest_AdminDenied: SilverStripe\CMS\Tests\SiteTreeTest_AdminDenied - SiteTreeTest_AdminDeniedExtension: SilverStripe\CMS\Tests\SiteTreeTest_AdminDeniedExtension - SiteTreeTest_ClassA: SilverStripe\CMS\Tests\SiteTreeTest_ClassA - SiteTreeTest_ClassB: SilverStripe\CMS\Tests\SiteTreeTest_ClassB - SiteTreeTest_ClassC: SilverStripe\CMS\Tests\SiteTreeTest_ClassC - SiteTreeTest_ClassCext: SilverStripe\CMS\Tests\SiteTreeTest_ClassCext - SiteTreeTest_ClassD: SilverStripe\CMS\Tests\SiteTreeTest_ClassD - SiteTreeTest_ClassE: SilverStripe\CMS\Tests\SiteTreeTest_ClassE - SiteTreeTest_Conflicted: SilverStripe\CMS\Tests\SiteTreeTest_Conflicted - SiteTreeTest_ConflictedController: SilverStripe\CMS\Tests\SiteTreeTest_ConflictedController - SiteTreeTest_DataObject: SilverStripe\CMS\Tests\SiteTreeTest_DataObject - SiteTreeTest_Extension: SilverStripe\CMS\Tests\SiteTreeTest_Extension - SiteTreeTest_ExtensionA: SilverStripe\CMS\Tests\SiteTreeTest_ExtensionA - SiteTreeTest_ExtensionB: SilverStripe\CMS\Tests\SiteTreeTest_ExtensionB - SiteTreeTest_LegacyControllerName: SilverStripe\CMS\Tests\SiteTreeTest_LegacyControllerName - SiteTreeTest_LegacyControllerName_Controller: SilverStripe\CMS\Tests\SiteTreeTest_LegacyControllerName_Controller - SiteTreeTest_NotRoot: SilverStripe\CMS\Tests\SiteTreeTest_NotRoot - SiteTreeTest_NullHtmlCleaner: SilverStripe\CMS\Tests\SiteTreeTest_NullHtmlCleaner - SiteTreeTest_PageNode: SilverStripe\CMS\Tests\SiteTreeTest_PageNode - SiteTreeTest_PageNodeController: SilverStripe\CMS\Tests\SiteTreeTest_PageNodeController - SiteTreeTest_StageStatusInherit: SilverStripe\CMS\Tests\SiteTreeTest_StageStatusInherit - VirtualPageTest: SilverStripe\CMS\Tests\VirtualPageTest - VirtualPageTest_ClassA: SilverStripe\CMS\Tests\VirtualPageTest_ClassA - VirtualPageTest_ClassAController: SilverStripe\CMS\Tests\VirtualPageTest_ClassAController - VirtualPageTest_ClassB: SilverStripe\CMS\Tests\VirtualPageTest_ClassB - VirtualPageTest_ClassC: SilverStripe\CMS\Tests\VirtualPageTest_ClassC - VirtualPageTest_NotRoot: SilverStripe\CMS\Tests\VirtualPageTest_NotRoot - VirtualPageTest_PageExtension: SilverStripe\CMS\Tests\VirtualPageTest_PageExtension - VirtualPageTest_PageWithAllowedChildren: SilverStripe\CMS\Tests\VirtualPageTest_PageWithAllowedChildren - VirtualPageTest_TestDBField: SilverStripe\CMS\Tests\VirtualPageTest_TestDBField - VirtualPageTest_VirtualPageSub: SilverStripe\CMS\Tests\VirtualPageTest_VirtualPageSub - CmsReportsTest: SilverStripe\CMS\Tests\CmsReportsTest - CMSMainSearchFormTest: SilverStripe\CMS\Tests\CMSMainSearchFormTest - ZZZSearchFormTest: SilverStripe\CMS\Tests\ZZZSearchFormTest -excludedPaths: - - '*/_config/legacy.yml' -warnings: - methods: - 'SilverStripe\CMS\Model\SiteTree->getIsAddedToStage()': - message: 'Moved to Versioned->isOnDraftOnly()' - replacement: 'isOnDraftOnly' - 'SilverStripe\CMS\Model\SiteTree->getIsModifiedOnStage()': - message: 'Moved to Versioned->isModifiedOnDraft()' - replacement: 'isModifiedOnDraft' - 'SilverStripe\CMS\Model\SiteTree->getExistsOnLive()': - message: 'Removed in favour of isPublished()' - replacement: 'isPublished' diff --git a/_config/legacy.yml b/_config/legacy.yml deleted file mode 100644 index 4e50e308..00000000 --- a/_config/legacy.yml +++ /dev/null @@ -1,8 +0,0 @@ ---- -Name: cmslegacy ---- -SilverStripe\ORM\DatabaseAdmin: - classname_value_remapping: - SiteTree: 'SilverStripe\CMS\Model\SiteTree' - RedirectorPage: SilverStripe\CMS\Model\RedirectorPage - VirtualPage: SilverStripe\CMS\Model\VirtualPage diff --git a/code/Controllers/CMSMain.php b/code/Controllers/CMSMain.php index 7370a299..94f6af6a 100644 --- a/code/Controllers/CMSMain.php +++ b/code/Controllers/CMSMain.php @@ -984,7 +984,6 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr ); // Create the form - /** @skipUpgrade */ $form = Form::create( $this, 'SearchForm', @@ -1336,7 +1335,6 @@ class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionPr } // Added in-line to the form, but plucked into different view by LeftAndMain.Preview.js upon load - /** @skipUpgrade */ if (($record instanceof CMSPreviewable || $record->has_extension(CMSPreviewable::class)) && !$fields->fieldByName('SilverStripeNavigator') ) { diff --git a/code/Controllers/ContentController.php b/code/Controllers/ContentController.php index 7b0a2145..3ef03035 100644 --- a/code/Controllers/ContentController.php +++ b/code/Controllers/ContentController.php @@ -175,7 +175,6 @@ class ContentController extends Controller } // Check page permissions - /** @skipUpgrade */ if ($this->dataRecord && $this->URLSegment != 'Security' && !$this->dataRecord->canView()) { Security::permissionFailure($this); return; diff --git a/code/Controllers/ModelAsController.php b/code/Controllers/ModelAsController.php index 35cd946d..4b5091ca 100644 --- a/code/Controllers/ModelAsController.php +++ b/code/Controllers/ModelAsController.php @@ -55,7 +55,6 @@ class ModelAsController extends Controller implements NestedController { parent::beforeHandleRequest($request); // If the database has not yet been created, redirect to the build page. - /** @skipUpgrade */ if (!DB::is_active() || !ClassInfo::hasTable('SiteTree')) { $this->getResponse()->redirect(Controller::join_links( Director::absoluteBaseURL(), @@ -81,7 +80,6 @@ class ModelAsController extends Controller implements NestedController } // If the database has not yet been created, redirect to the build page. - /** @skipUpgrade */ if (!DB::is_active() || !ClassInfo::hasTable('SiteTree')) { $this->getResponse()->redirect(Director::absoluteBaseURL() . 'dev/build?returnURL=' . (isset($_GET['url']) ? urlencode($_GET['url']) : null)); $this->popCurrent(); diff --git a/code/Controllers/RootURLController.php b/code/Controllers/RootURLController.php index 48ab297a..fc9baeeb 100644 --- a/code/Controllers/RootURLController.php +++ b/code/Controllers/RootURLController.php @@ -73,7 +73,6 @@ class RootURLController extends Controller implements Resettable self::$is_at_root = true; - /** @skipUpgrade */ if (!DB::is_active() || !ClassInfo::hasTable('SiteTree')) { $this->getResponse()->redirect(Controller::join_links( Director::absoluteBaseURL(), @@ -91,7 +90,6 @@ class RootURLController extends Controller implements Resettable $this->beforeHandleRequest($request); if (!$this->getResponse()->isFinished()) { - /** @skipUpgrade */ if (!DB::is_active() || !ClassInfo::hasTable('SiteTree')) { $this->getResponse()->redirect(Director::absoluteBaseURL() . 'dev/build?returnURL=' . (isset($_GET['url']) ? urlencode($_GET['url']) : null)); return $this->getResponse(); diff --git a/code/Model/SiteTree.php b/code/Model/SiteTree.php index 1d619d42..f630dd14 100755 --- a/code/Model/SiteTree.php +++ b/code/Model/SiteTree.php @@ -2460,7 +2460,6 @@ class SiteTree extends DataObject implements PermissionProvider, i18nEntityProvi // "readonly"/viewing version that isn't the current version of the record /** @var SiteTree $stageRecord */ $stageRecord = Versioned::get_by_stage(static::class, Versioned::DRAFT)->byID($this->ID); - /** @skipUpgrade */ if ($stageRecord && $stageRecord->Version != $this->Version) { $moreOptions->push(FormAction::create('email', _t('SilverStripe\\CMS\\Controllers\\CMSMain.EMAIL', 'Email'))); $moreOptions->push(FormAction::create('rollback', _t('SilverStripe\\CMS\\Controllers\\CMSMain.ROLLBACK', 'Roll back to this version'))); diff --git a/code/Search/ContentControllerSearchExtension.php b/code/Search/ContentControllerSearchExtension.php index d3ad4b59..64091f17 100644 --- a/code/Search/ContentControllerSearchExtension.php +++ b/code/Search/ContentControllerSearchExtension.php @@ -39,7 +39,6 @@ class ContentControllerSearchExtension extends Extension $actions = FieldList::create( FormAction::create('results', _t('SilverStripe\\CMS\\Search\\SearchForm.GO', 'Go')) ); - /** @skipUpgrade */ $form = SearchForm::create($this->owner, 'SearchForm', $fields, $actions); $form->classesToSearch(FulltextSearchable::get_searchable_classes()); return $form; diff --git a/code/Search/SearchForm.php b/code/Search/SearchForm.php index c2ede48f..1d5ca3f6 100644 --- a/code/Search/SearchForm.php +++ b/code/Search/SearchForm.php @@ -45,7 +45,6 @@ class SearchForm extends Form ]; /** - * @skipUpgrade * @param RequestHandler $controller * @param string $name The name of the form (used in URL addressing) * @param FieldList $fields Optional, defaults to a single field named "Search". Search logic needs to be customized diff --git a/tests/php/Search/ZZZSearchFormTest.php b/tests/php/Search/ZZZSearchFormTest.php index 3210aac1..585e16f8 100644 --- a/tests/php/Search/ZZZSearchFormTest.php +++ b/tests/php/Search/ZZZSearchFormTest.php @@ -95,9 +95,6 @@ class ZZZSearchFormTest extends FunctionalTest return $supports; } - /** - * @skipUpgrade - */ public function testSearchFormTemplateCanBeChanged() { if (!$this->checkFulltextSupport()) { @@ -114,9 +111,6 @@ class ZZZSearchFormTest extends FunctionalTest ); } - /** - * @skipUpgrade - */ public function testPublishedPagesMatchedByTitle() { if (!$this->checkFulltextSupport()) { @@ -147,9 +141,6 @@ class ZZZSearchFormTest extends FunctionalTest ); } - /** - * @skipUpgrade - */ public function testDoubleQuotesPublishedPagesMatchedByTitle() { if (!$this->checkFulltextSupport()) { @@ -182,9 +173,6 @@ class ZZZSearchFormTest extends FunctionalTest ); } - /** - * @skipUpgrade - */ public function testUnpublishedPagesNotIncluded() { if (!$this->checkFulltextSupport()) {