Merge branch '6.4' into 7.1

nicolas-grekas · nicolas-grekas · commit 6c709f971033 · 2024-08-30T18:12:47.000+02:00
* 6.4:
  Fix expected missing return types
  [VarDumper] Fix tests
diff --git a/PropertyAccessor.php b/PropertyAccessor.php
@@ -98,7 +98,7 @@ public function getValue(object|array $objectOrArray, string|PropertyPathInterfa
             self::VALUE => $objectOrArray,
         ];
 
-        if (\is_object($objectOrArray) && false === strpbrk((string) $propertyPath, '.[?') || $objectOrArray instanceof \stdClass && property_exists($objectOrArray, $propertyPath))) {
+        if (\is_object($objectOrArray) && (false === strpbrk((string) $propertyPath, '.[?') || $objectOrArray instanceof \stdClass && property_exists($objectOrArray, $propertyPath))) {
             return $this->readProperty($zval, $propertyPath, $this->ignoreInvalidProperty)[self::VALUE];
         }
 

Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ public function getValue(object\|array $objectOrArray, string\|PropertyPathInterfa`
`98`	`98`	`self::VALUE => $objectOrArray,`
`99`	`99`	`];`
`100`	`100`
`101`		`- if (\is_object($objectOrArray) && false === strpbrk((string) $propertyPath, '.[?') \|\| $objectOrArray instanceof \stdClass && property_exists($objectOrArray, $propertyPath))) {`
	`101`	`+ if (\is_object($objectOrArray) && (false === strpbrk((string) $propertyPath, '.[?') \|\| $objectOrArray instanceof \stdClass && property_exists($objectOrArray, $propertyPath))) {`
`102`	`102`	`return $this->readProperty($zval, $propertyPath, $this->ignoreInvalidProperty)[self::VALUE];`
`103`	`103`	`}`
`104`	`104`