Added PHP 8.4 Support for Elasticsearch 7.17 || 7.x Compatibility (#1417)

* added php84

* added php84

* added php84 support

* added php84 support

* added php84 support

---------

Co-authored-by: Emre Çalışkan <[email protected]>

Author: thecaliskan

.ci/test-matrix.yml

@@ -3,6 +3,7 @@ STACK_VERSION:
   - 7.17-SNAPSHOT
 
 PHP_VERSION:
+  - 8.4-cli
   - 8.3-cli
   - 8.2-cli
   - 8.1-cli

.github/workflows/test.yml

@@ -9,7 +9,7 @@ jobs:
 
     strategy:
       matrix:
-        php-version: [7.3, 7.4, 8.0, 8.1, 8.2, 8.3]
+        php-version: [7.3, 7.4, 8.0, 8.1, 8.2, 8.3, 8.4]
         os: [ubuntu-latest]
         es-version: [7.17-SNAPSHOT]
 

src/Elasticsearch/ClientBuilder.php

@@ -527,7 +527,7 @@ public function setSniffOnStart(bool $sniffOnStart): ClientBuilder
      * @param string $cert The name of a file containing a PEM formatted certificate.
      * @param string $password if the certificate requires a password
      */
-    public function setSSLCert(string $cert, string $password = null): ClientBuilder
+    public function setSSLCert(string $cert, ?string $password = null): ClientBuilder
     {
         $this->sslCert = [$cert, $password];
 
@@ -540,7 +540,7 @@ public function setSSLCert(string $cert, string $password = null): ClientBuilder
      * @param string $key The name of a file containing a private SSL key
      * @param string $password if the private key requires a password
      */
-    public function setSSLKey(string $key, string $password = null): ClientBuilder
+    public function setSSLKey(string $key, ?string $password = null): ClientBuilder
     {
         $this->sslKey = [$key, $password];
 

src/Elasticsearch/Connections/Connection.php

@@ -201,7 +201,7 @@ public function __construct(
      * @param  Transport $transport
      * @return mixed
      */
-    public function performRequest(string $method, string $uri, ?array $params = [], $body = null, array $options = [], Transport $transport = null)
+    public function performRequest(string $method, string $uri, ?array $params = [], $body = null, array $options = [], ?Transport $transport = null)
     {
         if ($body !== null) {
             $body = $this->serializer->serialize($body);
@@ -255,7 +255,7 @@ public function getLastRequestInfo(): array
 
     private function wrapHandler(callable $handler): callable
     {
-        return function (array $request, Connection $connection, Transport $transport = null, $options) use ($handler) {
+        return function (array $request, Connection $connection, ?Transport $transport = null, array $options = []) use ($handler) {
 
             $this->lastRequest = [];
             $this->lastRequest['request'] = $request;

src/Elasticsearch/Connections/ConnectionInterface.php

@@ -75,5 +75,5 @@ public function getLastRequestInfo(): array;
      * @param  null $body
      * @return mixed
      */
-    public function performRequest(string $method, string $uri, ?array $params = [], $body = null, array $options = [], Transport $transport = null);
+    public function performRequest(string $method, string $uri, ?array $params = [], $body = null, array $options = [], ?Transport $transport = null);
 }