Merge pull request #129 from DQNEO/fix-phpdoc

fetchObject and fetchOne may return false
auraphp · Jun 24, 2016 · 11bbe6f · 11bbe6f
2 parents 842ea73 + d202410
commit 11bbe6f
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 4 deletions.
diff --git a/src/ExtendedPdo.php b/src/ExtendedPdo.php
@@ -472,7 +472,7 @@ public function fetchCol(
      *
      * @param array $ctor_args Arguments to pass to the object constructor.
      *
-     * @return object
+     * @return object|false
      *
      */
     public function fetchObject(
@@ -537,7 +537,7 @@ public function fetchObjects(
      *
      * @param array $values Values to bind to the query.
      *
-     * @return array
+     * @return array|false
      *
      */
     public function fetchOne($statement, array $values = array())

diff --git a/src/ExtendedPdoInterface.php b/src/ExtendedPdoInterface.php
@@ -114,7 +114,7 @@ public function fetchCol($statement, array $values = array(), $callable = null);
      *
      * @param array $ctor_args Arguments to pass to the object constructor.
      *
-     * @return object
+     * @return object|false
      *
      */
     public function fetchObject(
@@ -163,7 +163,7 @@ public function fetchObjects(
      *
      * @param array $values Values to bind to the query.
      *
-     * @return array
+     * @return array|false
      *
      */
     public function fetchOne($statement, array $values = array());

diff --git a/tests/AbstractExtendedPdoTest.php b/tests/AbstractExtendedPdoTest.php
@@ -333,6 +333,13 @@ public function testFetchObject()
         $this->assertSame('Anna', $actual->name);
     }
 
+    public function testFetchObjectReturningFalse()
+    {
+        $stm = "SELECT id, name FROM pdotest WHERE id = ?";
+        $actual = $this->pdo->fetchObject($stm, array(-1));
+        $this->assertFalse($actual);
+    }
+
     public function testFetchObject_withCtorArgs()
     {
         $stm = "SELECT id, name FROM pdotest WHERE id = ?";
@@ -419,6 +426,13 @@ public function testFetchOne()
         $this->assertEquals($expect, $actual);
     }
 
+    public function testFetchOneReturningFalse()
+    {
+        $stm = "SELECT id, name FROM pdotest WHERE id = -1";
+        $actual = $this->pdo->fetchOne($stm);
+        $this->assertFalse($actual);
+    }
+
     public function testGroupSingleColumn()
     {
         $stm = "SELECT id, name FROM pdotest WHERE id = 1";