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
This commit is contained in:
commit
5578239608
16
.github/CODEOWNERS
vendored
16
.github/CODEOWNERS
vendored
@ -1,9 +1,10 @@
|
|||||||
# Console
|
# Console
|
||||||
|
/src/Symfony/Component/Console/ @chalasr
|
||||||
/src/Symfony/Component/Console/Logger/ConsoleLogger.php @dunglas
|
/src/Symfony/Component/Console/Logger/ConsoleLogger.php @dunglas
|
||||||
# DependencyInjection
|
# DependencyInjection
|
||||||
/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php @dunglas
|
/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php @dunglas
|
||||||
# ErrorRenderer
|
# ErrorHandler
|
||||||
/src/Symfony/Component/ErrorRenderer/* @yceruto
|
/src/Symfony/Component/ErrorHandler/ @yceruto
|
||||||
# Form
|
# Form
|
||||||
/src/Symfony/Bridge/Twig/Extension/FormExtension.php @xabbuh
|
/src/Symfony/Bridge/Twig/Extension/FormExtension.php @xabbuh
|
||||||
/src/Symfony/Bridge/Twig/Form/ @xabbuh
|
/src/Symfony/Bridge/Twig/Form/ @xabbuh
|
||||||
@ -20,7 +21,7 @@
|
|||||||
/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/FormPassTest.php @xabbuh
|
/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/FormPassTest.php @xabbuh
|
||||||
/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/FormHelperTableLayoutTest.php @xabbuh
|
/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/FormHelperTableLayoutTest.php @xabbuh
|
||||||
/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/FormHelperDivLayoutTest.php @xabbuh
|
/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/FormHelperDivLayoutTest.php @xabbuh
|
||||||
/src/Symfony/Component/Form/ @xabbuh
|
/src/Symfony/Component/Form/ @xabbuh @yceruto
|
||||||
# HttpKernel
|
# HttpKernel
|
||||||
/src/Symfony/Component/HttpKernel/Log/Logger.php @dunglas
|
/src/Symfony/Component/HttpKernel/Log/Logger.php @dunglas
|
||||||
# LDAP
|
# LDAP
|
||||||
@ -30,13 +31,20 @@
|
|||||||
# Messenger
|
# Messenger
|
||||||
/src/Symfony/Bridge/Doctrine/Messenger/ @sroze
|
/src/Symfony/Bridge/Doctrine/Messenger/ @sroze
|
||||||
/src/Symfony/Component/Messenger/ @sroze
|
/src/Symfony/Component/Messenger/ @sroze
|
||||||
|
# OptionsResolver
|
||||||
|
/src/Symfony/Component/OptionsResolver/ @yceruto
|
||||||
# PropertyInfo
|
# PropertyInfo
|
||||||
/src/Symfony/Component/PropertyInfo/ @dunglas
|
/src/Symfony/Component/PropertyInfo/ @dunglas
|
||||||
/src/Symfony/Bridge/Doctrine/PropertyInfo/ @dunglas
|
/src/Symfony/Bridge/Doctrine/PropertyInfo/ @dunglas
|
||||||
# Serializer
|
# Serializer
|
||||||
/src/Symfony/Component/Serializer/ @dunglas
|
/src/Symfony/Component/Serializer/ @dunglas
|
||||||
|
# Security
|
||||||
|
/src/Symfony/Bridge/Doctrine/Security/ @wouterj @chalasr
|
||||||
|
/src/Symfony/Bundle/SecurityBundle/ @wouterj @chalasr
|
||||||
|
/src/Symfony/Component/Security/ @wouterj @chalasr
|
||||||
|
/src/Symfony/Component/Ldap/Security/ @wouterj @chalasr
|
||||||
# TwigBundle
|
# TwigBundle
|
||||||
/src/Symfony/Bundle/TwigBundle/ErrorRenderer/TwigHtmlErrorRenderer.php @yceruto
|
/src/Symfony/Bundle/TwigBundle/ @yceruto
|
||||||
# WebLink
|
# WebLink
|
||||||
/src/Symfony/Component/WebLink/ @dunglas
|
/src/Symfony/Component/WebLink/ @dunglas
|
||||||
# Workflow
|
# Workflow
|
||||||
|
4
.github/workflows/tests.yml
vendored
4
.github/workflows/tests.yml
vendored
@ -108,8 +108,8 @@ jobs:
|
|||||||
run: |
|
run: |
|
||||||
([ -d ~/.composer ] || mkdir ~/.composer) && cp .github/composer-config.json ~/.composer/config.json
|
([ -d ~/.composer ] || mkdir ~/.composer) && cp .github/composer-config.json ~/.composer/config.json
|
||||||
SYMFONY_VERSION=$(cat composer.json | grep '^ *\"branch-version\". *\"[1-9]' | grep -o '[0-9.]*')
|
SYMFONY_VERSION=$(cat composer.json | grep '^ *\"branch-version\". *\"[1-9]' | grep -o '[0-9.]*')
|
||||||
echo "::set-env name=SYMFONY_VERSION::$SYMFONY_VERSION"
|
echo "SYMFONY_VERSION=$SYMFONY_VERSION" >> $GITHUB_ENV
|
||||||
echo "::set-env name=COMPOSER_ROOT_VERSION::$SYMFONY_VERSION.x-dev"
|
echo "COMPOSER_ROOT_VERSION=$SYMFONY_VERSION.x-dev" >> $GITHUB_ENV
|
||||||
|
|
||||||
- name: Determine composer cache directory
|
- name: Determine composer cache directory
|
||||||
id: composer-cache
|
id: composer-cache
|
||||||
|
@ -183,7 +183,7 @@ before_install:
|
|||||||
tfold ext.redis tpecl redis-5.2.2 redis.so $INI "no"
|
tfold ext.redis tpecl redis-5.2.2 redis.so $INI "no"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
tfold ext.igbinary tpecl igbinary-3.1.5 igbinary.so $INI
|
tfold ext.igbinary tpecl igbinary-3.1.6 igbinary.so $INI
|
||||||
done
|
done
|
||||||
- |
|
- |
|
||||||
# List all php extensions with versions
|
# List all php extensions with versions
|
||||||
|
@ -11,7 +11,6 @@
|
|||||||
|
|
||||||
namespace Symfony\Component\Cache\Tests\Adapter;
|
namespace Symfony\Component\Cache\Tests\Adapter;
|
||||||
|
|
||||||
use Doctrine\DBAL\Version;
|
|
||||||
use Psr\Cache\CacheItemPoolInterface;
|
use Psr\Cache\CacheItemPoolInterface;
|
||||||
use Symfony\Component\Cache\Adapter\PdoAdapter;
|
use Symfony\Component\Cache\Adapter\PdoAdapter;
|
||||||
use Symfony\Component\Cache\Tests\Traits\PdoPruneableTrait;
|
use Symfony\Component\Cache\Tests\Traits\PdoPruneableTrait;
|
||||||
@ -31,10 +30,6 @@ class PdoAdapterTest extends AdapterTestCase
|
|||||||
self::markTestSkipped('Extension pdo_sqlite required.');
|
self::markTestSkipped('Extension pdo_sqlite required.');
|
||||||
}
|
}
|
||||||
|
|
||||||
if (\PHP_VERSION_ID >= 80000 && class_exists(Version::class)) {
|
|
||||||
self::markTestSkipped('Doctrine DBAL 2.x is incompatible with PHP 8.');
|
|
||||||
}
|
|
||||||
|
|
||||||
self::$dbFile = tempnam(sys_get_temp_dir(), 'sf_sqlite_cache');
|
self::$dbFile = tempnam(sys_get_temp_dir(), 'sf_sqlite_cache');
|
||||||
|
|
||||||
$pool = new PdoAdapter('sqlite:'.self::$dbFile);
|
$pool = new PdoAdapter('sqlite:'.self::$dbFile);
|
||||||
|
@ -14,7 +14,6 @@ namespace Symfony\Component\Lock\Tests\Store;
|
|||||||
use Doctrine\DBAL\Connection;
|
use Doctrine\DBAL\Connection;
|
||||||
use Doctrine\DBAL\DriverManager;
|
use Doctrine\DBAL\DriverManager;
|
||||||
use Doctrine\DBAL\Schema\Schema;
|
use Doctrine\DBAL\Schema\Schema;
|
||||||
use Doctrine\DBAL\Version;
|
|
||||||
use Symfony\Component\Lock\PersistingStoreInterface;
|
use Symfony\Component\Lock\PersistingStoreInterface;
|
||||||
use Symfony\Component\Lock\Store\PdoStore;
|
use Symfony\Component\Lock\Store\PdoStore;
|
||||||
|
|
||||||
@ -33,10 +32,6 @@ class PdoDbalStoreTest extends AbstractStoreTest
|
|||||||
{
|
{
|
||||||
self::$dbFile = tempnam(sys_get_temp_dir(), 'sf_sqlite_lock');
|
self::$dbFile = tempnam(sys_get_temp_dir(), 'sf_sqlite_lock');
|
||||||
|
|
||||||
if (\PHP_VERSION_ID >= 80000 && class_exists(Version::class)) {
|
|
||||||
self::markTestSkipped('Doctrine DBAL 2.x is incompatible with PHP 8.');
|
|
||||||
}
|
|
||||||
|
|
||||||
$store = new PdoStore(DriverManager::getConnection(['driver' => 'pdo_sqlite', 'path' => self::$dbFile]));
|
$store = new PdoStore(DriverManager::getConnection(['driver' => 'pdo_sqlite', 'path' => self::$dbFile]));
|
||||||
$store->createTable();
|
$store->createTable();
|
||||||
}
|
}
|
||||||
|
@ -11,7 +11,6 @@
|
|||||||
|
|
||||||
namespace Symfony\Component\Lock\Tests\Store;
|
namespace Symfony\Component\Lock\Tests\Store;
|
||||||
|
|
||||||
use Doctrine\DBAL\Version;
|
|
||||||
use Symfony\Component\Lock\Key;
|
use Symfony\Component\Lock\Key;
|
||||||
use Symfony\Component\Lock\PersistingStoreInterface;
|
use Symfony\Component\Lock\PersistingStoreInterface;
|
||||||
use Symfony\Component\Lock\Store\PdoStore;
|
use Symfony\Component\Lock\Store\PdoStore;
|
||||||
@ -31,10 +30,6 @@ class PdoStoreTest extends AbstractStoreTest
|
|||||||
{
|
{
|
||||||
self::$dbFile = tempnam(sys_get_temp_dir(), 'sf_sqlite_lock');
|
self::$dbFile = tempnam(sys_get_temp_dir(), 'sf_sqlite_lock');
|
||||||
|
|
||||||
if (\PHP_VERSION_ID >= 80000 && class_exists(Version::class)) {
|
|
||||||
self::markTestSkipped('Doctrine DBAL 2.x is incompatible with PHP 8.');
|
|
||||||
}
|
|
||||||
|
|
||||||
$store = new PdoStore('sqlite:'.self::$dbFile);
|
$store = new PdoStore('sqlite:'.self::$dbFile);
|
||||||
$store->createTable();
|
$store->createTable();
|
||||||
}
|
}
|
||||||
|
@ -14,7 +14,6 @@ namespace Symfony\Component\Messenger\Bridge\Doctrine\Tests\Transport;
|
|||||||
use Doctrine\DBAL\Driver\Result as DriverResult;
|
use Doctrine\DBAL\Driver\Result as DriverResult;
|
||||||
use Doctrine\DBAL\DriverManager;
|
use Doctrine\DBAL\DriverManager;
|
||||||
use Doctrine\DBAL\Result;
|
use Doctrine\DBAL\Result;
|
||||||
use Doctrine\DBAL\Version;
|
|
||||||
use PHPUnit\Framework\TestCase;
|
use PHPUnit\Framework\TestCase;
|
||||||
use Symfony\Component\Messenger\Bridge\Doctrine\Tests\Fixtures\DummyMessage;
|
use Symfony\Component\Messenger\Bridge\Doctrine\Tests\Fixtures\DummyMessage;
|
||||||
use Symfony\Component\Messenger\Bridge\Doctrine\Transport\Connection;
|
use Symfony\Component\Messenger\Bridge\Doctrine\Transport\Connection;
|
||||||
@ -31,13 +30,6 @@ class DoctrineIntegrationTest extends TestCase
|
|||||||
/** @var string */
|
/** @var string */
|
||||||
private $sqliteFile;
|
private $sqliteFile;
|
||||||
|
|
||||||
public static function setUpBeforeClass(): void
|
|
||||||
{
|
|
||||||
if (\PHP_VERSION_ID >= 80000 && class_exists(Version::class)) {
|
|
||||||
self::markTestSkipped('Doctrine DBAL 2.x is incompatible with PHP 8.');
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
protected function setUp(): void
|
protected function setUp(): void
|
||||||
{
|
{
|
||||||
$this->sqliteFile = sys_get_temp_dir().'/symfony.messenger.sqlite';
|
$this->sqliteFile = sys_get_temp_dir().'/symfony.messenger.sqlite';
|
||||||
|
Reference in New Issue
Block a user