[PropertyAccess] Fix nullsafe chain like x?.y

Vincz · nicolas-grekas · commit 92db0030aad1 · 2022-12-23T09:18:26.000+01:00
diff --git a/src/Symfony/Component/PropertyAccess/PropertyAccessor.php b/src/Symfony/Component/PropertyAccess/PropertyAccessor.php
@@ -345,6 +345,10 @@ private function readPropertiesUntil(array $zval, PropertyPathInterface $propert
             }
 
             $propertyValues[] = $zval;
+
+            if ($isNullSafe && null === $zval[self::VALUE]) {
+                break;
+            }
         }
 
         return $propertyValues;
diff --git a/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorTest.php b/src/Symfony/Component/PropertyAccess/Tests/PropertyAccessorTest.php
@@ -569,6 +569,11 @@ public function getValidReadPropertyPaths(): iterable
         yield [(object) [], 'foo?', null];
         yield [(object) ['foo' => (object) ['firstName' => 'Bernhard']], 'foo.bar?', null];
         yield [(object) ['foo' => (object) ['firstName' => 'Bernhard']], 'foo.bar?.baz?', null];
+        yield [(object) ['foo' => null], 'foo?.bar', null];
+        yield [(object) ['foo' => null], 'foo?.bar.baz', null];
+        yield [(object) ['foo' => (object) ['bar' => null]], 'foo?.bar?.baz', null];
+        yield [(object) ['foo' => (object) ['bar' => null]], 'foo.bar?.baz', null];
+        yield [(object) ['foo' => ['bar' => null]], 'foo[bar?].baz', null];
         yield [[], '[foo?]', null];
         yield [['foo' => ['firstName' => 'Bernhard']], '[foo][bar?]', null];
         yield [['foo' => ['firstName' => 'Bernhard']], '[foo][bar?][baz?]', null];

Original file line number	Diff line number	Diff line change
`@@ -345,6 +345,10 @@ private function readPropertiesUntil(array $zval, PropertyPathInterface $propert`
`345`	`345`	`}`
`346`	`346`
`347`	`347`	`$propertyValues[] = $zval;`
	`348`	`+`
	`349`	`+ if ($isNullSafe && null === $zval[self::VALUE]) {`
	`350`	`+ break;`
	`351`	`+ }`
`348`	`352`	`}`
`349`	`353`
`350`	`354`	`return $propertyValues;`