From 9f861a3418b72f1a9b4b885acc4f03c6f5fbc6f7 Mon Sep 17 00:00:00 2001 From: Steve Boyd Date: Tue, 18 Oct 2022 14:04:20 +1300 Subject: [PATCH 1/4] ENH Update deprecation messages --- code/ModelAdmin.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/ModelAdmin.php b/code/ModelAdmin.php index c0a33681c..b2c0ff16d 100644 --- a/code/ModelAdmin.php +++ b/code/ModelAdmin.php @@ -379,7 +379,7 @@ public function getExportFields() */ public function getSearchContext() { - Deprecation::notice('4.3', 'Will be removed in favor of GridFieldFilterHeader in 5.0'); + Deprecation::notice('4.3', 'Use GridFieldFilterHeader instead'); $gridField = $this->getEditForm()->fields() ->fieldByName($this->sanitiseClassName($this->modelClass)); @@ -401,7 +401,7 @@ public function getSearchContext() */ public function SearchSummary() { - Deprecation::notice('4.3', 'Will be removed in favor of GridFieldFilterHeader in 5.0'); + Deprecation::notice('4.3', 'Use GridFieldFilterHeader instead'); $context = $this->getSearchContext(); @@ -416,7 +416,7 @@ public function SearchSummary() */ public function SearchForm() { - Deprecation::notice('4.3', 'Will be removed in favor of GridFieldFilterHeader in 5.0'); + Deprecation::notice('4.3', 'Use GridFieldFilterHeader instead'); if (!$this->showSearchForm || (is_array($this->showSearchForm) && !in_array($this->modelClass, $this->showSearchForm ?? [])) From a18e5d9d58683e08bbb2b0a214ada7f3af9616e0 Mon Sep 17 00:00:00 2001 From: Steve Boyd Date: Tue, 18 Oct 2022 14:05:11 +1300 Subject: [PATCH 2/4] API Update deprecations --- code/LeftAndMain.php | 4 ++-- code/ModelAdmin.php | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/code/LeftAndMain.php b/code/LeftAndMain.php index 0bb38f714..7c7914398 100644 --- a/code/LeftAndMain.php +++ b/code/LeftAndMain.php @@ -933,11 +933,11 @@ public function Link($action = null) } /** - * @deprecated 5.0 + * @deprecated 4.12.0 Use menu_title() instead */ public static function menu_title_for_class($class) { - Deprecation::notice('5.0', 'Use menu_title() instead'); + Deprecation::notice('4.12.0', 'Use menu_title() instead'); return static::menu_title($class, false); } diff --git a/code/ModelAdmin.php b/code/ModelAdmin.php index b2c0ff16d..0f0851b14 100644 --- a/code/ModelAdmin.php +++ b/code/ModelAdmin.php @@ -374,12 +374,12 @@ public function getExportFields() } /** - * @deprecated 4.3.0 + * @deprecated 4.3.0 Use GridFieldFilterHeader instead * @return \SilverStripe\ORM\Search\SearchContext */ public function getSearchContext() { - Deprecation::notice('4.3', 'Use GridFieldFilterHeader instead'); + Deprecation::notice('4.3.0', 'Use GridFieldFilterHeader instead'); $gridField = $this->getEditForm()->fields() ->fieldByName($this->sanitiseClassName($this->modelClass)); @@ -396,12 +396,12 @@ public function getSearchContext() /** * Gets a list of fields that have been searched * - * @deprecated 4.3.0 + * @deprecated 4.3.0 Use GridFieldFilterHeader instead * @return ArrayList */ public function SearchSummary() { - Deprecation::notice('4.3', 'Use GridFieldFilterHeader instead'); + Deprecation::notice('4.3.0', 'Use GridFieldFilterHeader instead'); $context = $this->getSearchContext(); @@ -411,12 +411,12 @@ public function SearchSummary() /** * Returns the search form * - * @deprecated 4.3.0 + * @deprecated 4.3.0 Use GridFieldFilterHeader instead * @return Form|bool */ public function SearchForm() { - Deprecation::notice('4.3', 'Use GridFieldFilterHeader instead'); + Deprecation::notice('4.3.0', 'Use GridFieldFilterHeader instead'); if (!$this->showSearchForm || (is_array($this->showSearchForm) && !in_array($this->modelClass, $this->showSearchForm ?? [])) From 0507a9adfc3514169b5b96d806fb59faad9518a0 Mon Sep 17 00:00:00 2001 From: Steve Boyd Date: Tue, 25 Oct 2022 14:59:46 +1300 Subject: [PATCH 3/4] API Update deprecations --- _legacy/GraphQL/ReadOneLegacyResolver.php | 4 +++- code/LeftAndMain.php | 6 +++--- code/ModelAdmin.php | 12 ++++++------ 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/_legacy/GraphQL/ReadOneLegacyResolver.php b/_legacy/GraphQL/ReadOneLegacyResolver.php index 93c4c99a9..ab3556daf 100644 --- a/_legacy/GraphQL/ReadOneLegacyResolver.php +++ b/_legacy/GraphQL/ReadOneLegacyResolver.php @@ -2,6 +2,7 @@ namespace SilverStripe\Admin\GraphQL; +use SilverStripe\Dev\Deprecation; use GraphQL\Type\Definition\ResolveInfo; use SilverStripe\Core\Injector\Injector; use SilverStripe\GraphQL\OperationResolver; @@ -17,7 +18,7 @@ /** * Shim to make readOne work like GraphQL 4 * - * @deprecated 4.8..5.0 Use silverstripe/graphql:^4 functionality. + * @deprecated 1.8.0 Use _graphql directory functionality instead */ class ReadOneLegacyResolver implements OperationResolver { @@ -28,6 +29,7 @@ class ReadOneLegacyResolver implements OperationResolver public function __construct(DataObject $dataObject) { + Deprecation::notice('1.8.0', 'Use _graphql directory functionality instead', Deprecation::SCOPE_CLASS); $this->dataObject = $dataObject; } diff --git a/code/LeftAndMain.php b/code/LeftAndMain.php index 7c7914398..159830647 100644 --- a/code/LeftAndMain.php +++ b/code/LeftAndMain.php @@ -128,7 +128,7 @@ class LeftAndMain extends Controller implements PermissionProvider private static $tree_class = null; /** - * @deprecated 5.0 use $help_links instead + * @deprecated 1.12.0 Use $help_links instead * * @config * @var string @@ -933,11 +933,11 @@ public function Link($action = null) } /** - * @deprecated 4.12.0 Use menu_title() instead + * @deprecated 1.12.0 Use menu_title() instead */ public static function menu_title_for_class($class) { - Deprecation::notice('4.12.0', 'Use menu_title() instead'); + Deprecation::notice('1.12.0', 'Use menu_title() instead'); return static::menu_title($class, false); } diff --git a/code/ModelAdmin.php b/code/ModelAdmin.php index 0f0851b14..700b5c0e4 100644 --- a/code/ModelAdmin.php +++ b/code/ModelAdmin.php @@ -374,12 +374,12 @@ public function getExportFields() } /** - * @deprecated 4.3.0 Use GridFieldFilterHeader instead + * @deprecated 1.3.0 Use GridFieldFilterHeader instead * @return \SilverStripe\ORM\Search\SearchContext */ public function getSearchContext() { - Deprecation::notice('4.3.0', 'Use GridFieldFilterHeader instead'); + Deprecation::notice('1.3.0', 'Use GridFieldFilterHeader instead'); $gridField = $this->getEditForm()->fields() ->fieldByName($this->sanitiseClassName($this->modelClass)); @@ -396,12 +396,12 @@ public function getSearchContext() /** * Gets a list of fields that have been searched * - * @deprecated 4.3.0 Use GridFieldFilterHeader instead + * @deprecated 1.3.0 Use GridFieldFilterHeader instead * @return ArrayList */ public function SearchSummary() { - Deprecation::notice('4.3.0', 'Use GridFieldFilterHeader instead'); + Deprecation::notice('1.3.0', 'Use GridFieldFilterHeader instead'); $context = $this->getSearchContext(); @@ -411,12 +411,12 @@ public function SearchSummary() /** * Returns the search form * - * @deprecated 4.3.0 Use GridFieldFilterHeader instead + * @deprecated 1.3.0 Use GridFieldFilterHeader instead * @return Form|bool */ public function SearchForm() { - Deprecation::notice('4.3.0', 'Use GridFieldFilterHeader instead'); + Deprecation::notice('1.3.0', 'Use GridFieldFilterHeader instead'); if (!$this->showSearchForm || (is_array($this->showSearchForm) && !in_array($this->modelClass, $this->showSearchForm ?? [])) From 65e23febbc7afaed0b896a33c8bffc8e33a97094 Mon Sep 17 00:00:00 2001 From: Steve Boyd Date: Tue, 25 Oct 2022 17:32:09 +1300 Subject: [PATCH 4/4] API Update deprecation message --- _legacy/GraphQL/ReadOneLegacyResolver.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_legacy/GraphQL/ReadOneLegacyResolver.php b/_legacy/GraphQL/ReadOneLegacyResolver.php index ab3556daf..35ff26deb 100644 --- a/_legacy/GraphQL/ReadOneLegacyResolver.php +++ b/_legacy/GraphQL/ReadOneLegacyResolver.php @@ -18,7 +18,7 @@ /** * Shim to make readOne work like GraphQL 4 * - * @deprecated 1.8.0 Use _graphql directory functionality instead + * @deprecated 1.8.0 Use the latest version of graphql instead */ class ReadOneLegacyResolver implements OperationResolver { @@ -29,7 +29,7 @@ class ReadOneLegacyResolver implements OperationResolver public function __construct(DataObject $dataObject) { - Deprecation::notice('1.8.0', 'Use _graphql directory functionality instead', Deprecation::SCOPE_CLASS); + Deprecation::notice('1.8.0', 'Use the latest version of graphql instead', Deprecation::SCOPE_CLASS); $this->dataObject = $dataObject; }