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

Commit 49eafee

Browse files
xabbuhxabbuh
committed
Merge branch '5.2' into 5.x
* 5.2: Bump Symfony version to 5.2.0 Update VERSION for 5.2.0-RC2 Update CHANGELOG for 5.2.0-RC2 Display debug info [HttpFoundation] Typo on deprecation package name [DoctrineBridge] drop binary variants of UID types [HttpClient] don't fallback to HTTP/1.1 when HTTP/2 streams break Default to user provider, if available, in password upgrader fix lexing nested sequences/mappings
2 parents a273b71 + bdadbf3 commit 49eafee

24 files changed

+405
-491
lines changed

‎.github/workflows/tests.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -99,17 +99,12 @@ jobs:
9999

100100
- name: Install system dependencies
101101
run: |
102-
echo "::group::add apt sources"
103-
sudo wget -O - http://packages.couchbase.com/ubuntu/couchbase.key | sudo apt-key add -
104-
echo "deb http://packages.couchbase.com/ubuntu bionic bionic/main" | sudo tee /etc/apt/sources.list.d/couchbase.list
105-
echo "::endgroup::"
106-
107102
echo "::group::apt-get update"
108103
sudo apt-get update
109104
echo "::endgroup::"
110105
111106
echo "::group::install tools & libraries"
112-
sudo apt-get install libcouchbase-dev librdkafka-dev
107+
sudo apt-get install librdkafka-dev
113108
echo "::endgroup::"
114109
115110
- name: Configure Couchbase
@@ -128,6 +123,11 @@ jobs:
128123
php-version: "${{ matrix.php }}"
129124
tools: pecl
130125

126+
- name: Display versions
127+
run: |
128+
php -r 'foreach (get_loaded_extensions() as $extension) echo $extension . " " . phpversion($extension) . PHP_EOL;'
129+
php -i
130+
131131
- name: Load fixtures
132132
uses: docker://bitnami/openldap
133133
with:

‎CHANGELOG-5.2.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,22 @@ in 5.2 minor versions.
77
To get the diff for a specific change, go to https://github.com/symfony/symfony/commit/XXX where XXX is the change hash
88
To get the diff between two versions, go to https://github.com/symfony/symfony/compare/v5.2.0...v5.2.1
99

10+
* 5.2.0-RC2 (2020-11-21)
11+
12+
* bug #39113 [DoctrineBridge] drop binary variants of UID types (nicolas-grekas)
13+
* feature #39111 [Security] Update password upgrader listener to work with the new UserBadge (wouterj)
14+
* bug #39083 [Dotenv] Check if method inheritEnvironmentVariables exists (Chi-teck)
15+
* bug #39094 [Ldap] Fix undefined variable $con (derrabus)
16+
* bug #39091 [Config] Recheck glob brace support after GlobResource was serialized (wouterj)
17+
* bug #39092 Fix critical extension when reseting paged control (jderusse)
18+
* bug #38614 [HttpFoundation] Fix for virtualhosts based on URL path (mvorisek)
19+
* bug #39072 [FrameworkBundle] [Notifier] fix firebase transport factory DI tag type (xabbuh)
20+
* bug #39070 [Validator] Remove IsinValidator's validator dependency (derrabus)
21+
* bug #38387 [Validator] prevent hash collisions caused by reused object hashes (fancyweb, xabbuh)
22+
* bug #38999 [DependencyInjection] autoconfigure behavior describing tags on decorators (xabbuh)
23+
* bug #39058 [DependencyInjection] Fix circular detection with multiple paths (jderusse)
24+
* bug #39059 [Filesystem] fix cleaning up tmp files when dumpFile() fails (nicolas-grekas)
25+
1026
* 5.2.0-RC1 (2020-11-10)
1127

1228
* bug #39004 [Messenger] Fix JSON deserialization of ErrorDetailsStamp and normalization of FlattenException::$statusText (Jean85)

‎src/Symfony/Bridge/Doctrine/CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ CHANGELOG
44
5.2.0
55
-----
66

7-
* added support for symfony/uid as `UlidType`, `UuidType`, `UlidBinaryType` and `UuidBinaryType` as Doctrine types
7+
* added support for symfony/uid as `UlidType` and `UuidType` as Doctrine types
88
* added `UlidGenerator`, `UUidV1 F438 Generator`, `UuidV4Generator` and `UuidV6Generator`
99

1010
5.0.0

‎src/Symfony/Bridge/Doctrine/DependencyInjection/CompilerPass/RegisterUidTypePass.php

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

1212
namespace Symfony\Bridge\Doctrine\DependencyInjection\CompilerPass;
1313

14-
use Symfony\Bridge\Doctrine\Types\UlidBinaryType;
1514
use Symfony\Bridge\Doctrine\Types\UlidType;
16-
use Symfony\Bridge\Doctrine\Types\UuidBinaryType;
1715
use Symfony\Bridge\Doctrine\Types\UuidType;
1816
use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
1917
use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -40,14 +38,6 @@ public function process(ContainerBuilder $container)
4038
$typeDefinition['ulid'] = ['class' => UlidType::class];
4139
}
4240

43-
if (!isset($typeDefinition['uuid_binary'])) {
44-
$typeDefinition['uuid_binary'] = ['class' => UuidBinaryType::class];
45-
}
46-
47-
if (!isset($typeDefinition['ulid_binary'])) {
48-
$typeDefinition['ulid_binary'] = ['class' => UlidBinaryType::class];
49-
}
50-
5141
$container->setParameter('doctrine.dbal.connection_factory.types', $typeDefinition);
5242
}
5343
}

‎src/Symfony/Bridge/Doctrine/Tests/Types/UlidBinaryTypeTest.php

Lines changed: 0 additions & 114 deletions
This file was deleted.

‎src/Symfony/Bridge/Doctrine/Tests/Types/UlidTypeTest.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,9 @@ public static function setUpBeforeClass(): void
3737
protected function setUp(): void
3838
{
3939
$this->platform = $this->createMock(AbstractPlatform::class);
40+
$this->platform
41+
->method('hasNativeGuidType')
42+
->willReturn(true);
4043
$this->platform
4144
->method('getGuidTypeDeclarationSQL')
4245
->willReturn('DUMMYVARCHAR()');

‎src/Symfony/Bridge/Doctrine/Tests/Types/UuidBinaryTypeTest.php

Lines changed: 0 additions & 123 deletions
This file was deleted.

‎src/Symfony/Bridge/Doctrine/Tests/Types/UuidTypeTest.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,9 @@ public static function setUpBeforeClass(): void
3737
protected function setUp(): void
3838
{
3939
$this->platform = $this->createMock(AbstractPlatform::class);
40+
$this->platform
41+
->method('hasNativeGuidType')
42+
->willReturn(true);
4043
$this->platform
4144
->method('getGuidTypeDeclarationSQL')
4245
->willReturn('DUMMYVARCHAR()');

0 commit comments

Comments
 (0)
0