moved the mutator key to client key

Author: philkra

src/Elasticsearch/Endpoints/AbstractEndpoint.php

@@ -249,6 +249,15 @@ private function extractOptions(&$params)
     {
         // Extract out client options, then start transforming
         if (isset($params['client']) === true) {
+            // Check if the opaqueId is populated and add the header
+            if (isset($params['client']['opaqueId']) === true) {
+                if (isset($params['client']['headers']) === false) {
+                    $params['client']['headers'] = [];
+                }
+                $params['client']['headers']['x-opaque-id'] = [trim($params['client']['opaqueId'])];
+                unset($params['client']['opaqueId']);
+            }
+
             $this->options['client'] = $params['client'];
             unset($params['client']);
         }
@@ -262,15 +271,6 @@ private function extractOptions(&$params)
                 $this->options['client']['ignore'] = [$ignore];
             }
         }
-
-        // Check if the opaqueId is populated and add the header
-        if (isset($params['opaqueId']) === true) {
-            if (isset($this->options['client']['headers']) === false) {
-                $this->options['client']['headers'] = [];
-            }
-            $this->options['client']['headers']['x-opaque-id'] = [trim($params['opaqueId'])];
-            unset($params['opaqueId']);
-        }
     }
 
     private function convertCustom(array $params): array

tests/Elasticsearch/Tests/Endpoints/AbstractEndpointTest.php

@@ -46,15 +46,15 @@ public function testInvalidParamsCauseErrorsWhenProvidedToSetParams(array $param
      */
     public function testOpaqueIdInHeaders()
     {
-        $params = ['opaqueId' => 'test_id_' . rand(1000, 9999)];
+        $params = ['client' => ['opaqueId' => 'test_id_' . rand(1000, 9999)]];
         $this->endpoint->setParams($params);
 
         $options = $this->endpoint->getOptions();
         $this->assertArrayHasKey('client', $options);
         $this->assertArrayHasKey('headers', $options['client']);
         $this->assertArrayHasKey('x-opaque-id', $options['client']['headers']);
         $this->assertNotEmpty($options['client']['headers']['x-opaque-id']);
-        $this->assertEquals($params['opaqueId'], $options['client']['headers']['x-opaque-id'][0]);
+        $this->assertEquals($params['client']['opaqueId'], $options['client']['headers']['x-opaque-id'][0]);
     }
 
 }