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", 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 */ - 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