From 47d13600f9e1c0bd9d64585190c8c8e9572807fc Mon Sep 17 00:00:00 2001 From: Steve Boyd Date: Wed, 16 Nov 2022 11:36:25 +1300 Subject: [PATCH] API Update deprecations --- .../SearchManipulateCapture_MySQLDatabase.php | 8 ++++- ...chManipulateCapture_PostgreSQLDatabase.php | 9 ++++-- ...earchManipulateCapture_SQLite3Database.php | 8 ++++- src/Search/Queries/SearchQuery.php | 32 +++++++++---------- src/Search/Queries/SearchQuery_Range.php | 8 ++--- 5 files changed, 41 insertions(+), 24 deletions(-) diff --git a/src/Search/Captures/SearchManipulateCapture_MySQLDatabase.php b/src/Search/Captures/SearchManipulateCapture_MySQLDatabase.php index a336339..e88f56a 100644 --- a/src/Search/Captures/SearchManipulateCapture_MySQLDatabase.php +++ b/src/Search/Captures/SearchManipulateCapture_MySQLDatabase.php @@ -2,11 +2,12 @@ namespace SilverStripe\FullTextSearch\Search\Captures; +use SilverStripe\Dev\Deprecation; use SilverStripe\ORM\Connect\MySQLDatabase; use SilverStripe\FullTextSearch\Search\Updaters\SearchUpdater; /** - * @deprecated 3.1...4.0 Please use tractorcow/silverstripe-proxy-db to proxy the database connector instead + * @deprecated 3.1.0 Use tractorcow/silverstripe-proxy-db to proxy the database connector instead */ class SearchManipulateCapture_MySQLDatabase extends MySQLDatabase @@ -14,6 +15,11 @@ class SearchManipulateCapture_MySQLDatabase extends MySQLDatabase public $isManipulationCapture = true; + public function __construct() + { + Deprecation::notice('3.1.0', 'Use tractorcow/silverstripe-proxy-db to proxy the database connector instead', Deprecation::SCOPE_CLASS); + } + public function manipulate($manipulation) { $res = parent::manipulate($manipulation); diff --git a/src/Search/Captures/SearchManipulateCapture_PostgreSQLDatabase.php b/src/Search/Captures/SearchManipulateCapture_PostgreSQLDatabase.php index c1c2d1c..1851c75 100644 --- a/src/Search/Captures/SearchManipulateCapture_PostgreSQLDatabase.php +++ b/src/Search/Captures/SearchManipulateCapture_PostgreSQLDatabase.php @@ -2,6 +2,7 @@ namespace SilverStripe\FullTextSearch\Search\Captures; +use SilverStripe\Dev\Deprecation; use SilverStripe\PostgreSQL\PostgreSQLDatabase; use SilverStripe\FullTextSearch\Search\Updaters\SearchUpdater; @@ -10,13 +11,17 @@ if (!class_exists(PostgreSQLDatabase::class)) { } /** - * @deprecated 3.1...4.0 Please use tractorcow/silverstripe-proxy-db to proxy the database connector instead + * @deprecated 3.1.0 Use tractorcow/silverstripe-proxy-db to proxy the database connector instead */ - class SearchManipulateCapture_PostgreSQLDatabase extends PostgreSQLDatabase { public $isManipulationCapture = true; + public function __construct() + { + Deprecation::notice('3.1.0', 'Use tractorcow/silverstripe-proxy-db to proxy the database connector instead', Deprecation::SCOPE_CLASS); + } + public function manipulate($manipulation) { $res = parent::manipulate($manipulation); diff --git a/src/Search/Captures/SearchManipulateCapture_SQLite3Database.php b/src/Search/Captures/SearchManipulateCapture_SQLite3Database.php index 88027f9..5a1232a 100644 --- a/src/Search/Captures/SearchManipulateCapture_SQLite3Database.php +++ b/src/Search/Captures/SearchManipulateCapture_SQLite3Database.php @@ -2,6 +2,7 @@ namespace SilverStripe\FullTextSearch\Search\Captures; +use SilverStripe\Dev\Deprecation; use SilverStripe\FullTextSearch\Search\Updaters\SearchUpdater; use SilverStripe\SQLite\SQLite3Database; @@ -10,7 +11,7 @@ if (!class_exists(SQLite3Database::class)) { } /** - * @deprecated 3.1...4.0 Please use tractorcow/silverstripe-proxy-db to proxy the database connector instead + * @deprecated 3.1.0 Use tractorcow/silverstripe-proxy-db to proxy the database connector instead */ class SearchManipulateCapture_SQLite3Database extends SQLite3Database @@ -18,6 +19,11 @@ class SearchManipulateCapture_SQLite3Database extends SQLite3Database public $isManipulationCapture = true; + public function __construct() + { + Deprecation::notice('3.1.0', 'Use tractorcow/silverstripe-proxy-db to proxy the database connector instead', Deprecation::SCOPE_CLASS); + } + public function manipulate($manipulation) { $res = parent::manipulate($manipulation); diff --git a/src/Search/Queries/SearchQuery.php b/src/Search/Queries/SearchQuery.php index 7a3db7c..0a86590 100644 --- a/src/Search/Queries/SearchQuery.php +++ b/src/Search/Queries/SearchQuery.php @@ -284,81 +284,81 @@ class SearchQuery extends ViewableData /** * @codeCoverageIgnore - * @deprecated + * @deprecated 4.0.0 Use addSearchTerm() instead */ public function search($text, $fields = null, $boost = []) { - Deprecation::notice('4.0', 'Use addSearchTerm() instead'); + Deprecation::notice('4.0.0', 'Use addSearchTerm() instead'); return $this->addSearchTerm($text, $fields, $boost); } /** * @codeCoverageIgnore - * @deprecated + * @deprecated 4.0.0 Use addFuzzySearchTerm() instead */ public function fuzzysearch($text, $fields = null, $boost = []) { - Deprecation::notice('4.0', 'Use addFuzzySearchTerm() instead'); + Deprecation::notice('4.0.0', 'Use addFuzzySearchTerm() instead'); return $this->addFuzzySearchTerm($text, $fields, $boost); } /** * @codeCoverageIgnore - * @deprecated + * @deprecated 4.0.0 Use addClassFilter() instead */ public function inClass($class, $includeSubclasses = true) { - Deprecation::notice('4.0', 'Use addClassFilter() instead'); + Deprecation::notice('4.0.0', 'Use addClassFilter() instead'); return $this->addClassFilter($class, $includeSubclasses); } /** * @codeCoverageIgnore - * @deprecated + * @deprecated 4.0.0 Use addFilter() instead */ public function filter($field, $values) { - Deprecation::notice('4.0', 'Use addFilter() instead'); + Deprecation::notice('4.0.0', 'Use addFilter() instead'); return $this->addFilter($field, $values); } /** * @codeCoverageIgnore - * @deprecated + * @deprecated 4.0.0 Use addExclude() instead */ public function exclude($field, $values) { - Deprecation::notice('4.0', 'Use addExclude() instead'); + Deprecation::notice('4.0.0', 'Use addExclude() instead'); return $this->addExclude($field, $values); } /** * @codeCoverageIgnore - * @deprecated + * @deprecated 4.0.0 Use setStart() instead */ public function start($start) { - Deprecation::notice('4.0', 'Use setStart() instead'); + Deprecation::notice('4.0.0', 'Use setStart() instead'); return $this->setStart($start); } /** * @codeCoverageIgnore - * @deprecated + * @deprecated 4.0.0 Use setLimit() instead */ public function limit($limit) { - Deprecation::notice('4.0', 'Use setLimit() instead'); + Deprecation::notice('4.0.0', 'Use setLimit() instead'); return $this->setLimit($limit); } /** * @codeCoverageIgnore - * @deprecated + * @deprecated 4.0.0 Use setPageSize() instead */ public function page($page) { - Deprecation::notice('4.0', 'Use setPageSize() instead'); + Deprecation::notice('4.0.0', 'Use setPageSize() instead'); return $this->setPageSize($page); } diff --git a/src/Search/Queries/SearchQuery_Range.php b/src/Search/Queries/SearchQuery_Range.php index 1458afe..0b4f4f9 100644 --- a/src/Search/Queries/SearchQuery_Range.php +++ b/src/Search/Queries/SearchQuery_Range.php @@ -40,22 +40,22 @@ class SearchQuery_Range } /** - * @deprecated + * @deprecated 4.0.0 Use setStart() instead * @codeCoverageIgnore */ public function start($start) { - Deprecation::notice('4.0', 'Use setStart() instead'); + Deprecation::notice('4.0.0', 'Use setStart() instead'); return $this->setStart($start); } /** - * @deprecated + * @deprecated 4.0.0 Use setEnd() instead * @codeCoverageIgnore */ public function end($end) { - Deprecation::notice('4.0', 'Use setEnd() instead'); + Deprecation::notice('4.0.0', 'Use setEnd() instead'); return $this->setEnd($end); } }