Fixed phpstan issue

elastic · Aug 12, 2019 · 1348fbe · 1348fbe
1 parent 3e7fa92
commit 1348fbe
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/phpstan-src-71.neon b/phpstan-src-71.neon
@@ -6,3 +6,6 @@ parameters:
         - '#Variable (.*) in isset\(\) always exists and is not nullable.#'
         - '#Constant JSON_THROW_ON_ERROR not found#'
         - '#class JsonException#'
+        -
+            message: '#is not subtype of Throwable#'
+            path: %currentWorkingDirectory%/src/Elasticsearch/ClientBuilder.php
diff --git a/phpstan-src.neon b/phpstan-src.neon
@@ -4,3 +4,6 @@ parameters:
         # nullable types are missing everywhere
         # this should be removed and fixed in the code later
         - '#Variable (.*) in isset\(\) always exists and is not nullable.#'
+        -
+            message: '#is not subtype of Throwable#'
+            path: %currentWorkingDirectory%/src/Elasticsearch/ClientBuilder.php
diff --git a/src/Elasticsearch/ClientBuilder.php b/src/Elasticsearch/ClientBuilder.php
@@ -337,12 +337,9 @@ public function setHosts(array $hosts): ClientBuilder
      *
      * @link https://www.elastic.co/guide/en/elasticsearch/reference/current/security-api-create-api-key.html
      *
-     * @param string $id
-     * @param string $apiKey
-     *
      * @throws Elasticsearch\Common\Exceptions\AuthenticationConfigException
      */
-    public function setApiKey(string $id, string $apiKey)
+    public function setApiKey(string $id, string $apiKey): ClientBuilder
     {
         if (isset($this->connectionParams['client']['curl'][CURLOPT_HTTPAUTH]) === true) {
             throw new AuthenticationConfigException("You can't use APIKey - and Basic Authenication together.");
@@ -363,7 +360,7 @@ public function setApiKey(string $id, string $apiKey)
      *
      * @throws Elasticsearch\Common\Exceptions\AuthenticationConfigException
      */
-    public function setBasicAuthentication(string $username, string $password)
+    public function setBasicAuthentication(string $username, string $password): ClientBuilder
     {
         if (isset($this->connectionParams['client']['headers']['Authorization']) === true) {
             throw new AuthenticationConfigException("You can't use APIKey - and Basic Authenication together.");
@@ -388,7 +385,7 @@ public function setBasicAuthentication(string $username, string $password)
      *
      * @param string $cloudId
      */
-    public function setElasticCloudId(string $cloudId)
+    public function setElasticCloudId(string $cloudId): ClientBuilder
     {
         // Register the Hosts array
         $this->setHosts([

diff --git a/src/Elasticsearch/Common/Exceptions/AuthenticationConfigException.php b/src/Elasticsearch/Common/Exceptions/AuthenticationConfigException.php
@@ -1,4 +1,5 @@
-<?php declare(strict_types = 1);
+<?php
+declare(strict_types = 1);
 
 // Licensed to Elasticsearch B.V under one or more agreements.
 // Elasticsearch B.V licenses this file to you under the Apache 2.0 License.