Merge pull request #134 from php-opencloud/fix-object-storage-stream

[rfr] Fixed stream pointer pointing to end of stream
php-opencloud · Jul 20, 2017 · 5e20f72 · 5e20f72
2 parents 8369248 + c085cde
commit 5e20f72
Showing 1 changed file with 14 additions and 1 deletion.
diff --git a/src/ObjectStore/v1/Models/Object.php b/src/ObjectStore/v1/Models/Object.php
@@ -51,6 +51,18 @@ public function populateFromResponse(ResponseInterface $response): self
     {
         parent::populateFromResponse($response);
 
+        $this->populateHeaders($response);
+
+        return $this;
+    }
+
+    /**
+     * @param ResponseInterface $response
+     *
+     * @return $this
+     */
+    private function populateHeaders(ResponseInterface $response): self
+    {
         $this->hash = $response->getHeaderLine('ETag');
         $this->contentLength = $response->getHeaderLine('Content-Length');
         $this->lastModified = $response->getHeaderLine('Last-Modified');
@@ -100,8 +112,9 @@ public function retrieve()
      */
     public function download(): StreamInterface
     {
+        /** @var ResponseInterface $response */
         $response = $this->executeWithState($this->api->getObject());
-        $this->populateFromResponse($response);
+        $this->populateHeaders($response);
         return $response->getBody();
     }