Back to original

- New limit tests passing (?)

Author: pdphilip

src/Query/Builder.php

@@ -2107,16 +2107,12 @@ public function withSuffix(string $suffix): self
 
     public function getLimit(): int
     {
-        return $this->getSetLimit();
+        return $this->getSetLimit() ?? $this->getDefaultLimit() ?? $this->connection->getDefaultLimit();
     }
 
-    public function getSetLimit(): int
+    public function getSetLimit(): ?int
     {
-        // If a limit was explicitly set we use that over the defaults.
-        return $this->limit
-          ?? $this->options()->get('limit')
-          ?? $this->getDefaultLimit()
-          ?? $this->connection->getDefaultLimit();
+        return $this->options()->get('limit', $this->limit) ?? null;
     }
 
     public function getDefaultLimit(): ?int