Fix #1074 allowing multiple function parameters in fromConfig (#1076)

* Fix #1074 allowing multiple function parameters in fromConfig

* Fixed CS issues

Author: ezimuel

src/Elasticsearch/ClientBuilder.php

@@ -189,8 +189,14 @@ public static function fromConfig(array $config, bool $quiet = false): Client
         $builder = new static;
         foreach ($config as $key => $value) {
             $method = "set$key";
-            if (method_exists($builder, $method)) {
-                $builder->$method($value);
+            $reflection = new ReflectionClass($builder);
+            if ($reflection->hasMethod($method)) {
+                $func = $reflection->getMethod($method);
+                if ($func->getNumberOfParameters() > 1) {
+                    $builder->$method(...$value);
+                } else {
+                    $builder->$method($value);
+                }
                 unset($config[$key]);
             }
         }

src/Elasticsearch/Endpoints/Bulk.php

@@ -93,5 +93,4 @@ public function setBody($body): Bulk
         }
         return $this;
     }
-
 }

src/Elasticsearch/Endpoints/Ml/FindFileStructure.php

@@ -86,5 +86,4 @@ public function setBody($body): FindFileStructure
         }
         return $this;
     }
-
 }

src/Elasticsearch/Endpoints/Ml/PostData.php

@@ -90,5 +90,4 @@ public function setJobId($job_id): PostData
 
         return $this;
     }
-
 }

src/Elasticsearch/Endpoints/Monitoring/Bulk.php

@@ -82,5 +82,4 @@ public function setBody($body): Bulk
         }
         return $this;
     }
-
 }

src/Elasticsearch/Endpoints/Msearch.php

@@ -90,5 +90,4 @@ public function setBody($body): Msearch
         }
         return $this;
     }
-
 }

src/Elasticsearch/Endpoints/MsearchTemplate.php

@@ -88,5 +88,4 @@ public function setBody($body): MsearchTemplate
         }
         return $this;
     }
-
 }

tests/Elasticsearch/Tests/ClientBuilderTest.php

@@ -193,4 +193,56 @@ public function testSetCloudIdWithExplicitPortOnlyEsUuid(string $cloudId, string
 
         $this->assertEquals($url, $connection->getHost());
     }
+
+    public function getConfig()
+    {
+        return [
+            [[
+                'hosts' => ['localhost:9200']
+            ]],
+            [[
+                'hosts'  => ['cloud:9200'],
+                'apiKey' => ['id-value', 'apikey-value']
+            ]],
+            [[
+                'hosts'  => ['cloud:9200'],
+                'basicAuthentication' => ['username-value', 'password-value']
+            ]]
+        ];
+    }
+
+    /**
+     * @dataProvider getConfig
+     * @see https://github.com/elastic/elasticsearch-php/issues/1074
+     */
+    public function testFromConfig(array $params)
+    {
+        $client = ClientBuilder::fromConfig($params);
+        $this->assertInstanceOf(Client::class, $client);
+    }
+
+    public function testFromConfigQuiteTrueWithUnknownKey()
+    {
+        $client = ClientBuilder::fromConfig(
+            [
+                'hosts' => ['localhost:9200'],
+                'foo' => 'bar'
+            ],
+            true
+        );
+    }
+
+    /**
+     * @expectedException Elasticsearch\Common\Exceptions\RuntimeException
+     */
+    public function testFromConfigQuiteFalseWithUnknownKey()
+    {
+        $client = ClientBuilder::fromConfig(
+            [
+                'hosts' => ['localhost:9200'],
+                'foo' => 'bar'
+            ],
+            false
+        );
+    }
 }

tests/Elasticsearch/Tests/Utility.php

@@ -477,4 +477,4 @@ private static function waitForClusterStateUpdatesToFinish(Client $client, int $
             $stillWaiting = ! empty($result['tasks']);
         } while ($stillWaiting && time() < ($start + $timeout));
     }
-}
+}