Catch only UninitializedPropertyException when getting a value per PropertyAcessor

ph-fritsche · ph-fritsche · commit 1e5cab1dc722 · 2020-05-19T11:21:44.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
@@ -52,12 +52,7 @@ 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;
-                    }
+                    $this->catchUninitializedPropertyException($e);
                 }
             } else {
                 $form->setData($config->getData());
@@ -118,7 +113,24 @@ private function getPropertyValue($data, $propertyPath)
         try {
             return $this->propertyAccessor->getValue($data, $propertyPath);
         } catch (AccessException $e) {
+
+            // The following line might be removed in future versions
+            // See https://github.com/symfony/symfony/issues/36754
+            $this->catchUninitializedPropertyException($e);
+
             return null;
         }
     }
+
+    /**
+     * Throw everything but UninitializedPropertyException
+     */
+    private function catchUninitializedPropertyException(AccessException $e) {
+        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;
+        }
+    }
 }
