Merge branch '7.1' into 7.2

derrabus · derrabus · commit da2043123e32 · 2024-09-19T10:58:59.000+02:00
* 7.1:
  Don't call the constructor of LogicalOr
  [AssetMapper] Use static data providers
  Fix `TemplateType` handling in `AbstractObjectNormalizer`
diff --git a/Test/ConstraintValidatorTestCase.php b/Test/ConstraintValidatorTestCase.php
@@ -224,8 +224,7 @@ protected function expectValidateAt(int $i, string $propertyPath, mixed $value,
     {
         $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
`@@ -224,8 +224,7 @@ protected function expectValidateAt(int $i, string $propertyPath, mixed $value,`
`224`	`224`	`{`
`225`	`225`	`$validator = $this->context->getValidator()->inContext($this->context);`
`226`	`226`	`$validator->expectValidation($i, $propertyPath, $value, $group, function ($passedConstraints) {`
`227`		`- $expectedConstraints = new LogicalOr();`
`228`		`- $expectedConstraints->setConstraints([new IsNull(), new IsIdentical([]), new IsInstanceOf(Valid::class)]);`
	`227`	`+ $expectedConstraints = LogicalOr::fromConstraints(new IsNull(), new IsIdentical([]), new IsInstanceOf(Valid::class));`
`229`	`228`
`230`	`229`	`Assert::assertThat($passedConstraints, $expectedConstraints);`
`231`	`230`	`});`