Simplify a little some array queries

This commit is contained in:
Sébastien Lucas 2014-01-08 17:51:40 +01:00
parent a6b52887ff
commit 24e0a14b89
2 changed files with 9 additions and 15 deletions

View file

@ -235,12 +235,10 @@ class Book extends Base {
public function getDataById ($idData)
{
foreach ($this->getDatas () as $data) {
if ($data->id == $idData) {
return $data;
}
}
return NULL;
$reduced = array_filter ($this->getDatas (), function ($data) use ($idData) {
return $data->id == $idData;
});
return reset ($reduced);
}
public function getRating () {
@ -283,14 +281,10 @@ class Book extends Base {
}
public function getDataFormat ($format) {
foreach ($this->getDatas () as $data)
{
if ($data->format == $format)
{
return $data;
}
}
return NULL;
$reduced = array_filter ($this->getDatas (), function ($data) use ($format) {
return $data->format == $format;
});
return reset ($reduced);
}
public function getFilePath ($extension, $idData = NULL, $relative = false)

View file

@ -290,7 +290,7 @@ class BookTest extends PHPUnit_Framework_TestCase
$data = $book->getDataFormat ("PDF");
$this->assertEquals (19, $data->id);
$this->assertNull ($book->getDataFormat ("FB2"));
$this->assertFalse ($book->getDataFormat ("FB2"));
}
public function testGetMimeType () {