Merge pull request #1324 from creative-commoners/pulls/2/remove-legac…

…y-upgrader MNT Remove legacy upgrader config
silverstripe · Jan 22, 2023 · ac3415c · ac3415c
2 parents cfd8c23 + bead969
commit ac3415c
Show file tree

Hide file tree

Showing 12 changed files with 0 additions and 31 deletions.
diff --git a/.upgrade.yml b/.upgrade.yml
diff --git a/code/Controller/AssetAdmin.php b/code/Controller/AssetAdmin.php
@@ -46,7 +46,6 @@
 /**
  * AssetAdmin is the 'file store' section of the CMS.
  * It provides an interface for manipulating the File and Folder objects in the system.
- * @skipUpgrade
  */
 class AssetAdmin extends LeftAndMain implements PermissionProvider
 {

diff --git a/code/Controller/AssetAdminFile.php b/code/Controller/AssetAdminFile.php
@@ -15,7 +15,6 @@
 /**
  * Update File dataobjects to be editable in this asset admin
  *
- * @skipUpgrade
  * @property File $owner
  */
 class AssetAdminFile extends DataExtension

diff --git a/code/Extensions/RemoteFileModalExtension.php b/code/Extensions/RemoteFileModalExtension.php
@@ -20,7 +20,6 @@
 
 /**
  * Decorates ModalController with an insert-oembed modal
- * @skipUpgrade
  * @see ModalController
  */
 class RemoteFileModalExtension extends Extension

diff --git a/code/Forms/AssetFormFactory.php b/code/Forms/AssetFormFactory.php
@@ -26,9 +26,6 @@
 use SilverStripe\Forms\TreeDropdownField;
 use SilverStripe\Forms\TreeMultiselectField;
 
-/**
- * @skipUpgrade
- */
 abstract class AssetFormFactory implements FormFactory
 {
     use Extensible;

diff --git a/code/Forms/FileSearchFormFactory.php b/code/Forms/FileSearchFormFactory.php
@@ -53,7 +53,6 @@ protected function getFormFields(RequestHandler $controller = null, $name, $cont
     {
         // Note: "Name" field is excluded as it is baked directly into the Search.js react component
 
-        /** @skipUpgrade */
         // File type field
         $appCategories = array(
             'ARCHIVE' => _t(

diff --git a/code/Forms/UploadField.php b/code/Forms/UploadField.php
@@ -25,7 +25,6 @@
  * Additionally supports writing directly to the File table not attached
  * to any parent record.
  *
- * @skipUpgrade
  */
 class UploadField extends FormField implements FileHandleField
 {

diff --git a/tests/php/Controller/AssetAdminTest.php b/tests/php/Controller/AssetAdminTest.php
@@ -20,7 +20,6 @@
 
 /**
  * Tests {@see AssetAdmin}
- * @skipUpgrade
  */
 class AssetAdminTest extends FunctionalTest
 {
@@ -104,7 +103,6 @@ public function testItCreatesFile()
     {
         $folder1 = $this->objFromFixture(Folder::class, 'folder1');
 
-        /** @skipUpgrade */
         $fileData = array('Upload' => $this->getUploadFile('Upload', 'testItCreatesFile.txt'));
         $_FILES = $fileData;
         $postedData = array_merge(
@@ -169,7 +167,6 @@ public function testItRestrictsCreateFileOnCanAddChildren()
     {
         $folder = $this->objFromFixture(Folder::class, 'disallowCanAddChildren');
 
-        /** @skipUpgrade */
         $fileData = array('Upload' => $this->getUploadFile('Upload', 'test.txt'));
         $_FILES = $fileData;
         $response = Director::test(
@@ -195,7 +192,6 @@ public function testItRestrictsCreateFileOnExtension()
             'folder1'
         );
 
-        /** @skipUpgrade */
         $fileData = array('Upload' => $this->getUploadFile('Upload', 'disallowed.php'));
         $_FILES = $fileData;
         $response = Director::test(

diff --git a/tests/php/Controller/AssetAdminTest/FileExtension.php b/tests/php/Controller/AssetAdminTest/FileExtension.php
@@ -5,9 +5,6 @@
 use SilverStripe\Dev\TestOnly;
 use SilverStripe\ORM\DataExtension;
 
-/**
- * @skipUpgrade
- */
 class FileExtension extends DataExtension implements TestOnly
 {
     public function canView($member = null)

diff --git a/tests/php/Forms/ImageFormFactoryTest.php b/tests/php/Forms/ImageFormFactoryTest.php
@@ -17,9 +17,6 @@
 use SilverStripe\Forms\FormFactory;
 use SilverStripe\ORM\ArrayList;
 
-/**
- * @skipUpgrade
- */
 class ImageFormFactoryTest extends SapphireTest
 {
     /** @var Image */

diff --git a/tests/php/Forms/UploadFieldTest.php b/tests/php/Forms/UploadFieldTest.php
@@ -13,9 +13,6 @@
 use SilverStripe\Forms\Form;
 use SilverStripe\ORM\ArrayList;
 
-/**
- * @skipUpgrade
- */
 class UploadFieldTest extends SapphireTest
 {
     protected static $fixture_file = 'FileFormBuilderTest.yml';

diff --git a/tests/php/Forms/UsedOnTableTest.php b/tests/php/Forms/UsedOnTableTest.php
@@ -11,9 +11,6 @@
 use SilverStripe\Dev\SapphireTest;
 use SilverStripe\Versioned\Versioned;
 
-/**
- * @skipUpgrade
- */
 class UsedOnTableTest extends SapphireTest
 {
     protected static $fixture_file = 'UsedOnTableTest.yml';