Merge branch '5.3' into 5.4

nicolas-grekas · nicolas-grekas · commit 0c53746f83b0 · 2021-05-27T14:29:48.000+02:00
* 5.3:
  [VarDumper] fix tests
  [Intl] fix bad merge
  Remove notice about reverted behavior
  [PhpUnitBridge] fix PHP version check
  keep container.service_subscriber tag on the decorated definition
diff --git a/ConstraintTrait.php b/ConstraintTrait.php
@@ -20,7 +20,7 @@ trait ConstraintTrait
     {
         use Legacy\ConstraintTraitForV7;
     }
-} elseif (\PHP_VERSION < 70100 || !$r->getMethod('evaluate')->hasReturnType()) {
+} elseif (\PHP_VERSION_ID < 70100 || !$r->getMethod('evaluate')->hasReturnType()) {
     trait ConstraintTrait
     {
         use Legacy\ConstraintTraitForV8;

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ trait ConstraintTrait`
`20`	`20`	`{`
`21`	`21`	`use Legacy\ConstraintTraitForV7;`
`22`	`22`	`}`
`23`		`-} elseif (\PHP_VERSION < 70100 \|\| !$r->getMethod('evaluate')->hasReturnType()) {`
	`23`	`+} elseif (\PHP_VERSION_ID < 70100 \|\| !$r->getMethod('evaluate')->hasReturnType()) {`
`24`	`24`	`trait ConstraintTrait`
`25`	`25`	`{`
`26`	`26`	`use Legacy\ConstraintTraitForV8;`