bug #58316 [Form] Don't call the constructor of LogicalOr (derrabus)

derrabus · derrabus · commit 8797be81f6f4 · 2024-09-19T10:54:42.000+02:00
This PR was merged into the 5.4 branch. Discussion ---------- [Form] Don't call the constructor of LogicalOr | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Issues | N/A | License | MIT This PR fixes an incompatibility of our `ConstraintValidatorTestCase` with PHPUnit 11. In PHPUnit 11, the constructors of `LogicalOr` and friends are protected. The static constructor `fromConstraints()` is the proper replacement and has existed since PHPUnit 6. Commits ------- b5fc170 Don't call the constructor of LogicalOr
diff --git a/src/Symfony/Component/Validator/Test/ConstraintValidatorTestCase.php b/src/Symfony/Component/Validator/Test/ConstraintValidatorTestCase.php
@@ -234,8 +234,7 @@ protected function expectValidateAt(int $i, string $propertyPath, $value, $group
     {
         $validator = $this->context->getValidator()->inContext($this->context);
         $validator->expectValidation($i, $propertyPath, $value, $group, function ($passedConstraints) {
-            $expectedConstraints = new LogicalOr();
-            $expectedConstraints->setConstraints([new IsNull(), new IsIdentical([]), new IsInstanceOf(Valid::class)]);
+            $expectedConstraints = LogicalOr::fromConstraints(new IsNull(), new IsIdentical([]), new IsInstanceOf(Valid::class));
 
             Assert::assertThat($passedConstraints, $expectedConstraints);
         });

Original file line number	Diff line number	Diff line change
`@@ -234,8 +234,7 @@ protected function expectValidateAt(int $i, string $propertyPath, $value, $group`
`234`	`234`	`{`
`235`	`235`	`$validator = $this->context->getValidator()->inContext($this->context);`
`236`	`236`	`$validator->expectValidation($i, $propertyPath, $value, $group, function ($passedConstraints) {`
`237`		`- $expectedConstraints = new LogicalOr();`
`238`		`- $expectedConstraints->setConstraints([new IsNull(), new IsIdentical([]), new IsInstanceOf(Valid::class)]);`
	`237`	`+ $expectedConstraints = LogicalOr::fromConstraints(new IsNull(), new IsIdentical([]), new IsInstanceOf(Valid::class));`
`239`	`238`
`240`	`239`	`Assert::assertThat($passedConstraints, $expectedConstraints);`
`241`	`240`	`});`