Be specific about ignored AccessExceptions when mapping to form

ph-fritsche · ph-fritsche · commit 39b4abe0d9e7 · 2020-04-19T20:18:10.000+02:00
diff --git a/src/Symfony/Component/Form/Extension/Core/DataMapper/PropertyPathMapper.php b/src/Symfony/Component/Form/Extension/Core/DataMapper/PropertyPathMapper.php
@@ -14,6 +14,7 @@
 use Symfony\Component\Form\DataMapperInterface;
 use Symfony\Component\Form\Exception\UnexpectedTypeException;
 use Symfony\Component\PropertyAccess\Exception\AccessException;
+use Symfony\Component\PropertyAccess\Exception\UninitializedPropertyException;
 use Symfony\Component\PropertyAccess\PropertyAccess;
 use Symfony\Component\PropertyAccess\PropertyAccessorInterface;
 
@@ -51,6 +52,12 @@ public function mapDataToForms($data, $forms)
                     $form->setData($this->propertyAccessor->getValue($data, $propertyPath));
                 } catch (AccessException $e) {
                     // Skip unitialized properties on $data
+                    if (!$e instanceof UninitializedPropertyException
+                        // For versions without UninitializedPropertyException check the exception message
+                        && (class_exists(UninitializedPropertyException::class) || false === strpos($e->getMessage(), 'You should initialize it'))
+                    ) {
+                        throw $e;
+                    }
                 }
             } else {
                 $form->setData($config->getData());
