minor #51778 [Console][Form][FrameworkBundle][HttpKernel][PropertyInfo][Validator][WebProfilerBundle] Remove optional before required param (HypeMC)

nicolas-grekas · nicolas-grekas · commit 815a0cfcbf9d · 2023-09-29T18:31:58.000+02:00
This PR was merged into the 6.4 branch. Discussion ---------- [Console][Form][FrameworkBundle][HttpKernel][PropertyInfo][Validator][WebProfilerBundle] Remove optional before required param | Q | A | ------------- | --- | Branch? | 6.4 | Bug fix? | no | New feature? | no | Deprecations? | no | Tickets | - | License | MIT I'm guessing this trick was used to make arguments nullable for PHP prior to 7.1, but since Symfony now requires at least PHP 8.1 it shouldn't be necessary any more. As far as I can tell there's no breaking change: https://3v4l.org/USkgi . There are still four places that this is used, but I believe those to be intentional test cases: https://github.com/symfony/symfony/blob/38506585012540306b4a7166a4812d35ad6b8a3c/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/autowiring_classes.php#L179-L184 https://github.com/symfony/symfony/blob/38506585012540306b4a7166a4812d35ad6b8a3c/src/Symfony/Component/DependencyInjection/Tests/Fixtures/includes/MultipleArgumentsOptionalScalarNotReallyOptional.php#L8-L13 https://github.com/symfony/symfony/blob/38506585012540306b4a7166a4812d35ad6b8a3c/src/Symfony/Component/VarDumper/Tests/Caster/ReflectionCasterTest.php#L653-L655 https://github.com/symfony/symfony/blob/38506585012540306b4a7166a4812d35ad6b8a3c/src/Symfony/Component/HttpKernel/Tests/DependencyInjection/RegisterControllerArgumentLocatorsPassTest.php#L589-L598 Commits ------- 426c4e012a [FrameworkBundle][WebProfilerBundle][Console][Form][HttpKernel][PropertyInfo][Validator] Remove optional before required param
diff --git a/Context/ExecutionContext.php b/Context/ExecutionContext.php
@@ -121,7 +121,7 @@ public function __construct(ValidatorInterface $validator, mixed $root, Translat
         $this->cachedObjectsRefs = new \SplObjectStorage();
     }
 
-    public function setNode(mixed $value, ?object $object, MetadataInterface $metadata = null, string $propertyPath): void
+    public function setNode(mixed $value, ?object $object, ?MetadataInterface $metadata, string $propertyPath): void
     {
         $this->value = $value;
         $this->object = $object;
diff --git a/Context/ExecutionContextInterface.php b/Context/ExecutionContextInterface.php
@@ -126,7 +126,7 @@ public function getObject(): ?object;
      *
      * @return void
      */
-    public function setNode(mixed $value, ?object $object, MetadataInterface $metadata = null, string $propertyPath);
+    public function setNode(mixed $value, ?object $object, ?MetadataInterface $metadata, string $propertyPath);
 
     /**
      * Warning: Should not be called by user code, to be used by the validator engine only.

Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@ public function __construct(ValidatorInterface $validator, mixed $root, Translat`
`121`	`121`	`$this->cachedObjectsRefs = new \SplObjectStorage();`
`122`	`122`	`}`
`123`	`123`
`124`		`- public function setNode(mixed $value, ?object $object, MetadataInterface $metadata = null, string $propertyPath): void`
	`124`	`+ public function setNode(mixed $value, ?object $object, ?MetadataInterface $metadata, string $propertyPath): void`
`125`	`125`	`{`
`126`	`126`	`$this->value = $value;`
`127`	`127`	`$this->object = $object;`
Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,7 @@ public function getObject(): ?object;`
`126`	`126`	`*`
`127`	`127`	`* @return void`
`128`	`128`	`*/`
`129`		`- public function setNode(mixed $value, ?object $object, MetadataInterface $metadata = null, string $propertyPath);`
	`129`	`+ public function setNode(mixed $value, ?object $object, ?MetadataInterface $metadata, string $propertyPath);`
`130`	`130`
`131`	`131`	`/**`
`132`	`132`	`* Warning: Should not be called by user code, to be used by the validator engine only.`