Merge branch '5.1' into 5.2

xabbuh · xabbuh · commit 8742bcc1faa4 · 2021-01-08T08:59:15.000+01:00
* 5.1:
  fix PHP 8 compatibility
diff --git a/Tests/Compiler/CheckTypeDeclarationsPassTest.php b/Tests/Compiler/CheckTypeDeclarationsPassTest.php
@@ -916,7 +916,7 @@ public function testUnionTypeWithFalseFailsWithTrue()
             ->setArguments([true]);
 
         $this->expectException(\Symfony\Component\DependencyInjection\Exception\InvalidArgumentException::class);
-        $this->expectExceptionMessage('Invalid definition for service "union": argument 1 of "Symfony\Component\DependencyInjection\Tests\Fixtures\CheckTypeDeclarationsPass\UnionConstructor::create()" accepts "array|false", "boolean" passed.');
+        $this->expectExceptionMessage('Invalid definition for service "union": argument 1 of "Symfony\Component\DependencyInjection\Tests\Fixtures\CheckTypeDeclarationsPass\UnionConstructor::create()" accepts "array|false", "bool" passed.');
 
         (new CheckTypeDeclarationsPass(true))->process($container);
     }

Original file line number	Diff line number	Diff line change
`@@ -916,7 +916,7 @@ public function testUnionTypeWithFalseFailsWithTrue()`
`916`	`916`	`->setArguments([true]);`
`917`	`917`
`918`	`918`	`$this->expectException(\Symfony\Component\DependencyInjection\Exception\InvalidArgumentException::class);`
`919`		`- $this->expectExceptionMessage('Invalid definition for service "union": argument 1 of "Symfony\Component\DependencyInjection\Tests\Fixtures\CheckTypeDeclarationsPass\UnionConstructor::create()" accepts "array\|false", "boolean" passed.');`
	`919`	`+ $this->expectExceptionMessage('Invalid definition for service "union": argument 1 of "Symfony\Component\DependencyInjection\Tests\Fixtures\CheckTypeDeclarationsPass\UnionConstructor::create()" accepts "array\|false", "bool" passed.');`
`920`	`920`
`921`	`921`	`(new CheckTypeDeclarationsPass(true))->process($container);`
`922`	`922`	`}`