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

Modified the PropelParamConverter to allow CamelCased parameters

Browse source 
Currently, parameters like "author_slug" are translated by the param
converter to a "->filterByAuthor_slug()" call. I changed this behavior
and they are now translated to "->filterByAuthorSlug()".
This commit is contained in:
kphoen 2012-05-19 14:17:23 +02:00 committed by William DURAND
parent 23878219c5
commit b54cf4ab3f
3 changed files with 33 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Request/ParamConverter/PropelParamConverter.php
View file

@ -2,6 +2,7 @@
namespace Propel\PropelBundle\Request\ParamConverter;
use Propel\PropelBundle\Util\PropelInflector;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\ConfigurationInterface;
use Sensio\Bundle\FrameworkExtraBundle\Request\ParamConverter\ParamConverterInterface;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
@ -62,7 +63,7 @@ class PropelParamConverter implements ParamConverterInterface
foreach ($request->attributes->all() as $key => $value) {
if (!in_array($key, $exclude)) {
try {
$query->{'filterBy' . ucfirst($key)}($value);
$query->{'filterBy' . PropelInflector::camelize($key)}($value);
$hasCriteria = true;
} catch (\PropelException $e) { }
}

20
Tests/Fixtures/Model/BookQuery.php
View file

@ -18,6 +18,7 @@ use Propel\PropelBundle\Tests\Fixtures\Model\om\BaseBookQuery;
class BookQuery extends BaseBookQuery {
private $bySlug = false;
private $byAuthorSlug = false;
/**
* fake for test
@ -34,6 +35,18 @@ class BookQuery extends BaseBookQuery {
return null;
}
/**
* fake for test
*/
public function filterByAuthorSlug($slug = null, $comparison = null)
{
if ('my-author' === $slug) {
$this->byAuthorSlug = true;
}
return $this;
}
/**
* fake for test
*/
@ -65,6 +78,13 @@ class BookQuery extends BaseBookQuery {
$book->setName('My Book');
$book->setSlug('my-book');
return $book;
} else if (true === $this->byAuthorSlug) {
$book = new Book();
$book->setId(2);
$book->setName('My Kewl Book');
$book->setSlug('my-kewl-book');
return $book;
}

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

@ -65,6 +65,17 @@ class PropelParamConverterTest extends TestCase
'param "book" should be an instance of "Propel\PropelBundle\Tests\Fixtures\Model\Book"');
}
public function testParamConverterFindCamelCasedSlug()
{
$paramConverter = new PropelParamConverter();
$request = new Request(array(), array(), array('author_slug' => 'my-author', 'slug' => 'my-kewl-book', 'book' => null));
$configuration = new ParamConverter(array('class' => 'Propel\PropelBundle\Tests\Fixtures\Model\Book', 'name' => 'book'));
$paramConverter->apply($request, $configuration);
$this->assertInstanceOf('Propel\PropelBundle\Tests\Fixtures\Model\Book',$request->attributes->get('book'),
'param "book" should be an instance of "Propel\PropelBundle\Tests\Fixtures\Model\Book"');
}
/**
* @expectedException Symfony\Component\HttpKernel\Exception\NotFoundHttpException
*/