Merge pull request #538 from creative-commoners/pulls/2/remove-legacy…

…-upgrader MNT Remove legacy upgrader config
silverstripe · Jan 22, 2023 · 5f25688 · 5f25688
2 parents 8a3278e + c43e5fb
commit 5f25688
Show file tree

Hide file tree

Showing 17 changed files with 0 additions and 177 deletions.
diff --git a/.upgrade.yml b/.upgrade.yml
diff --git a/tests/php/AssetControlExtensionTest.php b/tests/php/AssetControlExtensionTest.php
@@ -15,7 +15,6 @@
 
 /**
  * Tests {@see AssetControlExtension}
- * @skipUpgrade
  */
 class AssetControlExtensionTest extends SapphireTest
 {

diff --git a/tests/php/FileTest.php b/tests/php/FileTest.php
@@ -27,7 +27,6 @@
 
 /**
  * Tests for the File class
- * @skipUpgrade
  */
 class FileTest extends SapphireTest
 {

diff --git a/tests/php/Flysystem/FlysystemAssetStoreUpdateResponseTest.php b/tests/php/Flysystem/FlysystemAssetStoreUpdateResponseTest.php
@@ -23,9 +23,6 @@ class FlysystemAssetStoreUpdateResponseTest extends SapphireTest
 
     private $hash;
 
-    /**
-     * @skipUpgrade
-     */
     protected function setUp(): void
     {
         parent::setUp();

diff --git a/tests/php/FolderTest.php b/tests/php/FolderTest.php
@@ -17,7 +17,6 @@
 
 /**
  * @author Ingo Schommer (ingo at silverstripe dot com)
- * @skipUpgrade
  */
 class FolderTest extends SapphireTest
 {

diff --git a/tests/php/GDImageTest.php b/tests/php/GDImageTest.php
@@ -20,7 +20,6 @@ protected function setUp(): void
             return;
         }
 
-        /** @skipUpgrade */
         // this is a hack because the service locator cahces config settings meaning you can't properly override them
         Injector::inst()->setConfigLocator(new SilverStripeServiceConfigurationLocator());
         Config::modify()->set(Injector::class, ImageManager::class, [

diff --git a/tests/php/ImageManipulationTest.php b/tests/php/ImageManipulationTest.php
@@ -21,7 +21,6 @@
 
 /**
  * ImageTest is abstract and should be overridden with manipulator-specific subtests
- * @skipUpgrade
  */
 class ImageManipulationTest extends SapphireTest
 {

diff --git a/tests/php/ImageTest.php b/tests/php/ImageTest.php
@@ -21,7 +21,6 @@
 
 /**
  * ImageTest is abstract and should be overridden with manipulator-specific subtests
- * @skipUpgrade
  */
 abstract class ImageTest extends SapphireTest
 {

diff --git a/tests/php/ImagickImageTest.php b/tests/php/ImagickImageTest.php
@@ -20,7 +20,6 @@ protected function setUp(): void
             return;
         }
 
-        /** @skipUpgrade */
         // this is a hack because the service locator cahces config settings meaning you can't properly override them
         Injector::inst()->setConfigLocator(new SilverStripeServiceConfigurationLocator());
         Config::modify()->set(Injector::class, ImageManager::class, [

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

diff --git a/tests/php/RedirectFileControllerTest.php b/tests/php/RedirectFileControllerTest.php
@@ -16,9 +16,6 @@
 use SilverStripe\Assets\Dev\TestAssetStore;
 use SilverStripe\Versioned\Versioned;
 
-/**
- * @skipUpgrade
- */
 class RedirectFileControllerTest extends FunctionalTest
 {
     protected static $fixture_file = 'FileTest.yml';

diff --git a/tests/php/RedirectKeepArchiveFileControllerTest.php b/tests/php/RedirectKeepArchiveFileControllerTest.php
@@ -14,7 +14,6 @@
 
 /**
  * We rerun all the same test in `RedirectFileControllerTest` but with keep_archived_assets on
- * @skipUpgrade
  */
 class RedirectKeepArchiveFileControllerTest extends RedirectFileControllerTest
 {

diff --git a/tests/php/Shortcodes/FileShortcodeProviderTest.php b/tests/php/Shortcodes/FileShortcodeProviderTest.php
@@ -16,9 +16,6 @@
 use SilverStripe\Versioned\Versioned;
 use SilverStripe\View\Parsers\ShortcodeParser;
 
-/**
- * @skipUpgrade
- */
 class FileShortcodeProviderTest extends SapphireTest
 {
     protected static $fixture_file = '../FileTest.yml';

diff --git a/tests/php/Shortcodes/ImageShortcodeProviderTest.php b/tests/php/Shortcodes/ImageShortcodeProviderTest.php
@@ -16,9 +16,6 @@
 use SilverStripe\Security\InheritedPermissions;
 use SilverStripe\Security\Member;
 
-/**
- * @skipUpgrade
- */
 class ImageShortcodeProviderTest extends SapphireTest
 {
 

diff --git a/tests/php/Storage/AssetStoreTest.php b/tests/php/Storage/AssetStoreTest.php
@@ -20,9 +20,6 @@
 class AssetStoreTest extends SapphireTest
 {
 
-    /**
-     * @skipUpgrade
-     */
     protected function setUp(): void
     {
         parent::setUp();

diff --git a/tests/php/Storage/DBFileTest.php b/tests/php/Storage/DBFileTest.php
@@ -8,9 +8,6 @@
 use SilverStripe\Dev\SapphireTest;
 use SilverStripe\ORM\ValidationException;
 
-/**
- * @skipUpgrade
- */
 class DBFileTest extends SapphireTest
 {
 

diff --git a/tests/php/UploadTest.php b/tests/php/UploadTest.php
@@ -15,9 +15,6 @@
 use SilverStripe\Security\Member;
 use SilverStripe\Versioned\Versioned;
 
-/**
- * @skipUpgrade
- */
 class UploadTest extends SapphireTest
 {
     /**
-Original file line number
+Diff line change
@@ Expand Up / @@ -15,7 +15,6 @@ @@
     /**
      * Tests {@see AssetControlExtension}
-     * @skipUpgrade
      */
     class AssetControlExtensionTest extends SapphireTest
     {
@@ Expand Down @@