count bugs fixing

o2system · Oct 2, 2019 · 4029191 · 4029191
1 parent 05b340b
commit 4029191
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/src/DataObjects/Result.php b/src/DataObjects/Result.php
@@ -101,13 +101,15 @@ public function setNumTotal($totalRows)
      *
      * Gets first result row data.
      *
-     * @return \O2System\Database\DataObjects\Result\Row
+     * @return \O2System\Database\DataObjects\Result\Row|null
      */
     public function first()
     {
-        $this->rewind();
+        if($this->count()) {
+            $this->rewind();
 
-        return $this->current();
+            return $this->current();
+        }
     }
 
     // ------------------------------------------------------------------------
@@ -121,10 +123,12 @@ public function first()
      */
     public function last()
     {
-        $index = $this->count() - 1;
+        if($this->count()) {
+            $index = $this->count() - 1;
 
-        if ($this->offsetExists($index)) {
-            return $this->offsetGet($index);
+            if ($this->offsetExists($index)) {
+                return $this->offsetGet($index);
+            }
         }
     }