Remove trait and fix bc

Signed-off-by: Kim Pepper <[email protected]>
opensearch-project · Nov 8, 2024 · 12209dd · 12209dd
1 parent a863ae7
commit 12209dd
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 39 deletions.
diff --git a/composer.json b/composer.json
@@ -21,7 +21,7 @@
     }
   ],
   "require": {
-    "php": "^8.1",
+    "php": "^8.0",
     "ext-json": ">=1.3.7",
     "ext-curl": "*",
     "ezimuel/ringphp": "^1.2.2",

diff --git a/src/OpenSearch/ClientBuilder.php b/src/OpenSearch/ClientBuilder.php
@@ -41,16 +41,12 @@
 use OpenSearch\Namespaces\NamespaceBuilderInterface;
 use OpenSearch\Serializers\SerializerInterface;
 use OpenSearch\Serializers\SmartSerializer;
-use OpenSearch\Traits\DeprecatedPropertyTrait;
 use Psr\Log\LoggerInterface;
 use Psr\Log\NullLogger;
 use ReflectionClass;
 
 class ClientBuilder
 {
-
-    use DeprecatedPropertyTrait;
-
     public const ALLOWED_METHODS_FROM_CONFIG = ['includePortInHostHeader'];
 
     /**
@@ -185,10 +181,12 @@ 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.
      */
     public function getEndpoint(): callable
     {
-        return $this->endpoint;
+        return fn ($c) => $this->endpointFactory->getEndpoint('OpenSearch\\Endpoints\\' . $c);
     }
 
     /**

diff --git a/src/OpenSearch/Namespaces/AbstractNamespace.php b/src/OpenSearch/Namespaces/AbstractNamespace.php
@@ -24,14 +24,10 @@
 use OpenSearch\EndpointFactoryInterface;
 use OpenSearch\Endpoints\AbstractEndpoint;
 use OpenSearch\LegacyEndpointFactory;
-use OpenSearch\Traits\DeprecatedPropertyTrait;
 use OpenSearch\Transport;
 
 abstract class AbstractNamespace
 {
-
-    use DeprecatedPropertyTrait;
-
     /**
      * @var \OpenSearch\Transport
      */
@@ -41,17 +37,22 @@ abstract class AbstractNamespace
 
     /**
      * @var callable
+     *
+     * @deprecated in 2.3.2 and will be removed in 3.0.0. Use $endpointFactory property instead.
      */
     protected $endpoints;
 
     public function __construct(Transport $transport, callable|EndpointFactoryInterface $endpointFactory)
     {
         $this->transport = $transport;
         if (is_callable($endpointFactory)) {
-            @trigger_error('Passing a callable to AbstractNamespace is deprecated in 2.3.2 and will be removed in 3.0.0. Pass an instance of \OpenSearch\EndpointFactoryInterface instead.', E_USER_DEPRECATED);
-            $this->endpoints = $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);
+            $endpoints = $endpointFactory;
             $endpointFactory = new LegacyEndpointFactory($endpointFactory);
+        } else {
+            $endpoints = fn ($c) => $endpointFactory->getEndpoint('OpenSearch\\Endpoints\\' . $c);
         }
+        $this->endpoints = $endpoints;
         $this->endpointFactory = $endpointFactory;
     }
 

diff --git a/src/OpenSearch/Traits/DeprecatedPropertyTrait.php b/src/OpenSearch/Traits/DeprecatedPropertyTrait.php
diff --git a/util/template/client-class b/util/template/client-class
@@ -79,7 +79,7 @@ class Client
             $endpoints = $endpointFactory;
             $endpointFactory = new LegacyEndpointFactory($endpointFactory);
         } else {
-            $endpoints = $endpointFactory->getEndpoint(...);
+            $endpoints = fn ($c) => $endpointFactory->getEndpoint('OpenSearch\\Endpoints\\' . $c);
         }
         $this->endpoints = $endpoints;
         $this->endpointFactory = $endpointFactory;
@@ -95,7 +95,7 @@ class Client
     public function __get(string $name): mixed
     {
         if ($name === 'endpoints') {
-            @trigger_error('The $callable property is deprecated in 2.3.2 and will be removed in 3.0.0. Use $endpointFactory instead.', E_USER_DEPRECATED);
+            @trigger_error('The $endpoints property is deprecated in 2.3.2 and will be removed in 3.0.0. Use $endpointFactory instead.', E_USER_DEPRECATED);
             return $this->endpoints;
         }
         return null;