From d11b0c27e03385fbe6fbc82d78267e26e79438cf Mon Sep 17 00:00:00 2001 From: Kim Pepper Date: Tue, 11 Feb 2025 15:14:31 +1100 Subject: [PATCH] Move the deprecation trigger to the methods Signed-off-by: Kim Pepper --- src/OpenSearch/Client.php | 5 +++++ src/OpenSearch/Namespaces/AsyncSearchNamespace.php | 3 --- .../Namespaces/DataFrameTransformDeprecatedNamespace.php | 3 --- src/OpenSearch/Namespaces/MonitoringNamespace.php | 3 --- src/OpenSearch/Namespaces/SearchableSnapshotsNamespace.php | 3 --- src/OpenSearch/Namespaces/SslNamespace.php | 3 --- util/template/client-namespace-function-deprecated | 1 + 7 files changed, 6 insertions(+), 15 deletions(-) diff --git a/src/OpenSearch/Client.php b/src/OpenSearch/Client.php index d90cd242..1976b04d 100644 --- a/src/OpenSearch/Client.php +++ b/src/OpenSearch/Client.php @@ -1864,6 +1864,7 @@ public function deletePointInTime(array $params = []) */ public function asyncSearch(): AsyncSearchNamespace { + @trigger_error('The ' . __METHOD__ . ' method is deprecated since 2.4.2 and will be removed in 3.0.0.', E_USER_DEPRECATED); return $this->asyncSearch; } /** @@ -1901,6 +1902,7 @@ public function danglingIndices(): DanglingIndicesNamespace */ public function dataFrameTransformDeprecated(): DataFrameTransformDeprecatedNamespace { + @trigger_error('The ' . __METHOD__ . ' method is deprecated since 2.4.2 and will be removed in 3.0.0.', E_USER_DEPRECATED); return $this->dataFrameTransformDeprecated; } /** @@ -1966,6 +1968,7 @@ public function ml(): MlNamespace */ public function monitoring(): MonitoringNamespace { + @trigger_error('The ' . __METHOD__ . ' method is deprecated since 2.4.2 and will be removed in 3.0.0.', E_USER_DEPRECATED); return $this->monitoring; } /** @@ -2038,6 +2041,7 @@ public function searchPipeline(): SearchPipelineNamespace */ public function searchableSnapshots(): SearchableSnapshotsNamespace { + @trigger_error('The ' . __METHOD__ . ' method is deprecated since 2.4.2 and will be removed in 3.0.0.', E_USER_DEPRECATED); return $this->searchableSnapshots; } /** @@ -2075,6 +2079,7 @@ public function sql(): SqlNamespace */ public function ssl(): SslNamespace { + @trigger_error('The ' . __METHOD__ . ' method is deprecated since 2.4.2 and will be removed in 3.0.0.', E_USER_DEPRECATED); return $this->ssl; } /** diff --git a/src/OpenSearch/Namespaces/AsyncSearchNamespace.php b/src/OpenSearch/Namespaces/AsyncSearchNamespace.php index a5855547..7b1c9f03 100644 --- a/src/OpenSearch/Namespaces/AsyncSearchNamespace.php +++ b/src/OpenSearch/Namespaces/AsyncSearchNamespace.php @@ -21,9 +21,6 @@ namespace OpenSearch\Namespaces; -// @phpstan-ignore classConstant.deprecatedClass -@trigger_error(AsyncSearchNamespace::class . ' is deprecated in 2.4.0 and will be removed in 3.0.0. Use AsynchronousSearchNamespace instead.', E_USER_DEPRECATED); - /** * Class AsyncSearchNamespace * diff --git a/src/OpenSearch/Namespaces/DataFrameTransformDeprecatedNamespace.php b/src/OpenSearch/Namespaces/DataFrameTransformDeprecatedNamespace.php index e3a274e2..b72b7433 100644 --- a/src/OpenSearch/Namespaces/DataFrameTransformDeprecatedNamespace.php +++ b/src/OpenSearch/Namespaces/DataFrameTransformDeprecatedNamespace.php @@ -21,9 +21,6 @@ namespace OpenSearch\Namespaces; -// @phpstan-ignore classConstant.deprecatedClass -@trigger_error(DataFrameTransformDeprecatedNamespace::class . ' is deprecated in 2.4.0 and will be removed in 3.0.0.', E_USER_DEPRECATED); - /** * Class DataFrameTransformDeprecatedNamespace * diff --git a/src/OpenSearch/Namespaces/MonitoringNamespace.php b/src/OpenSearch/Namespaces/MonitoringNamespace.php index ea732c2e..b4a8f042 100644 --- a/src/OpenSearch/Namespaces/MonitoringNamespace.php +++ b/src/OpenSearch/Namespaces/MonitoringNamespace.php @@ -21,9 +21,6 @@ namespace OpenSearch\Namespaces; -// @phpstan-ignore classConstant.deprecatedClass -@trigger_error(MonitoringNamespace::class . ' is deprecated in 2.4.0 and will be removed in 3.0.0.', E_USER_DEPRECATED); - /** * Class MonitoringNamespace * diff --git a/src/OpenSearch/Namespaces/SearchableSnapshotsNamespace.php b/src/OpenSearch/Namespaces/SearchableSnapshotsNamespace.php index e36b8b1e..e96c70ad 100644 --- a/src/OpenSearch/Namespaces/SearchableSnapshotsNamespace.php +++ b/src/OpenSearch/Namespaces/SearchableSnapshotsNamespace.php @@ -21,9 +21,6 @@ namespace OpenSearch\Namespaces; -// @phpstan-ignore classConstant.deprecatedClass -@trigger_error(SearchableSnapshotsNamespace::class . ' is deprecated in 2.4.0 and will be removed in 3.0.0.', E_USER_DEPRECATED); - /** * Class SearchableSnapshotsNamespace * diff --git a/src/OpenSearch/Namespaces/SslNamespace.php b/src/OpenSearch/Namespaces/SslNamespace.php index 14acc3f1..95d96a35 100644 --- a/src/OpenSearch/Namespaces/SslNamespace.php +++ b/src/OpenSearch/Namespaces/SslNamespace.php @@ -21,9 +21,6 @@ namespace OpenSearch\Namespaces; -// @phpstan-ignore classConstant.deprecatedClass -@trigger_error(SslNamespace::class . ' is deprecated in 2.4.0 and will be removed in 3.0.0. Use SslNamespace instead.', E_USER_DEPRECATED); - /** * Class SslNamespace * diff --git a/util/template/client-namespace-function-deprecated b/util/template/client-namespace-function-deprecated index d2a2c661..e9abcaf0 100644 --- a/util/template/client-namespace-function-deprecated +++ b/util/template/client-namespace-function-deprecated @@ -5,5 +5,6 @@ */ public function :name(): :namespace { + @trigger_error('The ' . __METHOD__ . ' method is deprecated since 2.4.2 and will be removed in 3.0.0.', E_USER_DEPRECATED); return $this->:name; }