Merge branch '4.4' into 5.2

nicolas-grekas · nicolas-grekas · commit 4cc610479ffa · 2021-05-26T19:55:25.000+02:00
* 4.4:
  [PhpUnitBridge] fix PHP version check
  keep container.service_subscriber tag on the decorated definition
diff --git a/ConstraintTrait.php b/ConstraintTrait.php
@@ -25,7 +25,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
`@@ -25,7 +25,7 @@ trait ConstraintTrait`
`25`	`25`	`{`
`26`	`26`	`use Legacy\ConstraintTraitForV7;`
`27`	`27`	`}`
`28`		`-} elseif (\PHP_VERSION < 70100 \|\| !$r->getMethod('evaluate')->hasReturnType()) {`
	`28`	`+} elseif (\PHP_VERSION_ID < 70100 \|\| !$r->getMethod('evaluate')->hasReturnType()) {`
`29`	`29`	`trait ConstraintTrait`
`30`	`30`	`{`
`31`	`31`	`use Legacy\ConstraintTraitForV8;`