Merge pull request #2824 from creative-commoners/pulls/5/remove-legac…

…y-upgrader MNT Remove legacy upgrader config
silverstripe · Jan 22, 2023 · 081eea4 · 081eea4
2 parents 37af732 + 30685c9
commit 081eea4
Show file tree

Hide file tree

Showing 10 changed files with 0 additions and 184 deletions.
diff --git a/.upgrade.yml b/.upgrade.yml
diff --git a/_config/legacy.yml b/_config/legacy.yml
diff --git a/code/Controllers/CMSMain.php b/code/Controllers/CMSMain.php
@@ -984,7 +984,6 @@ public function getSearchForm()
         );
 
         // Create the form
-        /** @skipUpgrade */
         $form = Form::create(
             $this,
             'SearchForm',
@@ -1336,7 +1335,6 @@ public function getEditForm($id = null, $fields = null)
         }
 
         // 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
@@ -175,7 +175,6 @@ protected function init()
         }
 
         // 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
@@ -55,7 +55,6 @@ protected function beforeHandleRequest(HTTPRequest $request)
     {
         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 @@ public function handleRequest(HTTPRequest $request): HTTPResponse
         }
 
         // 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(), 'dev/build?returnURL=' . (isset($_GET['url']) ? urlencode($_GET['url']) : null)));
             $this->popCurrent();

diff --git a/code/Controllers/RootURLController.php b/code/Controllers/RootURLController.php
@@ -73,7 +73,6 @@ protected function beforeHandleRequest(HTTPRequest $request)
 
         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 @@ public function handleRequest(HTTPRequest $request): HTTPResponse
         $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
@@ -2460,7 +2460,6 @@ public function getCMSActions()
         // "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
@@ -39,7 +39,6 @@ public function SearchForm()
         $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
@@ -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
@@ -95,9 +95,6 @@ protected function checkFulltextSupport()
         return $supports;
     }
 
-    /**
-     * @skipUpgrade
-     */
     public function testSearchFormTemplateCanBeChanged()
     {
         if (!$this->checkFulltextSupport()) {
@@ -114,9 +111,6 @@ public function testSearchFormTemplateCanBeChanged()
         );
     }
 
-    /**
-     * @skipUpgrade
-     */
     public function testPublishedPagesMatchedByTitle()
     {
         if (!$this->checkFulltextSupport()) {
@@ -147,9 +141,6 @@ public function testPublishedPagesMatchedByTitle()
         );
     }
 
-    /**
-     * @skipUpgrade
-     */
     public function testDoubleQuotesPublishedPagesMatchedByTitle()
     {
         if (!$this->checkFulltextSupport()) {
@@ -182,9 +173,6 @@ public function testDoubleQuotesPublishedPagesMatchedByTitle()
         );
     }
 
-    /**
-     * @skipUpgrade
-     */
     public function testUnpublishedPagesNotIncluded()
     {
         if (!$this->checkFulltextSupport()) {