Merge branch '5.1'

nicolas-grekas · nicolas-grekas · commit b4139fc229b2 · 2020-05-23T15:10:26.000+02:00
* 5.1: (33 commits) [Cache] $lifetime cannot be null [Serializer] minor cleanup fix merge Run PHP 8 as 7.4.99 Remove calls to deprecated ReflectionParameter::getClass(). [VarDumper] fix PHP 8 support Removed "services" prototype node from "custom_authenticator" Add php 8 to travis. [Cache] Accessing undefined constants raises an Error in php8 [Cache] allow DBAL v3 Skip Doctrine DBAL on php 8 until we have a compatible version. [DomCrawler] Catch expected ValueError. Made method signatures compatible with their corresponding traits. [ErrorHandler] Apply php8 fixes from Debug component. [DomCrawler] Catch expected ValueError. [Validator] Catch expected ValueError. [VarDumper] ReflectionFunction::isDisabled() is deprecated. [BrowserKit] Raw body with custom Content-Type header Revert symfony/symfony#34986 Make ExpressionLanguageSyntax validator usable with annotation ...
diff --git a/Tests/Form/Type/EntityTypeTest.php b/Tests/Form/Type/EntityTypeTest.php
@@ -60,6 +60,13 @@ class EntityTypeTest extends BaseTypeTest
 
     protected static $supportedFeatureSetVersion = 404;
 
+    public static function setUpBeforeClass(): void
+    {
+        if (\PHP_VERSION_ID >= 80000) {
+            self::markTestSkipped('Doctrine DBAL 2.x is incompatible with PHP 8.');
+        }
+    }
+
     protected function setUp(): void
     {
         $this->em = DoctrineTestHelper::createTestEntityManager();
diff --git a/Tests/Security/User/EntityUserProviderTest.php b/Tests/Security/User/EntityUserProviderTest.php
@@ -24,6 +24,13 @@
 
 class EntityUserProviderTest extends TestCase
 {
+    public static function setUpBeforeClass(): void
+    {
+        if (\PHP_VERSION_ID >= 80000) {
+            self::markTestSkipped('Doctrine DBAL 2.x is incompatible with PHP 8.');
+        }
+    }
+
     public function testRefreshUserGetsUserByPrimaryKey()
     {
         $em = DoctrineTestHelper::createTestEntityManager();
diff --git a/Tests/Validator/Constraints/UniqueEntityValidatorTest.php b/Tests/Validator/Constraints/UniqueEntityValidatorTest.php
@@ -59,6 +59,13 @@ class UniqueEntityValidatorTest extends ConstraintValidatorTestCase
 
     protected $repositoryFactory;
 
+    public static function setUpBeforeClass(): void
+    {
+        if (\PHP_VERSION_ID >= 80000) {
+            self::markTestSkipped('Doctrine DBAL 2.x is incompatible with PHP 8.');
+        }
+    }
+
     protected function setUp(): void
     {
         $this->repositoryFactory = new TestRepositoryFactory();

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,13 @@`
`24`	`24`
`25`	`25`	`class EntityUserProviderTest extends TestCase`
`26`	`26`	`{`
	`27`	`+ public static function setUpBeforeClass(): void`
	`28`	`+ {`
	`29`	`+ if (\PHP_VERSION_ID >= 80000) {`
	`30`	`+ self::markTestSkipped('Doctrine DBAL 2.x is incompatible with PHP 8.');`
	`31`	`+ }`
	`32`	`+ }`
	`33`	`+`
`27`	`34`	`public function testRefreshUserGetsUserByPrimaryKey()`
`28`	`35`	`{`
`29`	`36`	`$em = DoctrineTestHelper::createTestEntityManager();`