Merge pull request #13 from sandrokeil/bugfix/undefined-property

Fix undefined property $handle
sandrokeil · Jul 14, 2020 · e74dc7c · e74dc7c
2 parents 41953bc + 0a257ab
commit e74dc7c
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,18 @@
 
 ### Fixed
 
+## 0.3.1 (2020-07-14)
+
+### Added
+
+### Deprecated
+
+### Removed
+
+### Fixed
+
+* Undefined property `$handle` in `\ArangoDb\Http\Client`
+
 ## 0.3.0 (2020-07-07)
 
 ### Added

diff --git a/composer.json b/composer.json
@@ -7,7 +7,6 @@
         "arangodb",
         "http",
         "client",
-        "vpack",
         "json",
         "php"
     ],

diff --git a/src/Http/Client.php b/src/Http/Client.php
@@ -359,6 +359,6 @@ private function open(RequestInterface $request): void
     private function close(): void
     {
         fclose($this->handle);
-        unset($this->handle);
+        $this->handle = null; // @phpstan-ignore-line
     }
 }
diff --git a/src/Statement/ArrayAccessStreamHandlerTrait.php b/src/Statement/ArrayAccessStreamHandlerTrait.php
@@ -84,12 +84,7 @@ public function next(): void
      */
     public function valid(): bool
     {
-        if ($this->position <= $this->length - 1) {
-            // we have more results than the current position is
-            return true;
-        }
-
-        return ($this->position <= $this->length - 1);
+        return $this->position <= $this->length - 1;
     }
 
     public function writesExecuted(): ?int