Merge branch '5.3' into 5.4

nicolas-grekas · nicolas-grekas · commit 569c18a4b3fe · 2021-12-01T16:04:08.000+01:00
* 5.3:
  [gha] swap the php versions we use in jobs
  [DoctrineBridge] fix calling get_class on non-object
  Update PR template
  [HttpClient] Fix handling error info in MockResponse
diff --git a/Tests/ConstraintValidatorTest.php b/Tests/ConstraintValidatorTest.php
@@ -15,13 +15,15 @@
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\ConstraintValidator;
 
-final class ConstraintValidatorTest extends TestCase
+class ConstraintValidatorTest extends TestCase
 {
     /**
      * @dataProvider formatValueProvider
      */
     public function testFormatValue($expected, $value, $format = 0)
     {
+        \Locale::setDefault('en');
+
         $this->assertSame($expected, (new TestFormatValueConstraintValidator())->formatValueProxy($value, $format));
     }
 
diff --git a/composer.json b/composer.json
@@ -47,7 +47,7 @@
     "conflict": {
         "doctrine/annotations": "<1.13",
         "doctrine/cache": "<1.11",
-        "doctrine/lexer": "<1.0.2",
+        "doctrine/lexer": "<1.1",
         "phpunit/phpunit": "<5.4.3",
         "symfony/dependency-injection": "<4.4",
         "symfony/expression-language": "<5.1",

Original file line number	Diff line number	Diff line change
`@@ -15,13 +15,15 @@`
`15`	`15`	`use Symfony\Component\Validator\Constraint;`
`16`	`16`	`use Symfony\Component\Validator\ConstraintValidator;`
`17`	`17`
`18`		`-final class ConstraintValidatorTest extends TestCase`
	`18`	`+class ConstraintValidatorTest extends TestCase`
`19`	`19`	`{`
`20`	`20`	`/**`
`21`	`21`	`* @dataProvider formatValueProvider`
`22`	`22`	`*/`
`23`	`23`	`public function testFormatValue($expected, $value, $format = 0)`
`24`	`24`	`{`
	`25`	`+ \Locale::setDefault('en');`
	`26`	`+`
`25`	`27`	`$this->assertSame($expected, (new TestFormatValueConstraintValidator())->formatValueProxy($value, $format));`
`26`	`28`	`}`
`27`	`29`