Merge pull request #338 from FriendsOfSymfony/2.0.x-property-access

Fix missing getter for private field test for PropertyAccess 2.3+
FriendsOfSymfony · Jul 17, 2013 · a66a37a · a66a37a
2 parents cd48a36 + 9e2e8ab
commit a66a37a
Showing 1 changed file with 11 additions and 4 deletions.
diff --git a/Tests/Transformer/ModelToElasticaAutoTransformerTest.php b/Tests/Transformer/ModelToElasticaAutoTransformerTest.php
@@ -203,10 +203,17 @@ public function testThatNullValuesAreNotFilteredOut()
 
     public function testThatCannotTransformObjectWhenGetterDoesNotExistForPrivateMethod()
     {
-        // Support both Symfony 2.1 (Form component) and 2.2 (PropertyAccess component)
-        $expectedException = class_exists('Symfony\Component\PropertyAccess\PropertyAccess')
-            ? 'Symfony\Component\PropertyAccess\Exception\PropertyAccessDeniedException'
-            : 'Symfony\Component\Form\Exception\PropertyAccessDeniedException';
+        // Support both Symfony 2.1 (Form component) and 2.2+ (PropertyAccess component)
+        if (class_exists('Symfony\Component\PropertyAccess\PropertyAccess')) {
+            /* 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';
+        } else {
+            $expectedException = 'Symfony\Component\Form\Exception\PropertyAccessDeniedException';
+        }
 
         $this->setExpectedException($expectedException);