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:55:55 -04:00
parent 7ae4be0062 ab0c27c481
commit 4a889406e9
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Tests/Transformer/ModelToElasticaAutoTransformerTest.php
View file

@ -206,8 +206,8 @@ class ModelToElasticaAutoTransformerTest extends \PHPUnit_Framework_TestCase
/* 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'
$expectedException = class_exists('Symfony\Component\PropertyAccess\Exception\PropertyAccessDeniedException')
? 'Symfony\Component\PropertyAccess\Exception\PropertyAccessDeniedException'
: 'Symfony\Component\PropertyAccess\Exception\NoSuchPropertyException';
$this->setExpectedException($expectedException);