Merge branch '4.2' into 4

github-actions[bot] · github-actions[bot] · commit 7c7650e7fdc9 · 2025-05-01T03:01:06.000Z
diff --git a/src/Tasks/GorriecoeMigrationTask.php b/src/Tasks/GorriecoeMigrationTask.php
@@ -13,7 +13,7 @@
 use SilverStripe\ORM\DB;
 
 /**
- * @deprecated 4.0.0 Will be removed without equivalent functionality.
+ * @deprecated 4.0.0 Will be removed without equivalent functionality in a future major release.
  */
 class GorriecoeMigrationTask extends BuildTask
 {
diff --git a/src/Tasks/LinkFieldMigrationTask.php b/src/Tasks/LinkFieldMigrationTask.php
@@ -14,7 +14,7 @@
 use SilverStripe\Versioned\Versioned;
 
 /**
- * @deprecated 4.0.0 Will be removed without equivalent functionality.
+ * @deprecated 4.0.0 Will be removed without equivalent functionality in a future major release.
  */
 class LinkFieldMigrationTask extends BuildTask
 {
diff --git a/src/Tasks/LinkableMigrationTask.php b/src/Tasks/LinkableMigrationTask.php
@@ -13,7 +13,7 @@
 use SilverStripe\ORM\DB;
 
 /**
- * @deprecated 4.0.0 Will be removed without equivalent functionality.
+ * @deprecated 4.0.0 Will be removed without equivalent functionality in a future major release.
  */
 class LinkableMigrationTask extends BuildTask
 {
diff --git a/src/Tasks/MigrationTaskTrait.php b/src/Tasks/MigrationTaskTrait.php
@@ -46,17 +46,17 @@ public function __construct()
     {
         // Use withSuppressedNotice() because otherwise even viewing the dev/tasks list will trigger this warning.
         Deprecation::withSuppressedNotice(
-            fn () => Deprecation::notice('4.0.0', 'Will be removed without equivalent functionality.', Deprecation::SCOPE_CLASS)
+            fn () => Deprecation::notice('4.0.0', 'Will be removed without equivalent functionality in a future major release.', Deprecation::SCOPE_CLASS)
         );
         parent::__construct();
     }
 
     /**
-     * @deprecated 4.2.0 Will be replaced with execute()
+     * @deprecated 4.2.0 Will be replaced with execute() in a future major release
      */
     public function run($request): void
     {
-        Deprecation::noticeWithNoReplacment('4.2.0', 'Will be replaced with execute()');
+        Deprecation::noticeWithNoReplacment('4.2.0', 'Will be replaced with execute() in a future major release');
         $db = DB::get_conn();
 
         // If we don't need to migrate, exit early.
diff --git a/src/Tasks/ModuleMigrationTaskTrait.php b/src/Tasks/ModuleMigrationTaskTrait.php
@@ -14,7 +14,7 @@
 use SilverStripe\Versioned\Versioned;
 
 /**
- * @deprecated 4.0.0 Will be removed without equivalent functionality.
+ * @deprecated 4.0.0 Will be removed without equivalent functionality in a future major release.
  */
 trait ModuleMigrationTaskTrait
 {

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`use SilverStripe\ORM\DB;`
`14`	`14`
`15`	`15`	`/**`
`16`		`- * @deprecated 4.0.0 Will be removed without equivalent functionality.`
	`16`	`+ * @deprecated 4.0.0 Will be removed without equivalent functionality in a future major release.`
`17`	`17`	`*/`
`18`	`18`	`class GorriecoeMigrationTask extends BuildTask`
`19`	`19`	`{`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`	`use SilverStripe\Versioned\Versioned;`
`15`	`15`
`16`	`16`	`/**`
`17`		`- * @deprecated 4.0.0 Will be removed without equivalent functionality.`
	`17`	`+ * @deprecated 4.0.0 Will be removed without equivalent functionality in a future major release.`
`18`	`18`	`*/`
`19`	`19`	`class LinkFieldMigrationTask extends BuildTask`
`20`	`20`	`{`
Original file line number	Diff line number	Diff line change
`@@ -46,17 +46,17 @@ public function __construct()`
`46`	`46`	`{`
`47`	`47`	`// Use withSuppressedNotice() because otherwise even viewing the dev/tasks list will trigger this warning.`
`48`	`48`	`Deprecation::withSuppressedNotice(`
`49`		`- fn () => Deprecation::notice('4.0.0', 'Will be removed without equivalent functionality.', Deprecation::SCOPE_CLASS)`
	`49`	`+ fn () => Deprecation::notice('4.0.0', 'Will be removed without equivalent functionality in a future major release.', Deprecation::SCOPE_CLASS)`
`50`	`50`	`);`
`51`	`51`	`parent::__construct();`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`/**`
`55`		`- * @deprecated 4.2.0 Will be replaced with execute()`
	`55`	`+ * @deprecated 4.2.0 Will be replaced with execute() in a future major release`
`56`	`56`	`*/`
`57`	`57`	`public function run($request): void`
`58`	`58`	`{`
`59`		`- Deprecation::noticeWithNoReplacment('4.2.0', 'Will be replaced with execute()');`
	`59`	`+ Deprecation::noticeWithNoReplacment('4.2.0', 'Will be replaced with execute() in a future major release');`
`60`	`60`	`$db = DB::get_conn();`
`61`	`61`
`62`	`62`	`// If we don't need to migrate, exit early.`