Fix problems in Connection

elastic · Feb 4, 2021 · 71dba3d · 71dba3d
1 parent 1f53edb
commit 71dba3d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/phpstan.neon b/phpstan.neon
@@ -1,6 +1,10 @@
 parameters:
+    phpVersion: 70100
     level: 2
     paths:
         - src/
     ignoreErrors:
         - '#^Unsafe usage of new static\(\)\.$#'
+        # PHP 7.1 only
+        - '#^Caught class JsonException not found\.$#'
+        - '#^Call to method getCode\(\) on an unknown class JsonException\.$#'
diff --git a/src/Elasticsearch/Connections/Connection.php b/src/Elasticsearch/Connections/Connection.php
@@ -193,7 +193,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);
@@ -337,9 +337,9 @@ private function wrapHandler(callable $handler): callable
         };
     }
 
-    private function getURI(string $uri, ?array $params): string
+    private function getURI(string $uri, array $params): string
     {
-        if (isset($params) === true && !empty($params)) {
+        if ($params !== []) {
             array_walk(
                 $params,
                 function (&$value, &$key) {
@@ -461,7 +461,7 @@ public function ping(): bool
             ]
         ];
         try {
-            $response = $this->performRequest('HEAD', '/', null, null, $options);
+            $response = $this->performRequest('HEAD', '/', [], null, $options);
             $response = $response->wait();
         } catch (TransportException $exception) {
             $this->markDead();
@@ -492,7 +492,7 @@ public function sniff()
             ]
         ];
 
-        return $this->performRequest('GET', '/_nodes/', null, null, $options);
+        return $this->performRequest('GET', '/_nodes/', [], null, $options);
     }
 
     public function isAlive(): bool
@@ -609,9 +609,7 @@ private function process4xxError(array $request, array $response, array $ignore)
         $statusCode = $response['status'];
         $responseBody = $response['body'];
 
-        /**
- * @var \Exception $exception
-*/
+        /** @var \Exception $exception */
         $exception = $this->tryDeserialize400Error($response);
 
         if (array_search($response['status'], $ignore) !== false) {
@@ -647,9 +645,7 @@ private function process5xxError(array $request, array $response, array $ignore)
         $statusCode = (int) $response['status'];
         $responseBody = $response['body'];
 
-        /**
- * @var \Exception $exception
-*/
+        /** @var \Exception $exception */
         $exception = $this->tryDeserialize500Error($response);
 
         $exceptionText = "[$statusCode Server Exception] ".$exception->getMessage();