Skip to content

Commit 328d642

Browse files
committed
Merge branch '4.4' into 5.1
* 4.4: Don't skip Doctrine tests on php 8. Stop using set-env in GitHub actions. Bump igbinary to v3.1.6 Add myself to CODEOWNERS for Form, OptionsResolver and TwigBundle Reference the correct interface in the RegistryInterface deprecation in upgrade notes Add myself to CODEOWNERS for Security and Console Add wouterj as codeowner for Security related packages
2 parents a82a67d + 274e2f0 commit 328d642

File tree

2 files changed

+0
-10
lines changed

2 files changed

+0
-10
lines changed

Tests/Store/PdoDbalStoreTest.php

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
use Doctrine\DBAL\Connection;
1515
use Doctrine\DBAL\DriverManager;
1616
use Doctrine\DBAL\Schema\Schema;
17-
use Doctrine\DBAL\Version;
1817
use Symfony\Component\Lock\PersistingStoreInterface;
1918
use Symfony\Component\Lock\Store\PdoStore;
2019

@@ -33,10 +32,6 @@ public static function setUpBeforeClass(): void
3332
{
3433
self::$dbFile = tempnam(sys_get_temp_dir(), 'sf_sqlite_lock');
3534

36-
if (\PHP_VERSION_ID >= 80000 && class_exists(Version::class)) {
37-
self::markTestSkipped('Doctrine DBAL 2.x is incompatible with PHP 8.');
38-
}
39-
4035
$store = new PdoStore(DriverManager::getConnection(['driver' => 'pdo_sqlite', 'path' => self::$dbFile]));
4136
$store->createTable();
4237
}

Tests/Store/PdoStoreTest.php

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111

1212
namespace Symfony\Component\Lock\Tests\Store;
1313

14-
use Doctrine\DBAL\Version;
1514
use Symfony\Component\Lock\Key;
1615
use Symfony\Component\Lock\PersistingStoreInterface;
1716
use Symfony\Component\Lock\Store\PdoStore;
@@ -31,10 +30,6 @@ public static function setUpBeforeClass(): void
3130
{
3231
self::$dbFile = tempnam(sys_get_temp_dir(), 'sf_sqlite_lock');
3332

34-
if (\PHP_VERSION_ID >= 80000 && class_exists(Version::class)) {
35-
self::markTestSkipped('Doctrine DBAL 2.x is incompatible with PHP 8.');
36-
}
37-
3833
$store = new PdoStore('sqlite:'.self::$dbFile);
3934
$store->createTable();
4035
}

0 commit comments

Comments
 (0)