Merge branch '5.4' into 6.2

nicolas-grekas · nicolas-grekas · commit 56965fae0b6b · 2023-02-16T10:57:23.000+01:00
* 5.4:
  CS fix
  Fix test provider
diff --git a/ConstraintTrait.php b/ConstraintTrait.php
@@ -12,9 +12,8 @@
 namespace Symfony\Bridge\PhpUnit;
 
 use PHPUnit\Framework\Constraint\Constraint;
-use ReflectionClass;
 
-$r = new ReflectionClass(Constraint::class);
+$r = new \ReflectionClass(Constraint::class);
 if ($r->getProperty('exporter')->isProtected()) {
     trait ConstraintTrait
     {
diff --git a/Tests/ExpectDeprecationTraitTest.php b/Tests/ExpectDeprecationTraitTest.php
@@ -33,6 +33,7 @@ public function testOne()
      * Do not remove this test in the next major version.
      *
      * @group legacy
+     *
      * @runInSeparateProcess
      */
     public function testOneInIsolation()
diff --git a/Tests/FailTests/ExpectDeprecationTraitTestFail.php b/Tests/FailTests/ExpectDeprecationTraitTestFail.php
@@ -39,6 +39,7 @@ public function testOne()
      * Do not remove this test in the next major version.
      *
      * @group legacy
+     *
      * @runInSeparateProcess
      */
     public function testOneInIsolation()

Original file line number	Diff line number	Diff line change
`@@ -12,9 +12,8 @@`
`12`	`12`	`namespace Symfony\Bridge\PhpUnit;`
`13`	`13`
`14`	`14`	`use PHPUnit\Framework\Constraint\Constraint;`
`15`		`-use ReflectionClass;`
`16`	`15`
`17`		`-$r = new ReflectionClass(Constraint::class);`
	`16`	`+$r = new \ReflectionClass(Constraint::class);`
`18`	`17`	`if ($r->getProperty('exporter')->isProtected()) {`
`19`	`18`	`trait ConstraintTrait`
`20`	`19`	`{`
Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,7 @@ public function testOne()`
`33`	`33`	`* Do not remove this test in the next major version.`
`34`	`34`	`*`
`35`	`35`	`* @group legacy`
	`36`	`+ *`
`36`	`37`	`* @runInSeparateProcess`
`37`	`38`	`*/`
`38`	`39`	`public function testOneInIsolation()`
Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,7 @@ public function testOne()`
`39`	`39`	`* Do not remove this test in the next major version.`
`40`	`40`	`*`
`41`	`41`	`* @group legacy`
	`42`	`+ *`
`42`	`43`	`* @runInSeparateProcess`
`43`	`44`	`*/`
`44`	`45`	`public function testOneInIsolation()`