API Stop using deprecated API

silverstripe · Nov 28, 2022 · 9bffdea · 9bffdea
1 parent c98b8fb
commit 9bffdea
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 6 deletions.
diff --git a/src/Dev/Tasks/LegacyThumbnailMigrationHelper.php b/src/Dev/Tasks/LegacyThumbnailMigrationHelper.php
@@ -144,7 +144,9 @@ protected function migrateFolder(FlysystemAssetStore $store, Folder $folder)
         }
 
         $failNewerVariant = false;
-        $legacyFileIDParser = new LegacyFileIDHelper($failNewerVariant);
+        $legacyFileIDParser = Deprecation::withNoReplacement(function () use ($failNewerVariant) {
+            return new LegacyFileIDHelper($failNewerVariant);
+        });
         $naturalFileIDParser = new NaturalFileIDHelper();
 
         $foundError = false;

diff --git a/src/Dev/Tasks/TagsToShortcodeHelper.php b/src/Dev/Tasks/TagsToShortcodeHelper.php
@@ -247,9 +247,12 @@ private function getTagTuple($tag)
     private function getParsedFileIDFromSrc($src)
     {
         $fileIDHelperResolutionStrategy = FileIDHelperResolutionStrategy::create();
+        $legacyFileIDHelper = Deprecation::withNoReplacement(function () {
+            return new LegacyFileIDHelper();
+        });
         $fileIDHelperResolutionStrategy->setResolutionFileIDHelpers([
             $hashFileIdHelper = new HashFileIDHelper(),
-            new LegacyFileIDHelper(),
+            $legacyFileIDHelper,
             $defaultFileIDHelper = new NaturalFileIDHelper(),
         ]);
         $fileIDHelperResolutionStrategy->setDefaultFileIDHelper($defaultFileIDHelper);

diff --git a/src/Dev/Tasks/TagsToShortcodeTask.php b/src/Dev/Tasks/TagsToShortcodeTask.php
@@ -41,10 +41,12 @@ public function run($request)
     {
         Injector::inst()->get(FileHashingService::class)->enableCache();
 
-        $tagsToShortcodeHelper = new TagsToShortcodeHelper(
-            $request->getVar('baseClass'),
-            isset($request->getVars()['includeBaseClass'])
-        );
+        $tagsToShortcodeHelper = Deprecation::withNoReplacement(function () use ($request) {
+            return new TagsToShortcodeHelper(
+                $request->getVar('baseClass'),
+                isset($request->getVars()['includeBaseClass'])
+            );
+        });
         $tagsToShortcodeHelper->run();
 
         echo 'DONE';

diff --git a/tests/php/Dev/Tasks/SS4CrazyFileMigrationHelperTest.php b/tests/php/Dev/Tasks/SS4CrazyFileMigrationHelperTest.php
@@ -16,6 +16,8 @@
  * public ones. We're transitioning to a scenario where Hash paths are used for both protected and public files.
  *
  * This is meant to test the robustness of the solution under a weird set up.
+ *
+ * @deprecated test - Delete this test in CMS5
  */
 class SS4CrazyFileMigrationHelperTest extends SS4FileMigrationHelperTest
 {

diff --git a/tests/php/Dev/Tasks/SS4FileMigrationHelperTest.php b/tests/php/Dev/Tasks/SS4FileMigrationHelperTest.php
@@ -29,6 +29,7 @@
 use SilverStripe\ORM\FieldType\DBDatetime;
 use SilverStripe\Security\Member;
 use SilverStripe\Versioned\Versioned;
+use SilverStripe\Dev\Deprecation;
 
 /**
  * Test a generic SS4.3 to SS4.4 file migration. Also serve as basis for more fancy file migration test
@@ -194,6 +195,9 @@ protected function tearDown(): void
 
     public function testMigration()
     {
+        if (Deprecation::isEnabled()) {
+            $this->markTestSkipped('Test calls deprecated code');
+        }
         $helper = new FileMigrationHelper();
         $result = $helper->run(TestAssetStore::base_path());