8000 minor #36895 Skip Doctrine DBAL on php 8 until we have a compatible v… · symfony/symfony@2799d55 · GitHub
[go: up one dir, main page]
Skip to content

Commit 2799d55

Browse files
nicolas-grekasnicolas-grekas
committed
minor #36895 Skip Doctrine DBAL on php 8 until we have a compatible version (derrabus)
This PR was merged into the 3.4 branch. Discussion ---------- Skip Doctrine DBAL on php 8 until we have a compatible version | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | #36872 | License | MIT | Doc PR | N/A This PR skips all tests on php 8 that would trigger an autoload on DBAL's `PDOConnection`. Those tests would exit with a fatal error because of incompatible method signatures (see doctrine/dbal#3791) and until we can test against a compatible version of DBAL, there's (at least from my point of view) nothing we can do about it. Once this issue is resolved, we can revert this change. Commits ------- 1090738 Skip Doctrine DBAL on php 8 until we have a compatible version.
2 parents 410b621 + 1090738 commit 2799d55

File tree

7 files changed

+39
-1
lines changed

7 files changed

+39
-1
lines changed

‎src/Symfony/Bridge/Doctrine/Tests/Form/Type/EntityTypeTest.php‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,13 @@ class EntityTypeTest extends BaseTypeTest
6161

6262
protected static $supportedFeatureSetVersion = 304;
6363

64+
public static function setUpBeforeClass()
65+
{
66+
if (\PHP_VERSION_ID >= 80000) {
67+
self::markTestSkipped('Doctrine DBAL 2.x is incompatible with PHP 8.');
68+
}
69+
}
70+
6471
protected function setUp()
6572
{
6673
$this->em = DoctrineTestHelper::createTestEntityManager();

‎src/Symfony/Bridge/Doctrine/Tests/Security/User/EntityUserProviderTest.php‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,13 @@
2323

2424
class EntityUserProviderTest extends TestCase
2525
{
26+
public static function setUpBeforeClass()
27+
{
28+
if (\PHP_VERSION_ID >= 80000) {
29+
self::markTestSkipped('Doctrine DBAL 2.x is incompatible with PHP 8.');
30+
}
31+
}
32+
2633
public function testRefreshUserGetsUserByPrimaryKey()
2734
{
2835
$em = DoctrineTestHelper::createTestEntityManager();

‎src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueEntityValidatorTest.php‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,13 @@ class UniqueEntityValidatorTest extends ConstraintValidatorTestCase
6363

6464
protected $repositoryFactory;
6565

66+
public static function setUpBeforeClass()
67+
{
68+
if (\PHP_VERSION_ID >= 80000) {
69+
self::markTestSkipped('Doctrine DBAL 2.x is incompatible with PHP 8.');
70+
}
71+
}
72+
6673
protected function setUp()
6774
{
6875
$this->repositoryFactory = new TestRepositoryFactory();

‎src/Symfony/Bundle/SecurityBundle/Tests/Functional/SetAclCommandTest.php‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,13 @@ class SetAclCommandTest extends AbstractWebTestCase
4040
const OBJECT_CLASS = 'Symfony\Bundle\SecurityBundle\Tests\Functional\Bundle\AclBundle\Entity\Car';
4141
const SECURITY_CLASS = 'Symfony\Component\Security\Core\User\User';
4242

43+
public static function setUpBeforeClass()
44+
{
45+
if (\PHP_VERSION_ID >= 80000) {
46+
self::markTestSkipped('Doctrine DBAL 2.x is incompatible with PHP 8.');
47+
}
48+
}
49+
4350
public function testSetAclUser()
4451
{
4552
$objectId = 1;

‎src/Symfony/Component/Cache/Tests/Adapter/PdoDbalAdapterTest.php‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
namespace Symfony\Component\Cache\Tests\Adapter;
1313

1414
use Doctrine\DBAL\DriverManager;
15+
use Doctrine\DBAL\Version;
1516
use Symfony\Component\Cache\Adapter\PdoAdapter;
1617
use Symfony\Component\Cache\Tests\Traits\PdoPruneableTrait;
1718

@@ -30,6 +31,10 @@ public static function setUpBeforeClass()
3031
self::markTestSkipped('Extension pdo_sqlite required.');
3132
}
3233

34+
if (\PHP_VERSION_ID >= 80000 && class_exists(Version::class)) {
35+
self::markTestSkipped('Doctrine DBAL 2.x is incompatible with PHP 8.');
36+
}
37+
3338
self::$dbFile = tempnam(sys_get_temp_dir(), 'sf_sqlite_cache');
3439

3540
$pool = new PdoAdapter(DriverManager::getConnection(['driver' => 'pdo_sqlite', 'path' => self::$dbFile]));

‎src/Symfony/Component/Cache/Tests/Simple/PdoDbalCacheTest.php‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
namespace Symfony\Component\Cache\Tests\Simple;
1313

1414
use Doctrine\DBAL\DriverManager;
15+
use Doctrine\DBAL\Version;
1516
use Symfony\Component\Cache\Simple\PdoCache;
1617
use Symfony\Component\Cache\Tests\Traits\PdoPruneableTrait;
1718

@@ -30,6 +31,10 @@ public static function setUpBeforeClass()
3031
self::markTestSkipped('Extension pdo_sqlite required.');
3132
}
3233

34+
if (\PHP_VERSION_ID >= 80000 && class_exists(Version::class)) {
35+
self::markTestSkipped('Doctrine DBAL 2.x is incompatible with PHP 8.');
36+
}
37+
3338
self::$dbFile = tempnam(sys_get_temp_dir(), 'sf_sqlite_cache');
3439

3540
$pool = new PdoCache(DriverManager::getConnection(['driver' => 'pdo_sqlite', 'path' => self::$dbFile]));

‎src/Symfony/Component/Cache/composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"require-dev": {
3030
"cache/integration-tests": "dev-master",
3131
"doctrine/cache": "~1.6",
32-
"doctrine/dbal": "~2.4",
32+
"doctrine/dbal": "~2.4|~3.0",
3333
"predis/predis": "~1.0"
3434
},
3535
"conflict": {

0 commit comments

Comments
 (0)
0