deblan/propel-bundle
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

add tests for paramConverter, fix issue with never set

Browse source
This commit is contained in:
jaugustin 2013-01-02 19:03:11 +01:00
parent cc1a2dc8bc
commit 4ec0391bff
2 changed files with 34 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Request/ParamConverter/PropelParamConverter.php
View file

@ -155,10 +155,12 @@ class PropelParamConverter implements ParamConverterInterface
return false;
}
$query = $this->getQuery($classQuery);
if (!$this->hasWith) {
return $this->getQuery($classQuery)->findPk($request->attributes->get($this->pk));
return $query->findPk($request->attributes->get($this->pk));
} else {
return reset($this->getQuery($classQuery)->filterByPrimaryKey($request->attributes->get($this->pk))->find());
return $query->filterByPrimaryKey($request->attributes->get($this->pk))->find()->getFirst();
}
}

30
Tests/Request/ParamConverter/PropelParamConverterTest.php
View file

@ -250,6 +250,36 @@ class PropelParamConverterTest extends TestCase
$this->assertEquals($nb + 1, $this->con->getQueryCount(), 'no new query to get the books');
}
public function testParamConvertWithOptionWithFindPk()
{
$this->loadFixtures();
$paramConverter = new PropelParamConverter();
$request = new Request(array(), array(), array('id' => 10, 'author' => null));
$configuration = new ParamConverter(array(
'class' => 'Propel\PropelBundle\Tests\Request\ParamConverter\MyAuthor',
'name' => 'author',
'options' => array(
'with' => array(array('MyBook', 'left join')),
)
));
$nb = $this->con->getQueryCount();
$paramConverter->apply($request, $configuration);
$author = $request->attributes->get('author');
$this->assertInstanceOf('Propel\PropelBundle\Tests\Request\ParamConverter\MyAuthor', $author,
'param "author" should be an instance of "Propel\PropelBundle\Tests\Request\ParamConverter\MyAuthor"');
$this->assertEquals($nb + 1, $this->con->getQueryCount(), 'only one query to get the book');
$books = $author->getMyBooks();
$this->assertInstanceOf('PropelObjectCollection', $books);
$this->assertCount(2, $books, 'Author should have two books');
$this->assertEquals($nb + 1, $this->con->getQueryCount(), 'no new query to get the books');
}
protected function loadFixtures()
{
$this->loadPropelQuickBuilder();