using exception instead of null return (preventing potential NPE)

Florent · Florent · commit cf0036babb29 · 2013-07-08T09:50:49.000+02:00
diff --git a/DataMapper/UserMapper.php b/DataMapper/UserMapper.php
@@ -70,7 +70,7 @@ public function findById($id)
     {
         $result = $this->_adapter->find($id);
         if (0 == count($result)) {
-            return;
+            throw new \InvalidArgumentException("User #$id not found");
         }
         $row = $result->current();
 
diff --git a/Tests/DataMapper/UserMapperTest.php b/Tests/DataMapper/UserMapperTest.php
@@ -87,4 +87,18 @@ public function testRestoreMulti(User $existing)
         $this->assertEquals([$existing], $user);
     }
 
-}
+    /**
+     * @expectedException InvalidArgumentException
+     * @expectedExceptionMessage User #404 not found
+     */
+    public function testNotFound()
+    {
+        $this->dbal->expects($this->once())
+                ->method('find')
+                ->with(404)
+                ->will($this->returnValue([]));
+
+        $user = $this->mapper->findById(404);
+    }
+
+}

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ public function findById($id)`
`70`	`70`	`{`
`71`	`71`	`$result = $this->_adapter->find($id);`
`72`	`72`	`if (0 == count($result)) {`
`73`		`- return;`
	`73`	`+ throw new \InvalidArgumentException("User #$id not found");`
`74`	`74`	`}`
`75`	`75`	`$row = $result->current();`
`76`	`76`