deblan/FOSElasticaBundle
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch '2.0.x' into 2.1.x

Browse source 
Conflicts:
	Tests/Transformer/ModelToElasticaAutoTransformerTest.php
This commit is contained in:
Jeremy Mikola 2013-07-17 15:49:09 -04:00
parent 2dfbfffbd0 a66a37aebd
commit 7ae4be0062
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Tests/Transformer/ModelToElasticaAutoTransformerTest.php
View file

@ -203,7 +203,14 @@ class ModelToElasticaAutoTransformerTest extends \PHPUnit_Framework_TestCase
public function testThatCannotTransformObjectWhenGetterDoesNotExistForPrivateMethod()
{
$this->setExpectedException('Symfony\Component\PropertyAccess\Exception\PropertyAccessDeniedException');
/* ProperyAccess 2.3+ removed PropertyAccessDeniedException, so we
* must expect NoSuchPropertyException in its absence.
*/
$expectedException = class_exists('Symfony\Component\Form\Exception\PropertyAccessDeniedException')
? 'Symfony\Component\Form\Exception\PropertyAccessDeniedException'
: 'Symfony\Component\PropertyAccess\Exception\NoSuchPropertyException';
$this->setExpectedException($expectedException);
$transformer = $this->getTransformer();
$transformer->transform(new POPO(), array('desc' => array()));