Make Database constructor accept first class arguments

Author: lornajane

src/PHPCouchDB/Database.php

@@ -22,35 +22,14 @@ class Database
      * Constructor for the Database object - this is usually called by
      * Server::useDb rather than directly
      *
-     * @param array $options This should contain "client" (implementing
-     *  \GuzzleHTTP\ClientInterface) and "db_name" (a string)
-     * @throws \PHPCouchDB\Exception\ServerException if we don't have the
-     *  expected constructor arguments
+     * @param \GuzzleHTTP\ClientInterface $client Our HTTP client
+     * @param string $db_name The datbase to connect to
      */
 
-    public function __construct($options)
+    public function __construct(\GuzzleHttp\ClientInterface $client, string $db_name)
     {
-        if (empty($options) || !is_array($options)) {
-            throw new \PHPCouchDB\Exception\ServerException(
-                '$options is a required parameter, array must contain both the client and a db_name'
-            );
-        }
-
-        if (isset($options['client']) && $options['client'] instanceof \GuzzleHttp\ClientInterface) {
-            $this->client = $options['client'];
-        } else {
-            throw new \PHPCouchDB\Exception\ServerException(
-                "The options array must contain a 'client' element of type GuzzleHTTP\ClientInterface"
-            );
-        }
-
-        if (isset($options['db_name']) && is_string($options['db_name'])) {
-            $this->db_name = $options['db_name'];
-        } else {
-            throw new \PHPCouchDB\Exception\ServerException(
-                "The options array must contain a 'db_name' key with a value of type string"
-            );
-        }
+        $this->client = $client;
+        $this->db_name = $db_name;
     }
 
     /**

src/PHPCouchDB/Server.php

@@ -141,7 +141,7 @@ public function useDb($options) : \PHPCouchDB\Database
         }
 
         if ($exists) {
-            return new \PHPCouchDB\Database(["client" => $this->client, "db_name" => $db_name]);
+            return new Database($this->client, $db_name);
         }
 
         throw new \PHPCouchDB\Exception\ServerException(