Merge branch 'master' into phpmd

typhonius · Mar 22, 2020 · f99943a · f99943a
2 parents 913fdc5 + 6716443
commit f99943a
Show file tree

Hide file tree

Showing 5 changed files with 503 additions and 446 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/src/Connector/Client.php b/src/Connector/Client.php
@@ -60,7 +60,10 @@ public static function factory(ConnectorInterface $connector)
      */
     public function request(string $verb, string $path, array $options = [])
     {
-        $options = $this->options;
+        // @TODO follow this up by removing $options from the parameters able
+        // to be passed into this function and instead solely relying on the
+        // addOption() method as this can then be tested.
+        $options = $this->options + $options;
         $options['query'] = $this->query;
 
         if (!empty($options['query']['filter']) && is_array($options['query']['filter'])) {