Add whole Database object as constructor argument to Document

Author: lornajane

src/PHPCouchDB/Database.php

@@ -50,7 +50,7 @@ public function getAllDocs($options = []) : array
                 // we have some data - extract the docs to return
                 $docs = [];
                 foreach ($json_data["rows"] as $document) {
-                    $docs[] = new Document($this->client, $this->db_name, $document["doc"]);
+                    $docs[] = new Document($this, $document["doc"]);
                 }
                 return $docs;
             } else {
@@ -93,7 +93,7 @@ public function create($doc)
                 $id = $response_data['id'];
                 // all good.  Let's fetch the doc and return it
                 $fetched_data = json_decode($this->client->get('/' . $this->db_name . '/' . $id)->getBody(), true);
-                return new Document($this->client, $this->db_name, $fetched_data);
+                return new Document($this, $fetched_data);
             }
         } catch (\GuzzleHttp\Exception\ConnectException $e) {
             throw new Exception\ServerException(
@@ -118,7 +118,7 @@ public function getDocById($id) : Document
         $response = $this->client->request("GET", $endpoint);
         if ($response->getStatusCode() == 200) {
             if ($data = json_decode($response->getBody(), true)) {
-                $doc = new Document($this->client, $this->db_name, $data);
+                $doc = new Document($this, $data);
                 return $doc;
             } else {
                 throw new Exception\ServerException('JSON response not received or not understood');

src/PHPCouchDB/Document.php

@@ -16,20 +16,19 @@
 class Document
 {
     protected $client;
-    protected $db_name;
+    protected $database;
 
     /**
      * Usually constructed by the Database object as it gets documents for us
      *
-     * @param \GuzzleHTTP\ClientInterface $client Our HTTP client
-     * @param string $db_name The database this document is in
+     * @param \PHPCouchDB\Database $database The database this document is in
      * @param array $data Representation of the document
      */
 
-    public function __construct(\GuzzleHttp\ClientInterface $client, string $db_name, array $data)
+    public function __construct(Database $database, array $data)
     {
-        $this->client  = $client;
-        $this->db_name = $db_name;
+        $this->database = $database;
+        $this->client  = $database->getClient();
         // possibly overly simple!
         // Add all array elements as properties on the new object
         foreach ($data as $field => $value) {
@@ -44,13 +43,14 @@ public function __construct(\GuzzleHttp\ClientInterface $client, string $db_name
     }
 
     /**
-     * Format object for var_dump() - removes the $client property
+     * Format object for var_dump(), removing large properties
      */
     public function __debugInfo()
     {
-        // remove the $client object because the output is HUGE
+        // remove the $database property because the output is HUGE
         $result = get_object_vars($this);
         unset($result['client']);
+        unset($result['database']);
         return $result;
     }
 }