Merge branch '3.0' into 3

composer.json

@@ -21,8 +21,7 @@
     "require": {
         "php": "^8.3",
         "silverstripe/framework": "^6",
-        "symfony/cache": "^7.0",
-        "silverstripe/vendor-plugin": "^2"
+        "symfony/cache": "^7.0"
     },
     "require-dev": {
         "silverstripe/recipe-testing": "^4",

src/DataDifferencer.php

@@ -4,7 +4,6 @@
 
 use SilverStripe\Assets\Image;
 use SilverStripe\Core\Convert;
-use SilverStripe\Dev\Deprecation;
 use SilverStripe\ORM\DataObject;
 use SilverStripe\Model\List\ArrayList;
 use SilverStripe\ORM\FieldType\DBField;

src/Versioned.php

@@ -1987,20 +1987,10 @@ public function stagesDifferRecursive(): bool
      * @param string $sort
      * @param string $limit
      * @param string $join Deprecated, use leftJoin($table, $joinClause) instead
-     * @param string $having @deprecated 2.2.0 The $having parameter does nothing and will be removed without
-     *               equivalent functionality to replace it
      * @return ArrayList<Versioned_Version>
      */
-    public function Versions($filter = "", $sort = "", $limit = "", $join = "", $having = "")
+    public function Versions($filter = "", $sort = "", $limit = "", $join = "")
     {
-        if ($having) {
-            Deprecation::withSuppressedNotice(function () {
-                $message = 'The $having parameter does nothing and will be removed without equivalent'
-                . ' functionality to replace it';
-                Deprecation::notice('2.2.0', $message);
-            });
-        }
-
         $owner = $this->owner;
 
         // When an object is not yet in the Database, we can't get its versions