8000 Merge branch '5.1' into 5.x · symfony/symfony@6987862 · GitHub
[go: up one dir, main page]
Skip to content

Commit 6987862

Browse files
fabpotfabpot
committed
Merge branch '5.1' into 5.x
* 5.1: Don't skip Doctrine tests on php 8. Stop using set-env in GitHub actions. Allow setting AMQP option "login" 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 185e9ea + 5578239 commit 6987862

File tree

8 files changed

+17
-31
lines changed

8 files changed

+17
-31
lines changed

‎.github/CODEOWNERS

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
# Console
2+
/src/Symfony/Component/Console/ @chalasr
23
/src/Symfony/Component/Console/Logger/ConsoleLogger.php @dunglas
34
# DependencyInjection
45
/src/Symfony/Component/DependencyInjection/Compiler/AutowirePass.php @dunglas
5-
# ErrorRenderer
6-
/src/Symfony/Component/ErrorRenderer/* @yceruto
6+
# ErrorHandler
7+
/src/Symfony/Component/ErrorHandler/ @yceruto
78
# Form
89
/src/Symfony/Bridge/Twig/Extension/FormExtension.php @xabbuh
910
/src/Symfony/Bridge/Twig/Form/ @xabbuh
@@ -20,7 +21,7 @@
2021
/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Compiler/FormPassTest.php @xabbuh
2122
/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/FormHelperTableLayoutTest.php @xabbuh
2223
/src/Symfony/Bundle/FrameworkBundle/Tests/Templating/Helper/FormHelperDivLayoutTest.php @xabbuh
23-
/src/Symfony/Component/Form/ @xabbuh
24+
/src/Symfony/Component/Form/ @xabbuh @yceruto
2425
# HttpKernel
2526
/src/Symfony/Component/HttpKernel/Log/Logger.php @dunglas
2627
# LDAP
@@ -30,13 +31,20 @@
3031
# Messenger
3132
/src/Symfony/Bridge/Doctrine/Messenger/ @sroze
3233
/src/Symfony/Component/Messenger/ @sroze
34+
# OptionsResolver
35+
/src/Symfony/Component/OptionsResolver/ @yceruto
3336
# PropertyInfo
3437
/src/Symfony/Component/PropertyInfo/ @dunglas
3538
/src/Symfony/Bridge/Doctrine/PropertyInfo/ @dunglas
3639
# Serializer
3740
/src/Symfony/Component/Serializer/ @dunglas
41+
# Security
42+
/src/Symfony/Bridge/Doctrine/Security/ @wouterj @chalasr
43+
/src/Symfony/Bundle/SecurityBundle/ @wouterj @chalasr
44+
/src/Symfony/Component/Security/ @wouterj @chalasr
45+
/src/Symfony/Component/Ldap/Security/ @wouterj @chalasr
3846
# TwigBundle
39-
/src/Symfony/Bundle/TwigBundle/ErrorRenderer/TwigHtmlErrorRenderer.php @yceruto
47+
/src/Symfony/Bundle/TwigBundle/ @yceruto
4048
# WebLink
4149
/src/Symfony/Component/WebLink/ @dunglas
4250
# Workflow

‎.github/workflows/tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,8 @@ jobs:
114114
run: |
115115
([ -d ~/.composer ] || mkdir ~/.composer) && cp .github/composer-config.json ~/.composer/config.json
116116
SYMFONY_VERSION=$(cat composer.json | grep '^ *\"branch-version\". *\"[1-9]' | grep -o '[0-9.]*')
117-
echo "::set-env name=SYMFONY_VERSION::$SYMFONY_VERSION"
118-
echo "::set-env name=COMPOSER_ROOT_VERSION::$SYMFONY_VERSION.x-dev"
117+
echo "SYMFONY_VERSION=$SYMFONY_VERSION" >> $GITHUB_ENV
118+
echo "COMPOSER_ROOT_VERSION=$SYMFONY_VERSION.x-dev" >> $GITHUB_ENV
119119
120120
- name: Determine composer cache directory
121121
id: composer-cache

‎.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ before_install:
183183
tfold ext.redis tpecl redis-5.2.2 redis.so $INI "no"
184184
fi
185185
186-
tfold ext.igbinary tpecl igbinary-3.1.5 igbinary.so $INI
186+
tfold ext.igbinary tpecl igbinary-3.1.6 igbinary.so $INI
187187
done
188188
- |
189189
# List all php extensions with versions

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

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

1212
namespace Symfony\Component\Cache\Tests\Adapter;
1313

14-
use Doctrine\DBAL\Version;
1514
use Psr\Cache\CacheItemPoolInterface;
1615
use Symfony\Component\Cache\Adapter\PdoAdapter;
1716
use Symfony\Component\Cache\Tests\Traits\PdoPruneableTrait;
@@ -31,10 +30,6 @@ public static function setUpBeforeClass(): void
3130
self::markTestSkipped('Extension pdo_sqlite required.');
3231
}
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
self::$dbFile = tempnam(sys_get_temp_dir(), 'sf_sqlite_cache');
3934

4035
$pool = new PdoAdapter('sqlite:'.self::$dbFile);

‎src/Symfony/Component/Lock/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
}

‎src/Symfony/Component/Lock/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
}

‎src/Symfony/Component/Messenger/Bridge/Amqp/Transport/Connection.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ class Connection
3737
'port',
3838
'vhost',
3939
'user',
40+
'login',
4041
'password',
4142
'queues',
4243
'exchange',
@@ -124,7 +125,7 @@ public function __construct(array $connectionOptions, array $exchangeOptions, ar
124125
* * host: Hostname of the AMQP service
125126
* * port: Port of the AMQP service
126127
* * vhost: Virtual Host to use with the AMQP service
127-
* * user: Username to use to connect the AMQP service
128+
* * user|login: Username to use to connect the AMQP service
128129
* * password: Password to use to connect to the AMQP service
129130
* * read_timeout: Timeout in for income activity. Note: 0 or greater seconds. May be fractional.
130131
* * write_timeout: Timeout in for outcome activity. Note: 0 or greater seconds. May be fractional.

‎src/Symfony/Component/Messenger/Bridge/Doctrine/Tests/Transport/DoctrineIntegrationTest.php

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
use Doctrine\DBAL\Driver\Result as DriverResult;
1515
use Doctrine\DBAL\DriverManager;
1616
use Doctrine\DBAL\Result;
17-
use Doctrine\DBAL\Version;
1817
use PHPUnit\Framework\TestCase;
1918
use Symfony\Component\Messenger\Bridge\Doctrine\Tests\Fixtures\DummyMessage;
2019
use Symfony\Component\Messenger\Bridge\Doctrine\Transport\Connection;
@@ -31,13 +30,6 @@ class DoctrineIntegrationTest extends TestCase
3130
/** @var string */
3231
private $sqliteFile;
3332

34-
public static function setUpBeforeClass(): void
35-
{
36-
if (\PHP_VERSION_ID >= 80000 && class_exists(Version::class)) {
37-
self::markTestSkipped('Doctrine DBAL 2.x is incompatible with PHP 8.');
38-
}
39-
}
40-
4133
protected function setUp(): void
4234
{
4335
$this->sqliteFile = sys_get_temp_dir().'/symfony.messenger.sqlite';

0 commit comments

Comments
 (0)
0