From 9e5f540a33c09b16d6f09b381210059e7ec39e29 Mon Sep 17 00:00:00 2001
From: Guy Sartorelli <36352093+GuySartorelli@users.noreply.github.com>
Date: Tue, 7 Jan 2025 17:14:50 +1300
Subject: [PATCH 1/2] API Remove deprecated API (#484)

---
 src/DataDifferencer.php |  1 -
 src/Versioned.php       | 12 +-----------
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/src/DataDifferencer.php b/src/DataDifferencer.php
index 771a2ee6..166058a6 100644
--- a/src/DataDifferencer.php
+++ b/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;
diff --git a/src/Versioned.php b/src/Versioned.php
index e4701c59..bd3ca663 100644
--- a/src/Versioned.php
+++ b/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

From 4ea6402b747a2c6474d583864d297b7528826beb Mon Sep 17 00:00:00 2001
From: Guy Sartorelli <36352093+GuySartorelli@users.noreply.github.com>
Date: Wed, 8 Jan 2025 09:41:49 +1300
Subject: [PATCH 2/2] DEP Don't include vendor-plugin as an explicit dependency
 (#485)

We don't directly reference it in code or config, so we can rely on silverstripe/framework having this dependency for us.
---
 composer.json | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index 23031f2f..2d7c0e25 100755
--- a/composer.json
+++ b/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",