Skip to content

Commit 33d49e3

Browse files
Merge branch '7.1' into 7.2
* 7.1: Fix expected missing return types [VarDumper] Fix tests
2 parents e0ed5ee + 0dd4a44 commit 33d49e3

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

src/Symfony/Component/PropertyAccess/PropertyAccessor.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ public function getValue(object|array $objectOrArray, string|PropertyPathInterfa
9898
self::VALUE => $objectOrArray,
9999
];
100100

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))) {
102102
return $this->readProperty($zval, $propertyPath, $this->ignoreInvalidProperty)[self::VALUE];
103103
}
104104

src/Symfony/Component/VarDumper/Tests/Dumper/CliDumperTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,7 @@ public function testThrowingCaster()
359359
#message: "Unexpected Exception thrown from a caster: Foobar"
360360
trace: {
361361
%sTwig.php:2 {
362-
__TwigTemplate_VarDumperFixture_u75a09->doDisplay(array \$context, array \$blocks = [])
362+
__TwigTemplate_VarDumperFixture_u75a09->doDisplay(array \$context, array \$blocks = []): array
363363
› foo bar
364364
› twig source
365365

src/Symfony/Component/VarDumper/Tests/Fixtures/Twig.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public function __construct(?Twig\Environment $env = null, $path = null)
2828
$this->path = $path;
2929
}
3030

31-
protected function doDisplay(array $context, array $blocks = [])
31+
protected function doDisplay(array $context, array $blocks = []): array
3232
{
3333
// line 2
3434
throw new \Exception('Foobar');

0 commit comments

Comments
 (0)