From 4b0bca37fcbe207f1b456d7a3593132ff6830ce0 Mon Sep 17 00:00:00 2001 From: Kim Pepper Date: Thu, 23 Jan 2025 19:42:29 +0900 Subject: [PATCH] Update deprecated version to 2.4.0 Signed-off-by: Kim Pepper --- phpstan-baseline.neon | 14 +++++++------- src/OpenSearch/Client.php | 10 +++++----- src/OpenSearch/ClientBuilder.php | 12 ++++++------ src/OpenSearch/Common/EmptyLogger.php | 4 ++-- .../Exceptions/AuthenticationConfigException.php | 4 ++-- .../Common/Exceptions/BadMethodCallException.php | 4 ++-- .../Common/Exceptions/BadRequest400Exception.php | 4 ++-- .../Exceptions/ClientErrorResponseException.php | 4 ++-- .../Common/Exceptions/Conflict409Exception.php | 4 ++-- .../Exceptions/Curl/CouldNotConnectToHost.php | 4 ++-- .../Curl/CouldNotResolveHostException.php | 4 ++-- .../Exceptions/Curl/OperationTimeoutException.php | 4 ++-- .../Common/Exceptions/Forbidden403Exception.php | 4 ++-- .../Common/Exceptions/InvalidArgumentException.php | 4 ++-- .../Common/Exceptions/MaxRetriesException.php | 4 ++-- .../Common/Exceptions/Missing404Exception.php | 4 ++-- .../Exceptions/NoDocumentsToGetException.php | 4 ++-- .../Exceptions/NoNodesAvailableException.php | 4 ++-- .../Exceptions/NoShardAvailableException.php | 4 ++-- .../Common/Exceptions/OpenSearchException.php | 4 ++-- .../Exceptions/RequestTimeout408Exception.php | 4 ++-- .../Common/Exceptions/RoutingMissingException.php | 4 ++-- .../Exceptions/ScriptLangNotSupportedException.php | 4 ++-- .../Exceptions/ServerErrorResponseException.php | 4 ++-- .../Common/Exceptions/TransportException.php | 4 ++-- .../Common/Exceptions/Unauthorized401Exception.php | 4 ++-- .../ConnectionPool/AbstractConnectionPool.php | 4 ++-- .../ConnectionPool/ConnectionPoolInterface.php | 4 ++-- .../ConnectionPool/Selectors/RandomSelector.php | 4 ++-- .../Selectors/RoundRobinSelector.php | 4 ++-- .../ConnectionPool/Selectors/SelectorInterface.php | 4 ++-- .../Selectors/StickyRoundRobinSelector.php | 4 ++-- .../ConnectionPool/SimpleConnectionPool.php | 4 ++-- .../ConnectionPool/SniffingConnectionPool.php | 4 ++-- .../ConnectionPool/StaticConnectionPool.php | 4 ++-- .../ConnectionPool/StaticNoPingConnectionPool.php | 4 ++-- src/OpenSearch/Connections/Connection.php | 4 ++-- src/OpenSearch/Connections/ConnectionFactory.php | 4 ++-- .../Connections/ConnectionFactoryInterface.php | 4 ++-- src/OpenSearch/Connections/ConnectionInterface.php | 4 ++-- src/OpenSearch/Handlers/SigV4Handler.php | 4 ++-- src/OpenSearch/LegacyTransportWrapper.php | 2 +- src/OpenSearch/Namespaces/AbstractNamespace.php | 10 +++++----- .../Namespaces/BooleanRequestWrapper.php | 4 ++-- src/OpenSearch/Transport.php | 4 ++-- tests/ClientBuilderTest.php | 4 ++-- tests/ConnectionPool/ConnectionFactoryTest.php | 4 ++-- .../Selectors/RoundRobinSelectorTest.php | 4 ++-- .../Selectors/StickyRoundRobinSelectorTest.php | 4 ++-- .../SniffingConnectionPoolIntegrationTest.php | 2 +- .../ConnectionPool/SniffingConnectionPoolTest.php | 4 ++-- .../StaticConnectionPoolIntegrationTest.php | 4 ++-- tests/ConnectionPool/StaticConnectionPoolTest.php | 4 ++-- tests/Connections/ConnectionTest.php | 4 ++-- tests/Handlers/SigV4HandlerTest.php | 4 ++-- tests/LegacyRegisteredNamespaceTest.php | 4 ++-- util/template/client-class | 10 +++++----- 57 files changed, 130 insertions(+), 130 deletions(-) diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon index c4f3f503c..3cb814c52 100644 --- a/phpstan-baseline.neon +++ b/phpstan-baseline.neon @@ -3,7 +3,7 @@ parameters: - message: """ #^Instantiation of deprecated class OpenSearch\\\\Common\\\\Exceptions\\\\InvalidArgumentException\\: - in 2\\.3\\.2 and will be removed in 3\\.0\\.0\\.$# + in 2\\.4\\.0 and will be removed in 3\\.0\\.0\\.$# """ count: 1 path: src/OpenSearch/Endpoints/Monitoring/Bulk.php @@ -11,7 +11,7 @@ parameters: - message: """ #^Access to deprecated property \\$endpoints of class OpenSearch\\\\Namespaces\\\\AbstractNamespace\\: - in 2\\.3\\.2 and will be removed in 3\\.0\\.0\\. Use \\$endpointFactory property instead\\.$# + in 2\\.4\\.0 and will be removed in 3\\.0\\.0\\. Use \\$endpointFactory property instead\\.$# """ count: 3 path: src/OpenSearch/Namespaces/AsyncSearchNamespace.php @@ -27,7 +27,7 @@ parameters: - message: """ #^Access to deprecated property \\$endpoints of class OpenSearch\\\\Namespaces\\\\AbstractNamespace\\: - in 2\\.3\\.2 and will be removed in 3\\.0\\.0\\. Use \\$endpointFactory property instead\\.$# + in 2\\.4\\.0 and will be removed in 3\\.0\\.0\\. Use \\$endpointFactory property instead\\.$# """ count: 8 path: src/OpenSearch/Namespaces/DataFrameTransformDeprecatedNamespace.php @@ -75,7 +75,7 @@ parameters: - message: """ #^Access to deprecated property \\$endpoints of class OpenSearch\\\\Namespaces\\\\AbstractNamespace\\: - in 2\\.3\\.2 and will be removed in 3\\.0\\.0\\. Use \\$endpointFactory property instead\\.$# + in 2\\.4\\.0 and will be removed in 3\\.0\\.0\\. Use \\$endpointFactory property instead\\.$# """ count: 1 path: src/OpenSearch/Namespaces/MonitoringNamespace.php @@ -83,7 +83,7 @@ parameters: - message: """ #^Access to deprecated property \\$endpoints of class OpenSearch\\\\Namespaces\\\\AbstractNamespace\\: - in 2\\.3\\.2 and will be removed in 3\\.0\\.0\\. Use \\$endpointFactory property instead\\.$# + in 2\\.4\\.0 and will be removed in 3\\.0\\.0\\. Use \\$endpointFactory property instead\\.$# """ count: 4 path: src/OpenSearch/Namespaces/SearchableSnapshotsNamespace.php @@ -91,7 +91,7 @@ parameters: - message: """ #^Access to deprecated property \\$endpoints of class OpenSearch\\\\Namespaces\\\\AbstractNamespace\\: - in 2\\.3\\.2 and will be removed in 3\\.0\\.0\\. Use \\$endpointFactory property instead\\.$# + in 2\\.4\\.0 and will be removed in 3\\.0\\.0\\. Use \\$endpointFactory property instead\\.$# """ count: 1 path: src/OpenSearch/Namespaces/SecurityNamespace.php @@ -99,7 +99,7 @@ parameters: - message: """ #^Access to deprecated property \\$endpoints of class OpenSearch\\\\Namespaces\\\\AbstractNamespace\\: - in 2\\.3\\.2 and will be removed in 3\\.0\\.0\\. Use \\$endpointFactory property instead\\.$# + in 2\\.4\\.0 and will be removed in 3\\.0\\.0\\. Use \\$endpointFactory property instead\\.$# """ count: 1 path: src/OpenSearch/Namespaces/SslNamespace.php diff --git a/src/OpenSearch/Client.php b/src/OpenSearch/Client.php index 1dec65b88..de360b637 100644 --- a/src/OpenSearch/Client.php +++ b/src/OpenSearch/Client.php @@ -70,7 +70,7 @@ class Client /** * @var Transport * - * @deprecated in 2.3.2 and will be removed in 3.0.0. + * @deprecated in 2.4.0 and will be removed in 3.0.0. */ public $transport; @@ -86,7 +86,7 @@ class Client /** * @var callable * - * @deprecated in 2.3.2 and will be removed in 3.0.0. + * @deprecated in 2.4.0 and will be removed in 3.0.0. */ protected $endpoints; @@ -277,7 +277,7 @@ public function __construct( array $registeredNamespaces, ) { if (!$transport instanceof TransportInterface) { - @trigger_error('Passing an instance of \OpenSearch\Transport to ' . __METHOD__ . '() is deprecated in 2.3.2 and will be removed in 3.0.0. Pass an instance of \OpenSearch\TransportInterface instead.', E_USER_DEPRECATED); + @trigger_error('Passing an instance of \OpenSearch\Transport to ' . __METHOD__ . '() is deprecated in 2.4.0 and will be removed in 3.0.0. Pass an instance of \OpenSearch\TransportInterface instead.', E_USER_DEPRECATED); // @phpstan-ignore property.deprecated $this->transport = $transport; // @phpstan-ignore new.deprecated @@ -286,13 +286,13 @@ public function __construct( $this->httpTransport = $transport; } if (is_callable($endpointFactory)) { - @trigger_error('Passing a callable as the $endpointFactory param in ' . __METHOD__ . ' is deprecated in 2.3.2 and will be removed in 3.0.0. Pass an instance of \OpenSearch\EndpointFactoryInterface instead.', E_USER_DEPRECATED); + @trigger_error('Passing a callable as the $endpointFactory param in ' . __METHOD__ . ' is deprecated in 2.4.0 and will be removed in 3.0.0. Pass an instance of \OpenSearch\EndpointFactoryInterface instead.', E_USER_DEPRECATED); $endpoints = $endpointFactory; // @phpstan-ignore new.deprecated $endpointFactory = new LegacyEndpointFactory($endpointFactory); } else { $endpoints = function ($c) use ($endpointFactory) { - @trigger_error('The $endpoints property is deprecated in 2.3.2 and will be removed in 3.0.0.', E_USER_DEPRECATED); + @trigger_error('The $endpoints property is deprecated in 2.4.0 and will be removed in 3.0.0.', E_USER_DEPRECATED); return $endpointFactory->getEndpoint('OpenSearch\\Endpoints\\' . $c); }; } diff --git a/src/OpenSearch/ClientBuilder.php b/src/OpenSearch/ClientBuilder.php index f6306bae4..e65fdbfda 100644 --- a/src/OpenSearch/ClientBuilder.php +++ b/src/OpenSearch/ClientBuilder.php @@ -46,10 +46,10 @@ use ReflectionClass; // @phpstan-ignore classConstant.deprecatedClass -@trigger_error(ClientBuilder::class . ' is deprecated in 2.3.2 and will be removed in 3.0.0.', E_USER_DEPRECATED); +@trigger_error(ClientBuilder::class . ' is deprecated in 2.4.0 and will be removed in 3.0.0.', E_USER_DEPRECATED); /** - * @deprecated in 2.3.2 and will be removed in 3.0.0. + * @deprecated in 2.4.0 and will be removed in 3.0.0. */ class ClientBuilder { @@ -188,11 +188,11 @@ public function getTransport(): Transport /** * Can supply second param to Client::__construct() when invoking manually or with dependency injection * - * @deprecated in 2.3.2 and will be removed in 3.0.0. Use \OpenSearch\ClientBuilder::getEndpointFactory() instead. + * @deprecated in 2.4.0 and will be removed in 3.0.0. Use \OpenSearch\ClientBuilder::getEndpointFactory() instead. */ public function getEndpoint(): callable { - @trigger_error(__METHOD__ . '() is deprecated in 2.3.2 and will be removed in 3.0.0. Use \OpenSearch\ClientBuilder::getEndpointFactory() instead.', E_USER_DEPRECATED); + @trigger_error(__METHOD__ . '() is deprecated in 2.4.0 and will be removed in 3.0.0. Use \OpenSearch\ClientBuilder::getEndpointFactory() instead.', E_USER_DEPRECATED); return fn ($c) => $this->endpointFactory->getEndpoint('OpenSearch\\Endpoints\\' . $c); } @@ -336,11 +336,11 @@ public function setConnectionPool($connectionPool, array $args = []): ClientBuil * * @param callable $endpoint * - * @deprecated in 2.3.2 and will be removed in 3.0.0. Use \OpenSearch\ClientBuilder::setEndpointFactory() instead. + * @deprecated in 2.4.0 and will be removed in 3.0.0. Use \OpenSearch\ClientBuilder::setEndpointFactory() instead. */ public function setEndpoint(callable $endpoint): ClientBuilder { - @trigger_error(__METHOD__ . '() is deprecated in 2.3.2 and will be removed in 3.0.0. Use \OpenSearch\ClientBuilder::setEndpointFactory() instead.', E_USER_DEPRECATED); + @trigger_error(__METHOD__ . '() is deprecated in 2.4.0 and will be removed in 3.0.0. Use \OpenSearch\ClientBuilder::setEndpointFactory() instead.', E_USER_DEPRECATED); $this->endpointFactory = new LegacyEndpointFactory($endpoint); return $this; diff --git a/src/OpenSearch/Common/EmptyLogger.php b/src/OpenSearch/Common/EmptyLogger.php index 95539ef42..84a3c2f19 100644 --- a/src/OpenSearch/Common/EmptyLogger.php +++ b/src/OpenSearch/Common/EmptyLogger.php @@ -25,7 +25,7 @@ use Psr\Log\LoggerInterface; // @phpstan-ignore classConstant.deprecatedClass -@trigger_error(EmptyLogger::class . ' is deprecated in 2.3.2 and will be removed in 3.0.0. Use Psr\Log\NullLogger instead', E_USER_DEPRECATED); +@trigger_error(EmptyLogger::class . ' is deprecated in 2.4.0 and will be removed in 3.0.0. Use Psr\Log\NullLogger instead', E_USER_DEPRECATED); /** * Class EmptyLogger @@ -33,7 +33,7 @@ * Logger that doesn't do anything. Similar to Monolog's NullHandler, * but avoids the overhead of partially loading Monolog * - * @deprecated in 2.3.2 and will be removed in 3.0.0. Use Psr\Log\NullLogger instead. + * @deprecated in 2.4.0 and will be removed in 3.0.0. Use Psr\Log\NullLogger instead. */ class EmptyLogger extends AbstractLogger implements LoggerInterface { diff --git a/src/OpenSearch/Common/Exceptions/AuthenticationConfigException.php b/src/OpenSearch/Common/Exceptions/AuthenticationConfigException.php index dac5a9209..69c5a5dba 100644 --- a/src/OpenSearch/Common/Exceptions/AuthenticationConfigException.php +++ b/src/OpenSearch/Common/Exceptions/AuthenticationConfigException.php @@ -23,10 +23,10 @@ namespace OpenSearch\Common\Exceptions; // @phpstan-ignore classConstant.deprecatedClass -@trigger_error(AuthenticationConfigException::class . ' is deprecated in 2.3.2 and will be removed in 3.0.0.', E_USER_DEPRECATED); +@trigger_error(AuthenticationConfigException::class . ' is deprecated in 2.4.0 and will be removed in 3.0.0.', E_USER_DEPRECATED); /** - * @deprecated in 2.3.2 and will be removed in 3.0.0. + * @deprecated in 2.4.0 and will be removed in 3.0.0. */ class AuthenticationConfigException extends \RuntimeException implements OpenSearchException { diff --git a/src/OpenSearch/Common/Exceptions/BadMethodCallException.php b/src/OpenSearch/Common/Exceptions/BadMethodCallException.php index 5c30aa546..131c720a7 100644 --- a/src/OpenSearch/Common/Exceptions/BadMethodCallException.php +++ b/src/OpenSearch/Common/Exceptions/BadMethodCallException.php @@ -22,14 +22,14 @@ namespace OpenSearch\Common\Exceptions; // @phpstan-ignore classConstant.deprecatedClass -@trigger_error(BadMethodCallException::class . ' is deprecated in 2.3.2 and will be removed in 3.0.0.', E_USER_DEPRECATED); +@trigger_error(BadMethodCallException::class . ' is deprecated in 2.4.0 and will be removed in 3.0.0.', E_USER_DEPRECATED); /** * BadMethodCallException * * Denote problems with a method call (e.g. incorrect number of arguments) * - * @deprecated in 2.3.2 and will be removed in 3.0.0. + * @deprecated in 2.4.0 and will be removed in 3.0.0. */ class BadMethodCallException extends \BadMethodCallException implements OpenSearchException { diff --git a/src/OpenSearch/Common/Exceptions/BadRequest400Exception.php b/src/OpenSearch/Common/Exceptions/BadRequest400Exception.php index 0727ca941..7fc625354 100644 --- a/src/OpenSearch/Common/Exceptions/BadRequest400Exception.php +++ b/src/OpenSearch/Common/Exceptions/BadRequest400Exception.php @@ -22,10 +22,10 @@ namespace OpenSearch\Common\Exceptions; // @phpstan-ignore classConstant.deprecatedClass -@trigger_error(BadRequest400Exception::class . ' is deprecated in 2.3.2 and will be removed in 3.0.0.', E_USER_DEPRECATED); +@trigger_error(BadRequest400Exception::class . ' is deprecated in 2.4.0 and will be removed in 3.0.0.', E_USER_DEPRECATED); /** - * @deprecated in 2.3.2 and will be removed in 3.0.0. + * @deprecated in 2.4.0 and will be removed in 3.0.0. */ class BadRequest400Exception extends \Exception implements OpenSearchException { diff --git a/src/OpenSearch/Common/Exceptions/ClientErrorResponseException.php b/src/OpenSearch/Common/Exceptions/ClientErrorResponseException.php index b7d16f463..e917b4de8 100644 --- a/src/OpenSearch/Common/Exceptions/ClientErrorResponseException.php +++ b/src/OpenSearch/Common/Exceptions/ClientErrorResponseException.php @@ -22,10 +22,10 @@ namespace OpenSearch\Common\Exceptions; // @phpstan-ignore classConstant.deprecatedClass -@trigger_error(ClientErrorResponseException::class . ' is deprecated in 2.3.2 and will be removed in 3.0.0.', E_USER_DEPRECATED); +@trigger_error(ClientErrorResponseException::class . ' is deprecated in 2.4.0 and will be removed in 3.0.0.', E_USER_DEPRECATED); /** - * @deprecated in 2.3.2 and will be removed in 3.0.0. + * @deprecated in 2.4.0 and will be removed in 3.0.0. * * @phpstan-ignore class.extendsDeprecatedClass */ diff --git a/src/OpenSearch/Common/Exceptions/Conflict409Exception.php b/src/OpenSearch/Common/Exceptions/Conflict409Exception.php index c19532f8b..be8b6f833 100644 --- a/src/OpenSearch/Common/Exceptions/Conflict409Exception.php +++ b/src/OpenSearch/Common/Exceptions/Conflict409Exception.php @@ -22,10 +22,10 @@ namespace OpenSearch\Common\Exceptions; // @phpstan-ignore classConstant.deprecatedClass -@trigger_error(Conflict409Exception::class . ' is deprecated in 2.3.2 and will be removed in 3.0.0.', E_USER_DEPRECATED); +@trigger_error(Conflict409Exception::class . ' is deprecated in 2.4.0 and will be removed in 3.0.0.', E_USER_DEPRECATED); /** - * @deprecated in 2.3.2 and will be removed in 3.0.0. + * @deprecated in 2.4.0 and will be removed in 3.0.0. */ class Conflict409Exception extends \Exception implements OpenSearchException { diff --git a/src/OpenSearch/Common/Exceptions/Curl/CouldNotConnectToHost.php b/src/OpenSearch/Common/Exceptions/Curl/CouldNotConnectToHost.php index 92ff14fe5..4b7b700ad 100644 --- a/src/OpenSearch/Common/Exceptions/Curl/CouldNotConnectToHost.php +++ b/src/OpenSearch/Common/Exceptions/Curl/CouldNotConnectToHost.php @@ -26,10 +26,10 @@ use OpenSearch\Common\Exceptions\TransportException; // @phpstan-ignore classConstant.deprecatedClass -@trigger_error(CouldNotConnectToHost::class . ' is deprecated in 2.3.2 and will be removed in 3.0.0.', E_USER_DEPRECATED); +@trigger_error(CouldNotConnectToHost::class . ' is deprecated in 2.4.0 and will be removed in 3.0.0.', E_USER_DEPRECATED); /** - * @deprecated in 2.3.2 and will be removed in 3.0.0. + * @deprecated in 2.4.0 and will be removed in 3.0.0. * * @phpstan-ignore class.extendsDeprecatedClass */ diff --git a/src/OpenSearch/Common/Exceptions/Curl/CouldNotResolveHostException.php b/src/OpenSearch/Common/Exceptions/Curl/CouldNotResolveHostException.php index 276c19219..08c8653b4 100644 --- a/src/OpenSearch/Common/Exceptions/Curl/CouldNotResolveHostException.php +++ b/src/OpenSearch/Common/Exceptions/Curl/CouldNotResolveHostException.php @@ -25,10 +25,10 @@ use OpenSearch\Common\Exceptions\TransportException; // @phpstan-ignore classConstant.deprecatedClass -@trigger_error(CouldNotResolveHostException::class . ' is deprecated in 2.3.2 and will be removed in 3.0.0.', E_USER_DEPRECATED); +@trigger_error(CouldNotResolveHostException::class . ' is deprecated in 2.4.0 and will be removed in 3.0.0.', E_USER_DEPRECATED); /** - * @deprecated in 2.3.2 and will be removed in 3.0.0. + * @deprecated in 2.4.0 and will be removed in 3.0.0. * * @phpstan-ignore class.extendsDeprecatedClass */ diff --git a/src/OpenSearch/Common/Exceptions/Curl/OperationTimeoutException.php b/src/OpenSearch/Common/Exceptions/Curl/OperationTimeoutException.php index b984c93b8..0c3529ae0 100644 --- a/src/OpenSearch/Common/Exceptions/Curl/OperationTimeoutException.php +++ b/src/OpenSearch/Common/Exceptions/Curl/OperationTimeoutException.php @@ -25,10 +25,10 @@ use OpenSearch\Common\Exceptions\TransportException; // @phpstan-ignore classConstant.deprecatedClass -@trigger_error(OperationTimeoutException::class . ' is deprecated in 2.3.2 and will be removed in 3.0.0.', E_USER_DEPRECATED); +@trigger_error(OperationTimeoutException::class . ' is deprecated in 2.4.0 and will be removed in 3.0.0.', E_USER_DEPRECATED); /** - * @deprecated in 2.3.2 and will be removed in 3.0.0. + * @deprecated in 2.4.0 and will be removed in 3.0.0. * * @phpstan-ignore class.extendsDeprecatedClass */ diff --git a/src/OpenSearch/Common/Exceptions/Forbidden403Exception.php b/src/OpenSearch/Common/Exceptions/Forbidden403Exception.php index d0c9eba36..d116c9d63 100644 --- a/src/OpenSearch/Common/Exceptions/Forbidden403Exception.php +++ b/src/OpenSearch/Common/Exceptions/Forbidden403Exception.php @@ -24,10 +24,10 @@ use OpenSearch\Exception\ForbiddenHttpException; // @phpstan-ignore classConstant.deprecatedClass -@trigger_error(Forbidden403Exception::class . ' is deprecated in 2.3.2 and will be removed in 3.0.0. Use \OpenSearch\Exception\ForbiddenHttpException instead', E_USER_DEPRECATED); +@trigger_error(Forbidden403Exception::class . ' is deprecated in 2.4.0 and will be removed in 3.0.0. Use \OpenSearch\Exception\ForbiddenHttpException instead', E_USER_DEPRECATED); /** - * @deprecated in 2.3.2 and will be removed in 3.0.0. + * @deprecated in 2.4.0 and will be removed in 3.0.0. * * @see \OpenSearch\Exception\ForbiddenHttpException */ diff --git a/src/OpenSearch/Common/Exceptions/InvalidArgumentException.php b/src/OpenSearch/Common/Exceptions/InvalidArgumentException.php index 467c0ae74..a5920df2b 100644 --- a/src/OpenSearch/Common/Exceptions/InvalidArgumentException.php +++ b/src/OpenSearch/Common/Exceptions/InvalidArgumentException.php @@ -22,10 +22,10 @@ namespace OpenSearch\Common\Exceptions; // @phpstan-ignore classConstant.deprecatedClass -@trigger_error(InvalidArgumentException::class . ' is deprecated in 2.3.2 and will be removed in 3.0.0.', E_USER_DEPRECATED); +@trigger_error(InvalidArgumentException::class . ' is deprecated in 2.4.0 and will be removed in 3.0.0.', E_USER_DEPRECATED); /** - * @deprecated in 2.3.2 and will be removed in 3.0.0. + * @deprecated in 2.4.0 and will be removed in 3.0.0. */ class InvalidArgumentException extends \InvalidArgumentException implements OpenSearchException { diff --git a/src/OpenSearch/Common/Exceptions/MaxRetriesException.php b/src/OpenSearch/Common/Exceptions/MaxRetriesException.php index 39c077b49..971dd94b8 100644 --- a/src/OpenSearch/Common/Exceptions/MaxRetriesException.php +++ b/src/OpenSearch/Common/Exceptions/MaxRetriesException.php @@ -22,10 +22,10 @@ namespace OpenSearch\Common\Exceptions; // @phpstan-ignore classConstant.deprecatedClass -@trigger_error(MaxRetriesException::class . ' is deprecated in 2.3.2 and will be removed in 3.0.0.', E_USER_DEPRECATED); +@trigger_error(MaxRetriesException::class . ' is deprecated in 2.4.0 and will be removed in 3.0.0.', E_USER_DEPRECATED); /** - * @deprecated in 2.3.2 and will be removed in 3.0.0. + * @deprecated in 2.4.0 and will be removed in 3.0.0. * * @phpstan-ignore class.extendsDeprecatedClass */ diff --git a/src/OpenSearch/Common/Exceptions/Missing404Exception.php b/src/OpenSearch/Common/Exceptions/Missing404Exception.php index 1fe363998..8a70085d6 100644 --- a/src/OpenSearch/Common/Exceptions/Missing404Exception.php +++ b/src/OpenSearch/Common/Exceptions/Missing404Exception.php @@ -25,12 +25,12 @@ @trigger_error( // @phpstan-ignore classConstant.deprecatedClass - Missing404Exception::class . ' is deprecated in 2.3.2 and will be removed in 3.0.0. Use \OpenSearch\Exception\NotFoundHttpException instead.', + Missing404Exception::class . ' is deprecated in 2.4.0 and will be removed in 3.0.0. Use \OpenSearch\Exception\NotFoundHttpException instead.', E_USER_DEPRECATED ); /** - * @deprecated in 2.3.2 and will be removed in 3.0.0. + * @deprecated in 2.4.0 and will be removed in 3.0.0. * * @see \OpenSearch\Exception\NotFoundHttpException */ diff --git a/src/OpenSearch/Common/Exceptions/NoDocumentsToGetException.php b/src/OpenSearch/Common/Exceptions/NoDocumentsToGetException.php index 04b9cc57b..034c594a5 100644 --- a/src/OpenSearch/Common/Exceptions/NoDocumentsToGetException.php +++ b/src/OpenSearch/Common/Exceptions/NoDocumentsToGetException.php @@ -23,12 +23,12 @@ @trigger_error( // @phpstan-ignore classConstant.deprecatedClass - NoDocumentsToGetException::class . ' is deprecated in 2.3.2 and will be removed in 3.0.0. Use \OpenSearch\Exception\NoDocumentsToGetException instead.', + NoDocumentsToGetException::class . ' is deprecated in 2.4.0 and will be removed in 3.0.0. Use \OpenSearch\Exception\NoDocumentsToGetException instead.', E_USER_DEPRECATED ); /** - * @deprecated in 2.3.2 and will be removed in 3.0.0. Use \OpenSearch\Exception\NoDocumentsToGetException instead. + * @deprecated in 2.4.0 and will be removed in 3.0.0. Use \OpenSearch\Exception\NoDocumentsToGetException instead. * * @see \OpenSearch\Exception\ScriptLangNotSupportedException */ diff --git a/src/OpenSearch/Common/Exceptions/NoNodesAvailableException.php b/src/OpenSearch/Common/Exceptions/NoNodesAvailableException.php index c382ef341..85b85fc99 100644 --- a/src/OpenSearch/Common/Exceptions/NoNodesAvailableException.php +++ b/src/OpenSearch/Common/Exceptions/NoNodesAvailableException.php @@ -22,10 +22,10 @@ namespace OpenSearch\Common\Exceptions; // @phpstan-ignore classConstant.deprecatedClass -@trigger_error(NoNodesAvailableException::class . ' is deprecated in 2.3.2 and will be removed in 3.0.0.', E_USER_DEPRECATED); +@trigger_error(NoNodesAvailableException::class . ' is deprecated in 2.4.0 and will be removed in 3.0.0.', E_USER_DEPRECATED); /** - * @deprecated in 2.3.2 and will be removed in 3.0.0. + * @deprecated in 2.4.0 and will be removed in 3.0.0. * * @phpstan-ignore class.extendsDeprecatedClass */ diff --git a/src/OpenSearch/Common/Exceptions/NoShardAvailableException.php b/src/OpenSearch/Common/Exceptions/NoShardAvailableException.php index a3b079f47..9825d1693 100644 --- a/src/OpenSearch/Common/Exceptions/NoShardAvailableException.php +++ b/src/OpenSearch/Common/Exceptions/NoShardAvailableException.php @@ -22,10 +22,10 @@ namespace OpenSearch\Common\Exceptions; // @phpstan-ignore classConstant.deprecatedClass -@trigger_error(NoShardAvailableException::class . ' is deprecated in 2.3.2 and will be removed in 3.0.0. Use \OpenSearch\Exception\NoShardAvailableException instead.', E_USER_DEPRECATED); +@trigger_error(NoShardAvailableException::class . ' is deprecated in 2.4.0 and will be removed in 3.0.0. Use \OpenSearch\Exception\NoShardAvailableException instead.', E_USER_DEPRECATED); /** - * @deprecated in 2.3.2 and will be removed in 3.0.0. Use \OpenSearch\Exception\NoShardAvailableException instead. + * @deprecated in 2.4.0 and will be removed in 3.0.0. Use \OpenSearch\Exception\NoShardAvailableException instead. * * @see \OpenSearch\Exception\NoShardAvailableException */ diff --git a/src/OpenSearch/Common/Exceptions/OpenSearchException.php b/src/OpenSearch/Common/Exceptions/OpenSearchException.php index 48095b63e..5d2e21789 100644 --- a/src/OpenSearch/Common/Exceptions/OpenSearchException.php +++ b/src/OpenSearch/Common/Exceptions/OpenSearchException.php @@ -24,10 +24,10 @@ use OpenSearch\Exception\OpenSearchExceptionInterface; // @phpstan-ignore classConstant.deprecatedClass -@trigger_error(NoNodesAvailableException::class . ' is deprecated in 2.3.2 and will be removed in 3.0.0.', E_USER_DEPRECATED); +@trigger_error(NoNodesAvailableException::class . ' is deprecated in 2.4.0 and will be removed in 3.0.0.', E_USER_DEPRECATED); /** - * @deprecated in 2.3.2 and will be removed in 3.0.0. + * @deprecated in 2.4.0 and will be removed in 3.0.0. */ interface OpenSearchException extends OpenSearchExceptionInterface { diff --git a/src/OpenSearch/Common/Exceptions/RequestTimeout408Exception.php b/src/OpenSearch/Common/Exceptions/RequestTimeout408Exception.php index e5cd8e75d..5e00074fb 100644 --- a/src/OpenSearch/Common/Exceptions/RequestTimeout408Exception.php +++ b/src/OpenSearch/Common/Exceptions/RequestTimeout408Exception.php @@ -22,10 +22,10 @@ namespace OpenSearch\Common\Exceptions; // @phpstan-ignore classConstant.deprecatedClass -@trigger_error(RequestTimeout408Exception::class . ' is deprecated in 2.3.2 and will be removed in 3.0.0.', E_USER_DEPRECATED); +@trigger_error(RequestTimeout408Exception::class . ' is deprecated in 2.4.0 and will be removed in 3.0.0.', E_USER_DEPRECATED); /** - * @deprecated in 2.3.2 and will be removed in 3.0.0. + * @deprecated in 2.4.0 and will be removed in 3.0.0. * * @phpstan-ignore class.extendsDeprecatedClass */ diff --git a/src/OpenSearch/Common/Exceptions/RoutingMissingException.php b/src/OpenSearch/Common/Exceptions/RoutingMissingException.php index 2dc2f26f2..68f292368 100644 --- a/src/OpenSearch/Common/Exceptions/RoutingMissingException.php +++ b/src/OpenSearch/Common/Exceptions/RoutingMissingException.php @@ -22,10 +22,10 @@ namespace OpenSearch\Common\Exceptions; // @phpstan-ignore classConstant.deprecatedClass -@trigger_error(RoutingMissingException::class . ' is deprecated in 2.3.2 and will be removed in 3.0.0. Use \OpenSearch\Exception\RoutingMissingException instead.', E_USER_DEPRECATED); +@trigger_error(RoutingMissingException::class . ' is deprecated in 2.4.0 and will be removed in 3.0.0. Use \OpenSearch\Exception\RoutingMissingException instead.', E_USER_DEPRECATED); /** - * @deprecated in 2.3.2 and will be removed in 3.0.0. Use OpenSearch\Exception\UnauthorizedHttpException instead. + * @deprecated in 2.4.0 and will be removed in 3.0.0. Use OpenSearch\Exception\UnauthorizedHttpException instead. * * @see \OpenSearch\Exception\ScriptLangNotSupportedException */ diff --git a/src/OpenSearch/Common/Exceptions/ScriptLangNotSupportedException.php b/src/OpenSearch/Common/Exceptions/ScriptLangNotSupportedException.php index 800292182..2975c78be 100644 --- a/src/OpenSearch/Common/Exceptions/ScriptLangNotSupportedException.php +++ b/src/OpenSearch/Common/Exceptions/ScriptLangNotSupportedException.php @@ -22,10 +22,10 @@ namespace OpenSearch\Common\Exceptions; // @phpstan-ignore classConstant.deprecatedClass -@trigger_error(ScriptLangNotSupportedException::class . ' is deprecated in 2.3.2 and will be removed in 3.0.0. Use OpenSearch\Exception\ScriptLangNotSupportedException instead.', E_USER_DEPRECATED); +@trigger_error(ScriptLangNotSupportedException::class . ' is deprecated in 2.4.0 and will be removed in 3.0.0. Use OpenSearch\Exception\ScriptLangNotSupportedException instead.', E_USER_DEPRECATED); /** - * @deprecated in 2.3.2 and will be removed in 3.0.0. Use OpenSearch\Exception\UnauthorizedHttpException instead. + * @deprecated in 2.4.0 and will be removed in 3.0.0. Use OpenSearch\Exception\UnauthorizedHttpException instead. * * @see \OpenSearch\Exception\ScriptLangNotSupportedException */ diff --git a/src/OpenSearch/Common/Exceptions/ServerErrorResponseException.php b/src/OpenSearch/Common/Exceptions/ServerErrorResponseException.php index b59aeb7c6..9016b9ef5 100644 --- a/src/OpenSearch/Common/Exceptions/ServerErrorResponseException.php +++ b/src/OpenSearch/Common/Exceptions/ServerErrorResponseException.php @@ -22,10 +22,10 @@ namespace OpenSearch\Common\Exceptions; // @phpstan-ignore classConstant.deprecatedClass -@trigger_error(RequestTimeout408Exception::class . ' is deprecated in 2.3.2 and will be removed in 3.0.0.', E_USER_DEPRECATED); +@trigger_error(RequestTimeout408Exception::class . ' is deprecated in 2.4.0 and will be removed in 3.0.0.', E_USER_DEPRECATED); /** - * @deprecated in 2.3.2 and will be removed in 3.0.0. + * @deprecated in 2.4.0 and will be removed in 3.0.0. * * @phpstan-ignore class.extendsDeprecatedClass */ diff --git a/src/OpenSearch/Common/Exceptions/TransportException.php b/src/OpenSearch/Common/Exceptions/TransportException.php index 039e58096..882790866 100644 --- a/src/OpenSearch/Common/Exceptions/TransportException.php +++ b/src/OpenSearch/Common/Exceptions/TransportException.php @@ -22,10 +22,10 @@ namespace OpenSearch\Common\Exceptions; // @phpstan-ignore classConstant.deprecatedClass -@trigger_error(TransportException::class . ' is deprecated in 2.3.2 and will be removed in 3.0.0.', E_USER_DEPRECATED); +@trigger_error(TransportException::class . ' is deprecated in 2.4.0 and will be removed in 3.0.0.', E_USER_DEPRECATED); /** - * @deprecated in 2.3.2 and will be removed in 3.0.0. + * @deprecated in 2.4.0 and will be removed in 3.0.0. */ class TransportException extends \Exception implements OpenSearchException { diff --git a/src/OpenSearch/Common/Exceptions/Unauthorized401Exception.php b/src/OpenSearch/Common/Exceptions/Unauthorized401Exception.php index 18dbb00a1..a00ec0135 100644 --- a/src/OpenSearch/Common/Exceptions/Unauthorized401Exception.php +++ b/src/OpenSearch/Common/Exceptions/Unauthorized401Exception.php @@ -24,10 +24,10 @@ use OpenSearch\Exception\UnauthorizedHttpException; // @phpstan-ignore classConstant.deprecatedClass -@trigger_error(Unauthorized401Exception::class . ' is deprecated in 2.3.2 and will be removed in 3.0.0. Use OpenSearch\Exception\UnauthorizedHttpException instead.', E_USER_DEPRECATED); +@trigger_error(Unauthorized401Exception::class . ' is deprecated in 2.4.0 and will be removed in 3.0.0. Use OpenSearch\Exception\UnauthorizedHttpException instead.', E_USER_DEPRECATED); /** - * @deprecated in 2.3.2 and will be removed in 3.0.0. Use OpenSearch\Exception\UnauthorizedHttpException instead. + * @deprecated in 2.4.0 and will be removed in 3.0.0. Use OpenSearch\Exception\UnauthorizedHttpException instead. * * @see \OpenSearch\Exception\UnauthorizedHttpException */ diff --git a/src/OpenSearch/ConnectionPool/AbstractConnectionPool.php b/src/OpenSearch/ConnectionPool/AbstractConnectionPool.php index d6e21e3c6..a27e0fe0c 100644 --- a/src/OpenSearch/ConnectionPool/AbstractConnectionPool.php +++ b/src/OpenSearch/ConnectionPool/AbstractConnectionPool.php @@ -27,10 +27,10 @@ use OpenSearch\Connections\ConnectionInterface; // @phpstan-ignore classConstant.deprecatedClass -@trigger_error(AbstractConnectionPool::class . ' is deprecated in 2.3.2 and will be removed in 3.0.0.', E_USER_DEPRECATED); +@trigger_error(AbstractConnectionPool::class . ' is deprecated in 2.4.0 and will be removed in 3.0.0.', E_USER_DEPRECATED); /** - * @deprecated in 2.3.2 and will be removed in 3.0.0. + * @deprecated in 2.4.0 and will be removed in 3.0.0. */ abstract class AbstractConnectionPool implements ConnectionPoolInterface { diff --git a/src/OpenSearch/ConnectionPool/ConnectionPoolInterface.php b/src/OpenSearch/ConnectionPool/ConnectionPoolInterface.php index 22456728b..542c8b068 100644 --- a/src/OpenSearch/ConnectionPool/ConnectionPoolInterface.php +++ b/src/OpenSearch/ConnectionPool/ConnectionPoolInterface.php @@ -24,10 +24,10 @@ use OpenSearch\Connections\ConnectionInterface; // @phpstan-ignore classConstant.deprecatedInterface -@trigger_error(ConnectionPoolInterface::class . ' is deprecated in 2.3.2 and will be removed in 3.0.0.', E_USER_DEPRECATED); +@trigger_error(ConnectionPoolInterface::class . ' is deprecated in 2.4.0 and will be removed in 3.0.0.', E_USER_DEPRECATED); /** - * @deprecated in 2.3.2 and will be removed in 3.0.0. + * @deprecated in 2.4.0 and will be removed in 3.0.0. */ interface ConnectionPoolInterface { diff --git a/src/OpenSearch/ConnectionPool/Selectors/RandomSelector.php b/src/OpenSearch/ConnectionPool/Selectors/RandomSelector.php index edf360a22..6987bf91c 100644 --- a/src/OpenSearch/ConnectionPool/Selectors/RandomSelector.php +++ b/src/OpenSearch/ConnectionPool/Selectors/RandomSelector.php @@ -24,10 +24,10 @@ use OpenSearch\Connections\ConnectionInterface; // @phpstan-ignore classConstant.deprecatedClass -@trigger_error(RandomSelector::class . ' is deprecated in 2.3.2 and will be removed in 3.0.0.', E_USER_DEPRECATED); +@trigger_error(RandomSelector::class . ' is deprecated in 2.4.0 and will be removed in 3.0.0.', E_USER_DEPRECATED); /** - * @deprecated in 2.3.2 and will be removed in 3.0.0. + * @deprecated in 2.4.0 and will be removed in 3.0.0. */ class RandomSelector implements SelectorInterface { diff --git a/src/OpenSearch/ConnectionPool/Selectors/RoundRobinSelector.php b/src/OpenSearch/ConnectionPool/Selectors/RoundRobinSelector.php index 1893f0979..96fff4535 100644 --- a/src/OpenSearch/ConnectionPool/Selectors/RoundRobinSelector.php +++ b/src/OpenSearch/ConnectionPool/Selectors/RoundRobinSelector.php @@ -24,10 +24,10 @@ use OpenSearch\Connections\ConnectionInterface; // @phpstan-ignore classConstant.deprecatedClass -@trigger_error(RoundRobinSelector::class . ' is deprecated in 2.3.2 and will be removed in 3.0.0.', E_USER_DEPRECATED); +@trigger_error(RoundRobinSelector::class . ' is deprecated in 2.4.0 and will be removed in 3.0.0.', E_USER_DEPRECATED); /** - * @deprecated in 2.3.2 and will be removed in 3.0.0. + * @deprecated in 2.4.0 and will be removed in 3.0.0. */ class RoundRobinSelector implements SelectorInterface { diff --git a/src/OpenSearch/ConnectionPool/Selectors/SelectorInterface.php b/src/OpenSearch/ConnectionPool/Selectors/SelectorInterface.php index 0d8386d40..37a654ac3 100644 --- a/src/OpenSearch/ConnectionPool/Selectors/SelectorInterface.php +++ b/src/OpenSearch/ConnectionPool/Selectors/SelectorInterface.php @@ -24,10 +24,10 @@ use OpenSearch\Connections\ConnectionInterface; // @phpstan-ignore classConstant.deprecatedInterface -@trigger_error(SelectorInterface::class . ' is deprecated in 2.3.2 and will be removed in 3.0.0.', E_USER_DEPRECATED); +@trigger_error(SelectorInterface::class . ' is deprecated in 2.4.0 and will be removed in 3.0.0.', E_USER_DEPRECATED); /** - * @deprecated in 2.3.2 and will be removed in 3.0.0. + * @deprecated in 2.4.0 and will be removed in 3.0.0. */ interface SelectorInterface { diff --git a/src/OpenSearch/ConnectionPool/Selectors/StickyRoundRobinSelector.php b/src/OpenSearch/ConnectionPool/Selectors/StickyRoundRobinSelector.php index 3de85d708..78a704b51 100644 --- a/src/OpenSearch/ConnectionPool/Selectors/StickyRoundRobinSelector.php +++ b/src/OpenSearch/ConnectionPool/Selectors/StickyRoundRobinSelector.php @@ -24,10 +24,10 @@ use OpenSearch\Connections\ConnectionInterface; // @phpstan-ignore classConstant.deprecatedClass -@trigger_error(StickyRoundRobinSelector::class . ' is deprecated in 2.3.2 and will be removed in 3.0.0.', E_USER_DEPRECATED); +@trigger_error(StickyRoundRobinSelector::class . ' is deprecated in 2.4.0 and will be removed in 3.0.0.', E_USER_DEPRECATED); /** - * @deprecated in 2.3.2 and will be removed in 3.0.0. + * @deprecated in 2.4.0 and will be removed in 3.0.0. */ class StickyRoundRobinSelector implements SelectorInterface { diff --git a/src/OpenSearch/ConnectionPool/SimpleConnectionPool.php b/src/OpenSearch/ConnectionPool/SimpleConnectionPool.php index bc57f0105..fe59830d2 100644 --- a/src/OpenSearch/ConnectionPool/SimpleConnectionPool.php +++ b/src/OpenSearch/ConnectionPool/SimpleConnectionPool.php @@ -26,10 +26,10 @@ use OpenSearch\Connections\ConnectionInterface; // @phpstan-ignore classConstant.deprecatedClass -@trigger_error(SimpleConnectionPool::class . ' is deprecated in 2.3.2 and will be removed in 3.0.0.', E_USER_DEPRECATED); +@trigger_error(SimpleConnectionPool::class . ' is deprecated in 2.4.0 and will be removed in 3.0.0.', E_USER_DEPRECATED); /** - * @deprecated in 2.3.2 and will be removed in 3.0.0. + * @deprecated in 2.4.0 and will be removed in 3.0.0. * * @phpstan-ignore class.extendsDeprecatedClass */ diff --git a/src/OpenSearch/ConnectionPool/SniffingConnectionPool.php b/src/OpenSearch/ConnectionPool/SniffingConnectionPool.php index 57d42e7a3..5c5d99da9 100644 --- a/src/OpenSearch/ConnectionPool/SniffingConnectionPool.php +++ b/src/OpenSearch/ConnectionPool/SniffingConnectionPool.php @@ -29,10 +29,10 @@ use OpenSearch\Connections\ConnectionInterface; // @phpstan-ignore classConstant.deprecatedClass -@trigger_error(SniffingConnectionPool::class . ' is deprecated in 2.3.2 and will be removed in 3.0.0.', E_USER_DEPRECATED); +@trigger_error(SniffingConnectionPool::class . ' is deprecated in 2.4.0 and will be removed in 3.0.0.', E_USER_DEPRECATED); /** - * @deprecated in 2.3.2 and will be removed in 3.0.0. + * @deprecated in 2.4.0 and will be removed in 3.0.0. * * @phpstan-ignore class.extendsDeprecatedClass */ diff --git a/src/OpenSearch/ConnectionPool/StaticConnectionPool.php b/src/OpenSearch/ConnectionPool/StaticConnectionPool.php index 942a38004..9aa740ded 100644 --- a/src/OpenSearch/ConnectionPool/StaticConnectionPool.php +++ b/src/OpenSearch/ConnectionPool/StaticConnectionPool.php @@ -28,10 +28,10 @@ use OpenSearch\Connections\ConnectionInterface; // @phpstan-ignore classConstant.deprecatedClass -@trigger_error(StaticConnectionPool::class . ' is deprecated in 2.3.2 and will be removed in 3.0.0.', E_USER_DEPRECATED); +@trigger_error(StaticConnectionPool::class . ' is deprecated in 2.4.0 and will be removed in 3.0.0.', E_USER_DEPRECATED); /** - * @deprecated in 2.3.2 and will be removed in 3.0.0. + * @deprecated in 2.4.0 and will be removed in 3.0.0. * * @phpstan-ignore class.extendsDeprecatedClass */ diff --git a/src/OpenSearch/ConnectionPool/StaticNoPingConnectionPool.php b/src/OpenSearch/ConnectionPool/StaticNoPingConnectionPool.php index 1646e475b..42d634c7b 100644 --- a/src/OpenSearch/ConnectionPool/StaticNoPingConnectionPool.php +++ b/src/OpenSearch/ConnectionPool/StaticNoPingConnectionPool.php @@ -28,10 +28,10 @@ use OpenSearch\Connections\ConnectionInterface; // @phpstan-ignore classConstant.deprecatedClass -@trigger_error(StaticNoPingConnectionPool::class . ' is deprecated in 2.3.2 and will be removed in 3.0.0.', E_USER_DEPRECATED); +@trigger_error(StaticNoPingConnectionPool::class . ' is deprecated in 2.4.0 and will be removed in 3.0.0.', E_USER_DEPRECATED); /** - * @deprecated in 2.3.2 and will be removed in 3.0.0. + * @deprecated in 2.4.0 and will be removed in 3.0.0. * * @phpstan-ignore class.extendsDeprecatedClass */ diff --git a/src/OpenSearch/Connections/Connection.php b/src/OpenSearch/Connections/Connection.php index f99016c53..7deac7583 100644 --- a/src/OpenSearch/Connections/Connection.php +++ b/src/OpenSearch/Connections/Connection.php @@ -48,10 +48,10 @@ use Psr\Log\LoggerInterface; // @phpstan-ignore classConstant.deprecatedClass -@trigger_error(Connection::class . ' is deprecated in 2.3.2 and will be removed in 3.0.0.', E_USER_DEPRECATED); +@trigger_error(Connection::class . ' is deprecated in 2.4.0 and will be removed in 3.0.0.', E_USER_DEPRECATED); /** - * @deprecated in 2.3.2 and will be removed in 3.0.0. + * @deprecated in 2.4.0 and will be removed in 3.0.0. */ class Connection implements ConnectionInterface { diff --git a/src/OpenSearch/Connections/ConnectionFactory.php b/src/OpenSearch/Connections/ConnectionFactory.php index c60cfdd60..7aff2ccc7 100644 --- a/src/OpenSearch/Connections/ConnectionFactory.php +++ b/src/OpenSearch/Connections/ConnectionFactory.php @@ -25,10 +25,10 @@ use Psr\Log\LoggerInterface; // @phpstan-ignore classConstant.deprecatedClass -@trigger_error(ConnectionFactory::class . ' is deprecated in 2.3.2 and will be removed in 3.0.0.', E_USER_DEPRECATED); +@trigger_error(ConnectionFactory::class . ' is deprecated in 2.4.0 and will be removed in 3.0.0.', E_USER_DEPRECATED); /** - * @deprecated in 2.3.2 and will be removed in 3.0.0. + * @deprecated in 2.4.0 and will be removed in 3.0.0. */ class ConnectionFactory implements ConnectionFactoryInterface { diff --git a/src/OpenSearch/Connections/ConnectionFactoryInterface.php b/src/OpenSearch/Connections/ConnectionFactoryInterface.php index 67ffc6681..97b4f0470 100644 --- a/src/OpenSearch/Connections/ConnectionFactoryInterface.php +++ b/src/OpenSearch/Connections/ConnectionFactoryInterface.php @@ -22,10 +22,10 @@ namespace OpenSearch\Connections; // @phpstan-ignore classConstant.deprecatedInterface -@trigger_error(ConnectionFactoryInterface::class . ' is deprecated in 2.3.2 and will be removed in 3.0.0.', E_USER_DEPRECATED); +@trigger_error(ConnectionFactoryInterface::class . ' is deprecated in 2.4.0 and will be removed in 3.0.0.', E_USER_DEPRECATED); /** - * @deprecated in 2.3.2 and will be removed in 3.0.0. + * @deprecated in 2.4.0 and will be removed in 3.0.0. */ interface ConnectionFactoryInterface { diff --git a/src/OpenSearch/Connections/ConnectionInterface.php b/src/OpenSearch/Connections/ConnectionInterface.php index e905389f7..417394a37 100644 --- a/src/OpenSearch/Connections/ConnectionInterface.php +++ b/src/OpenSearch/Connections/ConnectionInterface.php @@ -24,10 +24,10 @@ use OpenSearch\Transport; // @phpstan-ignore classConstant.deprecatedInterface -@trigger_error(ConnectionInterface::class . ' is deprecated in 2.3.2 and will be removed in 3.0.0.', E_USER_DEPRECATED); +@trigger_error(ConnectionInterface::class . ' is deprecated in 2.4.0 and will be removed in 3.0.0.', E_USER_DEPRECATED); /** - * @deprecated in 2.3.2 and will be removed in 3.0.0. + * @deprecated in 2.4.0 and will be removed in 3.0.0. */ interface ConnectionInterface { diff --git a/src/OpenSearch/Handlers/SigV4Handler.php b/src/OpenSearch/Handlers/SigV4Handler.php index 3f03a46cd..70bd3bbf2 100644 --- a/src/OpenSearch/Handlers/SigV4Handler.php +++ b/src/OpenSearch/Handlers/SigV4Handler.php @@ -14,12 +14,12 @@ use RuntimeException; // @phpstan-ignore classConstant.deprecatedClass -@trigger_error(SigV4Handler::class . ' is deprecated in 2.3.2 and will be removed in 3.0.0.', E_USER_DEPRECATED); +@trigger_error(SigV4Handler::class . ' is deprecated in 2.4.0 and will be removed in 3.0.0.', E_USER_DEPRECATED); /** * @phpstan-type RingPhpRequest array{http_method: string, scheme: string, uri: string, query_string?: string, version?: string, headers: array>, body: string|resource|null, client?: array} * - * @deprecated in 2.3.2 and will be removed in 3.0.0. Use \OpenSearch\Aws\SigV4RequestFactory instead. + * @deprecated in 2.4.0 and will be removed in 3.0.0. Use \OpenSearch\Aws\SigV4RequestFactory instead. */ class SigV4Handler { diff --git a/src/OpenSearch/LegacyTransportWrapper.php b/src/OpenSearch/LegacyTransportWrapper.php index 62550297f..7335a4d8f 100644 --- a/src/OpenSearch/LegacyTransportWrapper.php +++ b/src/OpenSearch/LegacyTransportWrapper.php @@ -10,7 +10,7 @@ /** * Transport that wraps the legacy transport. * - * @deprecated in 2.3.2 and will be removed in 3.0.0. Use PsrTransport instead. + * @deprecated in 2.4.0 and will be removed in 3.0.0. Use PsrTransport instead. */ class LegacyTransportWrapper implements TransportInterface { diff --git a/src/OpenSearch/Namespaces/AbstractNamespace.php b/src/OpenSearch/Namespaces/AbstractNamespace.php index eafad95de..b20f17aa7 100644 --- a/src/OpenSearch/Namespaces/AbstractNamespace.php +++ b/src/OpenSearch/Namespaces/AbstractNamespace.php @@ -33,7 +33,7 @@ abstract class AbstractNamespace /** * @var \OpenSearch\Transport * - * @deprecated in 2.3.2 and will be removed in 3.0.0. Use $httpTransport property instead. + * @deprecated in 2.4.0 and will be removed in 3.0.0. Use $httpTransport property instead. */ protected $transport; @@ -44,7 +44,7 @@ abstract class AbstractNamespace /** * @var callable * - * @deprecated in 2.3.2 and will be removed in 3.0.0. Use $endpointFactory property instead. + * @deprecated in 2.4.0 and will be removed in 3.0.0. Use $endpointFactory property instead. */ protected $endpoints; @@ -54,7 +54,7 @@ abstract class AbstractNamespace public function __construct(TransportInterface|Transport $transport, callable|EndpointFactoryInterface $endpointFactory) { if (!$transport instanceof TransportInterface) { - @trigger_error('Passing an instance of \OpenSearch\Transport to ' . __METHOD__ . '() is deprecated in 2.3.2 and will be removed in 3.0.0. Pass an instance of \OpenSearch\TransportInterface instead.', E_USER_DEPRECATED); + @trigger_error('Passing an instance of \OpenSearch\Transport to ' . __METHOD__ . '() is deprecated in 2.4.0 and will be removed in 3.0.0. Pass an instance of \OpenSearch\TransportInterface instead.', E_USER_DEPRECATED); // @phpstan-ignore property.deprecated $this->transport = $transport; // @phpstan-ignore new.deprecated @@ -63,13 +63,13 @@ public function __construct(TransportInterface|Transport $transport, callable|En $this->httpTransport = $transport; } if (is_callable($endpointFactory)) { - @trigger_error('Passing a callable as $endpointFactory param to ' . __METHOD__ . '() is deprecated in 2.3.2 and will be removed in 3.0.0. Pass an instance of \OpenSearch\EndpointFactoryInterface instead.', E_USER_DEPRECATED); + @trigger_error('Passing a callable as $endpointFactory param to ' . __METHOD__ . '() is deprecated in 2.4.0 and will be removed in 3.0.0. Pass an instance of \OpenSearch\EndpointFactoryInterface instead.', E_USER_DEPRECATED); $endpoints = $endpointFactory; // @phpstan-ignore new.deprecated $endpointFactory = new LegacyEndpointFactory($endpointFactory); } else { $endpoints = function ($c) use ($endpointFactory) { - @trigger_error('The $endpoints property is deprecated in 2.3.2 and will be removed in 3.0.0.', E_USER_DEPRECATED); + @trigger_error('The $endpoints property is deprecated in 2.4.0 and will be removed in 3.0.0.', E_USER_DEPRECATED); return $endpointFactory->getEndpoint('OpenSearch\\Endpoints\\' . $c); }; } diff --git a/src/OpenSearch/Namespaces/BooleanRequestWrapper.php b/src/OpenSearch/Namespaces/BooleanRequestWrapper.php index e5a45aa22..575574e3f 100644 --- a/src/OpenSearch/Namespaces/BooleanRequestWrapper.php +++ b/src/OpenSearch/Namespaces/BooleanRequestWrapper.php @@ -63,12 +63,12 @@ public static function sendRequest(AbstractEndpoint $endpoint, TransportInterfac * @throws Missing404Exception * @throws RoutingMissingException * - * @deprecated in 2.3.2 and will be removed in 3.0.0. Use \OpenSearch\Namespaces\BooleanRequestWrapper::sendRequest() instead. + * @deprecated in 2.4.0 and will be removed in 3.0.0. Use \OpenSearch\Namespaces\BooleanRequestWrapper::sendRequest() instead. */ public static function performRequest(AbstractEndpoint $endpoint, Transport $transport) { @trigger_error( - __METHOD__ . '() is deprecated in 2.3.2 and will be removed in 3.0.0. Use \OpenSearch\Namespaces\BooleanRequestWrapper::sendRequest() instead.' + __METHOD__ . '() is deprecated in 2.4.0 and will be removed in 3.0.0. Use \OpenSearch\Namespaces\BooleanRequestWrapper::sendRequest() instead.' ); try { $response = $transport->performRequest( diff --git a/src/OpenSearch/Transport.php b/src/OpenSearch/Transport.php index 87628a60e..c4061ec4d 100644 --- a/src/OpenSearch/Transport.php +++ b/src/OpenSearch/Transport.php @@ -28,10 +28,10 @@ use Psr\Log\LoggerInterface; // @phpstan-ignore classConstant.deprecatedClass -@trigger_error(Transport::class . ' is deprecated in 2.3.2 and will be removed in 3.0.0.', E_USER_DEPRECATED); +@trigger_error(Transport::class . ' is deprecated in 2.4.0 and will be removed in 3.0.0.', E_USER_DEPRECATED); /** - * @deprecated in 2.3.2 and will be removed in 3.0.0. + * @deprecated in 2.4.0 and will be removed in 3.0.0. */ class Transport { diff --git a/tests/ClientBuilderTest.php b/tests/ClientBuilderTest.php index e575f65a5..5d33069eb 100644 --- a/tests/ClientBuilderTest.php +++ b/tests/ClientBuilderTest.php @@ -28,12 +28,12 @@ use PHPUnit\Framework\TestCase; // @phpstan-ignore classConstant.deprecatedClass -@trigger_error(ClientBuilderTest::class . ' is deprecated in 2.3.2 and will be removed in 3.0.0.', E_USER_DEPRECATED); +@trigger_error(ClientBuilderTest::class . ' is deprecated in 2.4.0 and will be removed in 3.0.0.', E_USER_DEPRECATED); /** * @group legacy * - * @deprecated in 2.3.2 and will be removed in 3.0.0. + * @deprecated in 2.4.0 and will be removed in 3.0.0. */ class ClientBuilderTest extends TestCase { diff --git a/tests/ConnectionPool/ConnectionFactoryTest.php b/tests/ConnectionPool/ConnectionFactoryTest.php index 6aff5f059..d360a3d1c 100644 --- a/tests/ConnectionPool/ConnectionFactoryTest.php +++ b/tests/ConnectionPool/ConnectionFactoryTest.php @@ -21,10 +21,10 @@ use Psr\Log\NullLogger; // @phpstan-ignore classConstant.deprecatedClass -@trigger_error(ConnectionFactoryTest::class . ' is deprecated in 2.3.2 and will be removed in 3.0.0.', E_USER_DEPRECATED); +@trigger_error(ConnectionFactoryTest::class . ' is deprecated in 2.4.0 and will be removed in 3.0.0.', E_USER_DEPRECATED); /** - * @deprecated in 2.3.2 and will be removed in 3.0.0. + * @deprecated in 2.4.0 and will be removed in 3.0.0. */ class ConnectionFactoryTest extends TestCase { diff --git a/tests/ConnectionPool/Selectors/RoundRobinSelectorTest.php b/tests/ConnectionPool/Selectors/RoundRobinSelectorTest.php index 6b8b0d96a..8fa291911 100644 --- a/tests/ConnectionPool/Selectors/RoundRobinSelectorTest.php +++ b/tests/ConnectionPool/Selectors/RoundRobinSelectorTest.php @@ -25,14 +25,14 @@ use OpenSearch\Connections\ConnectionInterface; // @phpstan-ignore classConstant.deprecatedClass -@trigger_error(RoundRobinSelectorTest::class . ' is deprecated in 2.3.2 and will be removed in 3.0.0.', E_USER_DEPRECATED); +@trigger_error(RoundRobinSelectorTest::class . ' is deprecated in 2.4.0 and will be removed in 3.0.0.', E_USER_DEPRECATED); /** * Class SnifferTest * * @subpackage Tests\ConnectionPool\RoundRobinSelectorTest * - * @deprecated in 2.3.2 and will be removed in 3.0.0. + * @deprecated in 2.4.0 and will be removed in 3.0.0. */ class RoundRobinSelectorTest extends \PHPUnit\Framework\TestCase { diff --git a/tests/ConnectionPool/Selectors/StickyRoundRobinSelectorTest.php b/tests/ConnectionPool/Selectors/StickyRoundRobinSelectorTest.php index f31d92764..0fc6c1fe1 100644 --- a/tests/ConnectionPool/Selectors/StickyRoundRobinSelectorTest.php +++ b/tests/ConnectionPool/Selectors/StickyRoundRobinSelectorTest.php @@ -20,14 +20,14 @@ use Mockery as m; // @phpstan-ignore classConstant.deprecatedClass -@trigger_error(StickyRoundRobinSelectorTest::class . ' is deprecated in 2.3.2 and will be removed in 3.0.0.', E_USER_DEPRECATED); +@trigger_error(StickyRoundRobinSelectorTest::class . ' is deprecated in 2.4.0 and will be removed in 3.0.0.', E_USER_DEPRECATED); /** * Class StickyRoundRobinSelectorTest * * @subpackage Tests\ConnectionPool\StickyRoundRobinSelectorTest * - * @deprecated in 2.3.2 and will be removed in 3.0.0. + * @deprecated in 2.4.0 and will be removed in 3.0.0. */ class StickyRoundRobinSelectorTest extends \PHPUnit\Framework\TestCase { diff --git a/tests/ConnectionPool/SniffingConnectionPoolIntegrationTest.php b/tests/ConnectionPool/SniffingConnectionPoolIntegrationTest.php index 6424baeb2..93f0fbf25 100644 --- a/tests/ConnectionPool/SniffingConnectionPoolIntegrationTest.php +++ b/tests/ConnectionPool/SniffingConnectionPoolIntegrationTest.php @@ -28,7 +28,7 @@ use PHPUnit\Framework\TestCase; // @phpstan-ignore classConstant.deprecatedClass -@trigger_error(SniffingConnectionPoolIntegrationTest::class . ' is deprecated in 2.3.2 and will be removed in 3.0.0.', E_USER_DEPRECATED); +@trigger_error(SniffingConnectionPoolIntegrationTest::class . ' is deprecated in 2.4.0 and will be removed in 3.0.0.', E_USER_DEPRECATED); /** * Class SniffingConnectionPoolIntegrationTest diff --git a/tests/ConnectionPool/SniffingConnectionPoolTest.php b/tests/ConnectionPool/SniffingConnectionPoolTest.php index 94a01b429..0ebd32a0b 100644 --- a/tests/ConnectionPool/SniffingConnectionPoolTest.php +++ b/tests/ConnectionPool/SniffingConnectionPoolTest.php @@ -24,14 +24,14 @@ use PHPUnit\Framework\TestCase; // @phpstan-ignore classConstant.deprecatedClass -@trigger_error(SniffingConnectionPoolTest::class . ' is deprecated in 2.3.2 and will be removed in 3.0.0.', E_USER_DEPRECATED); +@trigger_error(SniffingConnectionPoolTest::class . ' is deprecated in 2.4.0 and will be removed in 3.0.0.', E_USER_DEPRECATED); /** * Class SniffingConnectionPoolTest * * @subpackage Tests/SniffingConnectionPoolTest * - * @deprecated in 2.3.2 and will be removed in 3.0.0. + * @deprecated in 2.4.0 and will be removed in 3.0.0. */ class SniffingConnectionPoolTest extends TestCase { diff --git a/tests/ConnectionPool/StaticConnectionPoolIntegrationTest.php b/tests/ConnectionPool/StaticConnectionPoolIntegrationTest.php index f2ad10fed..916a64965 100644 --- a/tests/ConnectionPool/StaticConnectionPoolIntegrationTest.php +++ b/tests/ConnectionPool/StaticConnectionPoolIntegrationTest.php @@ -25,7 +25,7 @@ use OpenSearch\Tests\Utility; // @phpstan-ignore classConstant.deprecatedClass -@trigger_error(StaticConnectionPoolIntegrationTest::class . ' is deprecated in 2.3.2 and will be removed in 3.0.0.', E_USER_DEPRECATED); +@trigger_error(StaticConnectionPoolIntegrationTest::class . ' is deprecated in 2.4.0 and will be removed in 3.0.0.', E_USER_DEPRECATED); /** * Class StaticConnectionPoolIntegrationTest @@ -34,7 +34,7 @@ * @group Integration * @group Integration-Min * - * @deprecated in 2.3.2 and will be removed in 3.0.0. + * @deprecated in 2.4.0 and will be removed in 3.0.0. */ class StaticConnectionPoolIntegrationTest extends \PHPUnit\Framework\TestCase { diff --git a/tests/ConnectionPool/StaticConnectionPoolTest.php b/tests/ConnectionPool/StaticConnectionPoolTest.php index 099da570a..f351d06d6 100644 --- a/tests/ConnectionPool/StaticConnectionPoolTest.php +++ b/tests/ConnectionPool/StaticConnectionPoolTest.php @@ -34,7 +34,7 @@ use OpenSearch\Connections\ConnectionInterface; // @phpstan-ignore classConstant.deprecatedClass -@trigger_error(StaticConnectionPoolTest::class . ' is deprecated in 2.3.2 and will be removed in 3.0.0.', E_USER_DEPRECATED); +@trigger_error(StaticConnectionPoolTest::class . ' is deprecated in 2.4.0 and will be removed in 3.0.0.', E_USER_DEPRECATED); /** * Class StaticConnectionPoolTest @@ -42,7 +42,7 @@ * @subpackage Tests/StaticConnectionPoolTest * @group legacy * - * @deprecated in 2.3.2 and will be removed in 3.0.0. + * @deprecated in 2.4.0 and will be removed in 3.0.0. */ class StaticConnectionPoolTest extends \PHPUnit\Framework\TestCase { diff --git a/tests/Connections/ConnectionTest.php b/tests/Connections/ConnectionTest.php index ec406285b..e79128d18 100644 --- a/tests/Connections/ConnectionTest.php +++ b/tests/Connections/ConnectionTest.php @@ -36,14 +36,14 @@ use function random_bytes; // @phpstan-ignore classConstant.deprecatedClass -@trigger_error(ConnectionTest::class . ' is deprecated in 2.3.2 and will be removed in 3.0.0.', E_USER_DEPRECATED); +@trigger_error(ConnectionTest::class . ' is deprecated in 2.4.0 and will be removed in 3.0.0.', E_USER_DEPRECATED); /** * @covers \OpenSearch\Connections\Connection * @group legacy * - * @deprecated in 2.3.2 and will be removed in 3.0.0. + * @deprecated in 2.4.0 and will be removed in 3.0.0. */ class ConnectionTest extends \PHPUnit\Framework\TestCase { diff --git a/tests/Handlers/SigV4HandlerTest.php b/tests/Handlers/SigV4HandlerTest.php index e8990a69c..e265f5c3b 100644 --- a/tests/Handlers/SigV4HandlerTest.php +++ b/tests/Handlers/SigV4HandlerTest.php @@ -12,11 +12,11 @@ use PHPUnit\Framework\TestCase; // @phpstan-ignore classConstant.deprecatedClass -@trigger_error(SigV4HandlerTest::class . ' is deprecated in 2.3.2 and will be removed in 3.0.0.', E_USER_DEPRECATED); +@trigger_error(SigV4HandlerTest::class . ' is deprecated in 2.4.0 and will be removed in 3.0.0.', E_USER_DEPRECATED); /** * @group legacy - * @deprecated in 2.3.2 and will be removed in 3.0.0. Use \OpenSearch\Aws\SigV4RequestFactory instead. + * @deprecated in 2.4.0 and will be removed in 3.0.0. Use \OpenSearch\Aws\SigV4RequestFactory instead. */ class SigV4HandlerTest extends TestCase { diff --git a/tests/LegacyRegisteredNamespaceTest.php b/tests/LegacyRegisteredNamespaceTest.php index 1b47b9bcd..a661f05a0 100644 --- a/tests/LegacyRegisteredNamespaceTest.php +++ b/tests/LegacyRegisteredNamespaceTest.php @@ -32,7 +32,7 @@ * Class RegisteredNamespaceTest * * @subpackage Tests - * @deprecated in 2.3.2 and will be removed in 3.0.0. + * @deprecated in 2.4.0 and will be removed in 3.0.0. */ class LegacyRegisteredNamespaceTest extends \PHPUnit\Framework\TestCase { @@ -65,7 +65,7 @@ public function testNonExistingNamespace() /** * @codingStandardsIgnoreStart "Each class must be in a file by itself" - not worth the extra work here - * @deprecated in 2.3.2 and will be removed in 3.0.0. + * @deprecated in 2.4.0 and will be removed in 3.0.0. */ class FooNamespaceBuilder implements OpenSearch\Namespaces\NamespaceBuilderInterface { diff --git a/util/template/client-class b/util/template/client-class index 04c9cd97f..bf44471ef 100644 --- a/util/template/client-class +++ b/util/template/client-class @@ -39,7 +39,7 @@ class Client /** * @var Transport * - * @deprecated in 2.3.2 and will be removed in 3.0.0. + * @deprecated in 2.4.0 and will be removed in 3.0.0. */ public $transport; @@ -55,7 +55,7 @@ class Client /** * @var callable * - * @deprecated in 2.3.2 and will be removed in 3.0.0. + * @deprecated in 2.4.0 and will be removed in 3.0.0. */ protected $endpoints; @@ -81,7 +81,7 @@ class Client array $registeredNamespaces, ) { if (!$transport instanceof TransportInterface) { - @trigger_error('Passing an instance of \OpenSearch\Transport to ' . __METHOD__ . '() is deprecated in 2.3.2 and will be removed in 3.0.0. Pass an instance of \OpenSearch\TransportInterface instead.', E_USER_DEPRECATED); + @trigger_error('Passing an instance of \OpenSearch\Transport to ' . __METHOD__ . '() is deprecated in 2.4.0 and will be removed in 3.0.0. Pass an instance of \OpenSearch\TransportInterface instead.', E_USER_DEPRECATED); // @phpstan-ignore property.deprecated $this->transport = $transport; // @phpstan-ignore new.deprecated @@ -90,13 +90,13 @@ class Client $this->httpTransport = $transport; } if (is_callable($endpointFactory)) { - @trigger_error('Passing a callable as the $endpointFactory param in ' . __METHOD__ . ' is deprecated in 2.3.2 and will be removed in 3.0.0. Pass an instance of \OpenSearch\EndpointFactoryInterface instead.', E_USER_DEPRECATED); + @trigger_error('Passing a callable as the $endpointFactory param in ' . __METHOD__ . ' is deprecated in 2.4.0 and will be removed in 3.0.0. Pass an instance of \OpenSearch\EndpointFactoryInterface instead.', E_USER_DEPRECATED); $endpoints = $endpointFactory; // @phpstan-ignore new.deprecated $endpointFactory = new LegacyEndpointFactory($endpointFactory); } else { $endpoints = function ($c) use ($endpointFactory) { - @trigger_error('The $endpoints property is deprecated in 2.3.2 and will be removed in 3.0.0.', E_USER_DEPRECATED); + @trigger_error('The $endpoints property is deprecated in 2.4.0 and will be removed in 3.0.0.', E_USER_DEPRECATED); return $endpointFactory->getEndpoint('OpenSearch\\Endpoints\\' . $c); }; }