Merge branch '5.0' into 5

github-actions[bot] · github-actions[bot] · commit 760db3d66042 · 2025-05-01T22:13:55.000Z
diff --git a/src/Tasks/GorriecoeMigrationTask.php b/src/Tasks/GorriecoeMigrationTask.php
@@ -13,7 +13,7 @@
 use SilverStripe\ORM\DB;
 
 /**
- * @deprecated 5.0.0 Will be removed without equivalent functionality.
+ * @deprecated 5.0.0 Will be removed without equivalent functionality in a future major release.
  */
 class GorriecoeMigrationTask extends BuildTask
 {
diff --git a/src/Tasks/MigrationTaskTrait.php b/src/Tasks/MigrationTaskTrait.php
@@ -27,7 +27,7 @@
 use Symfony\Component\Console\Input\InputOption;
 
 /**
- * @deprecated 5.0.0 Will be removed without equivalent functionality.
+ * @deprecated 5.0.0 Will be removed without equivalent functionality in a future major release.
  */
 trait MigrationTaskTrait
 {
@@ -55,7 +55,7 @@ public function __construct()
     {
         // Use withSuppressedNotice() because otherwise even viewing the tasks list will trigger this warning.
         Deprecation::withSuppressedNotice(
-            fn () => Deprecation::notice('5.0.0', 'Will be removed without equivalent functionality.', Deprecation::SCOPE_CLASS)
+            fn () => Deprecation::notice('5.0.0', 'Will be removed without equivalent functionality in a future major release.', Deprecation::SCOPE_CLASS)
         );
         parent::__construct();
     }
diff --git a/src/Tasks/ModuleMigrationTaskTrait.php b/src/Tasks/ModuleMigrationTaskTrait.php
@@ -14,7 +14,7 @@
 use SilverStripe\Versioned\Versioned;
 
 /**
- * @deprecated 5.0.0 Will be removed without equivalent functionality.
+ * @deprecated 5.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 5.0.0 Will be removed without equivalent functionality.`
	`16`	`+ * @deprecated 5.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
`@@ -27,7 +27,7 @@`
`27`	`27`	`use Symfony\Component\Console\Input\InputOption;`
`28`	`28`
`29`	`29`	`/**`
`30`		`- * @deprecated 5.0.0 Will be removed without equivalent functionality.`
	`30`	`+ * @deprecated 5.0.0 Will be removed without equivalent functionality in a future major release.`
`31`	`31`	`*/`
`32`	`32`	`trait MigrationTaskTrait`
`33`	`33`	`{`
`@@ -55,7 +55,7 @@ public function __construct()`
`55`	`55`	`{`
`56`	`56`	`// Use withSuppressedNotice() because otherwise even viewing the tasks list will trigger this warning.`
`57`	`57`	`Deprecation::withSuppressedNotice(`
`58`		`- fn () => Deprecation::notice('5.0.0', 'Will be removed without equivalent functionality.', Deprecation::SCOPE_CLASS)`
	`58`	`+ fn () => Deprecation::notice('5.0.0', 'Will be removed without equivalent functionality in a future major release.', Deprecation::SCOPE_CLASS)`
`59`	`59`	`);`
`60`	`60`	`parent::__construct();`
`61`	`61`	`}`
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 5.0.0 Will be removed without equivalent functionality.`
	`17`	`+ * @deprecated 5.0.0 Will be removed without equivalent functionality in a future major release.`
`18`	`18`	`*/`
`19`	`19`	`trait ModuleMigrationTaskTrait`
`20`	`20`	`{`