Merge branch 'fix/compress' into 7.4

Author: ezimuel

src/Elasticsearch/ClientBuilder.php

@@ -396,14 +396,10 @@ public function setElasticCloudId(string $cloudId): ClientBuilder
             ]
         ]);
 
-        // Merge best practices for the connection
-        $this->setConnectionParams([
-            'client' => [
-                'curl' => [
-                    CURLOPT_ENCODING => 1,
-                ],
-            ]
-        ]);
+        if (!isset($this->connectionParams['client']['curl'][CURLOPT_ENCODING])) {
+            // Merge best practices for the connection (enable gzip)
+            $this->connectionParams['client']['curl'][CURLOPT_ENCODING] = 'gzip';
+        }
 
         return $this;
     }

src/Elasticsearch/Connections/Connection.php

@@ -376,7 +376,7 @@ public function logRequestSuccess(array $request, array $response): void
             array(
                 'method'    => $request['http_method'],
                 'uri'       => $response['effective_url'],
-                'port'      => $response['transfer_stats']['primary_port'],
+                'port'      => $response['transfer_stats']['primary_port'] ?? '',
                 'headers'   => $request['headers'],
                 'HTTP code' => $response['status'],
                 'duration'  => $response['transfer_stats']['total_time'],

tests/Elasticsearch/Tests/ClientBuilderTest.php

@@ -4,9 +4,12 @@
 
 namespace Elasticsearch\Tests;
 
+use Elasticsearch\Client;
 use Elasticsearch\ClientBuilder;
+use Elasticsearch\Common\Exceptions\ElasticsearchException;
 use Elasticsearch\Common\Exceptions\InvalidArgumentException;
 use Elasticsearch\Tests\ClientBuilder\DummyLogger;
+use GuzzleHttp\Ring\Client\MockHandler;
 use PHPUnit\Framework\TestCase;
 
 class ClientBuilderTest extends TestCase
@@ -26,4 +29,45 @@ public function testClientBuilderThrowsExceptionForIncorrectTracerClass()
     {
         ClientBuilder::create()->setTracer(new DummyLogger);
     }
+
+    public function testGzipEnabledWhenElasticCloudId()
+    {
+        $client = ClientBuilder::create()
+            ->setElasticCloudId('foo:' . base64_encode('localhost:9200$foo'))
+            ->build();
+
+        $this->assertInstanceOf(Client::class, $client);
+        
+        try {
+            $result = $client->info();
+        } catch (ElasticsearchException $e) {
+            $request = $client->transport->getLastConnection()->getLastRequestInfo();
+            $this->assertContains('gzip', $request['request']['client']['curl']);
+        }
+    }
+
+    public function testElasticCloudIdNotOverrideCurlEncoding()
+    {
+        $params = [
+            'client' => [
+                'curl' => [
+                    CURLOPT_ENCODING => 'deflate'
+                ]
+            ]
+        ];
+        $client = ClientBuilder::create()
+            ->setConnectionParams($params)
+            ->setElasticCloudId('foo:' . base64_encode('localhost:9200$foo'))
+            ->build();
+
+        $this->assertInstanceOf(Client::class, $client);
+        
+        try {
+            $result = $client->info();
+        } catch (ElasticsearchException $e) {
+            $request = $client->transport->getLastConnection()->getLastRequestInfo();
+            $this->assertContains('deflate', $request['request']['client']['curl']);
+            $this->assertNotContains('gzip', $request['request']['client']['curl']);
+        }
+    }
 }

tests/Elasticsearch/Tests/ClientIntegrationTests.php renamed to tests/Elasticsearch/Tests/ClientIntegrationTest.php

@@ -4,7 +4,9 @@
 
 namespace Elasticsearch\Tests;
 
+use Elasticsearch\Client;
 use Elasticsearch\ClientBuilder;
+use Elasticsearch\Common\Exceptions\ElasticsearchException;
 use Elasticsearch\Common\Exceptions\Missing404Exception;
 use Elasticsearch\Tests\ClientBuilder\ArrayLogger;
 use Psr\Log\LogLevel;
@@ -19,7 +21,7 @@
  * @license    http://www.apache.org/licenses/LICENSE-2.0 Apache2
  * @link       http://elasticsearch.org
  */
-class ClientIntegrationTests extends \PHPUnit\Framework\TestCase
+class ClientIntegrationTest extends \PHPUnit\Framework\TestCase
 {
     public function setUp()
     {