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:
Fabien Potencier 2020-10-20 08:22:32 +02:00
commit 5578239608
7 changed files with 15 additions and 30 deletions

16
.github/CODEOWNERS vendored
View File

@ -1,9 +1,10 @@
# Console
/src/Symfony/Component/Console/ @chalasr
/src/Symfony/Component/Console/Logger/ConsoleLogger.php @dunglas
# DependencyInjection
/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php @dunglas
# ErrorRenderer
/src/Symfony/Component/ErrorRenderer/* @yceruto
# ErrorHandler
/src/Symfony/Component/ErrorHandler/ @yceruto
# Form
/src/Symfony/Bridge/Twig/Extension/FormExtension.php @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/Templating/Helper/FormHelperTableLayoutTest.php @xabbuh
/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/FormHelperDivLayoutTest.php @xabbuh
/src/Symfony/Component/Form/ @xabbuh
/src/Symfony/Component/Form/ @xabbuh @yceruto
# HttpKernel
/src/Symfony/Component/HttpKernel/Log/Logger.php @dunglas
# LDAP
@ -30,13 +31,20 @@
# Messenger
/src/Symfony/Bridge/Doctrine/Messenger/ @sroze
/src/Symfony/Component/Messenger/ @sroze
# OptionsResolver
/src/Symfony/Component/OptionsResolver/ @yceruto
# PropertyInfo
/src/Symfony/Component/PropertyInfo/ @dunglas
/src/Symfony/Bridge/Doctrine/PropertyInfo/ @dunglas
# Serializer
/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
/src/Symfony/Bundle/TwigBundle/ErrorRenderer/TwigHtmlErrorRenderer.php @yceruto
/src/Symfony/Bundle/TwigBundle/ @yceruto
# WebLink
/src/Symfony/Component/WebLink/ @dunglas
# Workflow

View File

@ -108,8 +108,8 @@ jobs:
run: |
([ -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.]*')
echo "::set-env name=SYMFONY_VERSION::$SYMFONY_VERSION"
echo "::set-env name=COMPOSER_ROOT_VERSION::$SYMFONY_VERSION.x-dev"
echo "SYMFONY_VERSION=$SYMFONY_VERSION" >> $GITHUB_ENV
echo "COMPOSER_ROOT_VERSION=$SYMFONY_VERSION.x-dev" >> $GITHUB_ENV
- name: Determine composer cache directory
id: composer-cache

View File

@ -183,7 +183,7 @@ before_install:
tfold ext.redis tpecl redis-5.2.2 redis.so $INI "no"
fi
tfold ext.igbinary tpecl igbinary-3.1.5 igbinary.so $INI
tfold ext.igbinary tpecl igbinary-3.1.6 igbinary.so $INI
done
- |
# List all php extensions with versions

View File

@ -11,7 +11,6 @@
namespace Symfony\Component\Cache\Tests\Adapter;
use Doctrine\DBAL\Version;
use Psr\Cache\CacheItemPoolInterface;
use Symfony\Component\Cache\Adapter\PdoAdapter;
use Symfony\Component\Cache\Tests\Traits\PdoPruneableTrait;
@ -31,10 +30,6 @@ class PdoAdapterTest extends AdapterTestCase
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');
$pool = new PdoAdapter('sqlite:'.self::$dbFile);

View File

@ -14,7 +14,6 @@ namespace Symfony\Component\Lock\Tests\Store;
use Doctrine\DBAL\Connection;
use Doctrine\DBAL\DriverManager;
use Doctrine\DBAL\Schema\Schema;
use Doctrine\DBAL\Version;
use Symfony\Component\Lock\PersistingStoreInterface;
use Symfony\Component\Lock\Store\PdoStore;
@ -33,10 +32,6 @@ class PdoDbalStoreTest extends AbstractStoreTest
{
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->createTable();
}

View File

@ -11,7 +11,6 @@
namespace Symfony\Component\Lock\Tests\Store;
use Doctrine\DBAL\Version;
use Symfony\Component\Lock\Key;
use Symfony\Component\Lock\PersistingStoreInterface;
use Symfony\Component\Lock\Store\PdoStore;
@ -31,10 +30,6 @@ class PdoStoreTest extends AbstractStoreTest
{
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->createTable();
}

View File

@ -14,7 +14,6 @@ namespace Symfony\Component\Messenger\Bridge\Doctrine\Tests\Transport;
use Doctrine\DBAL\Driver\Result as DriverResult;
use Doctrine\DBAL\DriverManager;
use Doctrine\DBAL\Result;
use Doctrine\DBAL\Version;
use PHPUnit\Framework\TestCase;
use Symfony\Component\Messenger\Bridge\Doctrine\Tests\Fixtures\DummyMessage;
use Symfony\Component\Messenger\Bridge\Doctrine\Transport\Connection;
@ -31,13 +30,6 @@ class DoctrineIntegrationTest extends TestCase
/** @var string */
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
{
$this->sqliteFile = sys_get_temp_dir().'/symfony.messenger.sqlite';