Merge branch '6.4' into 7.1

nicolas-grekas · nicolas-grekas · commit 0dd4a44b805a · 2024-08-30T18:12:47.000+02:00
* 6.4:
  Fix expected missing return types
  [VarDumper] Fix tests
diff --git a/.github/expected-missing-return-types.diff b/.github/expected-missing-return-types.diff
@@ -189,13 +189,13 @@ diff --git a/src/Symfony/Component/EventDispatcher/EventSubscriberInterface.php
 diff --git a/src/Symfony/Component/ExpressionLanguage/ExpressionLanguage.php b/src/Symfony/Component/ExpressionLanguage/ExpressionLanguage.php
 --- a/src/Symfony/Component/ExpressionLanguage/ExpressionLanguage.php
 +++ b/src/Symfony/Component/ExpressionLanguage/ExpressionLanguage.php
-@@ -139,5 +139,5 @@ class ExpressionLanguage
+@@ -149,5 +149,5 @@ class ExpressionLanguage
       * @return void
       */
 -    protected function registerFunctions()
 +    protected function registerFunctions(): void
      {
-         $this->addFunction(ExpressionFunction::fromPhp('constant'));
+         $basicPhpFunctions = ['constant', 'min', 'max'];
 diff --git a/src/Symfony/Component/Form/AbstractType.php b/src/Symfony/Component/Form/AbstractType.php
 --- a/src/Symfony/Component/Form/AbstractType.php
 +++ b/src/Symfony/Component/Form/AbstractType.php
diff --git a/src/Symfony/Component/PropertyAccess/PropertyAccessor.php b/src/Symfony/Component/PropertyAccess/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];
         }
 
diff --git a/src/Symfony/Component/VarDumper/Tests/Dumper/CliDumperTest.php b/src/Symfony/Component/VarDumper/Tests/Dumper/CliDumperTest.php
@@ -343,7 +343,7 @@ public function testThrowingCaster()
     #message: "Unexpected Exception thrown from a caster: Foobar"
     trace: {
       %sTwig.php:2 {
-        __TwigTemplate_VarDumperFixture_u75a09->doDisplay(array \$context, array \$blocks = [])
+        __TwigTemplate_VarDumperFixture_u75a09->doDisplay(array \$context, array \$blocks = []): array
         › foo bar
         ›   twig source
         › 
diff --git a/src/Symfony/Component/VarDumper/Tests/Fixtures/Twig.php b/src/Symfony/Component/VarDumper/Tests/Fixtures/Twig.php
@@ -28,7 +28,7 @@ public function __construct(?Twig\Environment $env = null, $path = null)
         $this->path = $path;
     }
 
-    protected function doDisplay(array $context, array $blocks = [])
+    protected function doDisplay(array $context, array $blocks = []): array
     {
         // line 2
         throw new \Exception('Foobar');

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`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ public function __construct(?Twig\Environment $env = null, $path = null)`
`28`	`28`	`$this->path = $path;`
`29`	`29`	`}`
`30`	`30`
`31`		`- protected function doDisplay(array $context, array $blocks = [])`
	`31`	`+ protected function doDisplay(array $context, array $blocks = []): array`
`32`	`32`	`{`
`33`	`33`	`// line 2`
`34`	`34`	`throw new \Exception('Foobar');`