Skip to content

Commit abd4d2e

Browse files
Merge branch '6.2' into 6.3
* 6.2: [Translation] Decouple TranslatorPathsPass from "debug." convention [VarDumper] Add a bit of test coverage [TwigBridge] Fix flagged malicious url [HttpClient] Fix encoding "+" in URLs [DependencyInjection] Fix dumping array of enums parameters Bump Symfony version to 6.2.8 Update VERSION for 6.2.7 Update CHANGELOG for 6.2.7 Bump Symfony version to 5.4.22 Update VERSION for 5.4.21 Update CONTRIBUTORS for 5.4.21 Update CHANGELOG for 5.4.21 [Messenger] Fix TransportNamesStamp deserialization Removed @internal tag on TraceableAuthenticator::getAuthenticator()
2 parents e46dc68 + e148788 commit abd4d2e

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

HttpClientTrait.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -626,7 +626,6 @@ private static function mergeQueryString(?string $queryString, array $queryArray
626626
'%28' => '(',
627627
'%29' => ')',
628628
'%2A' => '*',
629-
'%2B' => '+',
630629
'%2C' => ',',
631630
'%2F' => '/',
632631
'%3A' => ':',

Tests/HttpClientTraitTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,8 +176,8 @@ public static function provideParseUrl(): iterable
176176
yield [['http:', null, null, null, null], 'http:'];
177177
yield [['http:', null, 'bar', null, null], 'http:bar'];
178178
yield [[null, null, 'bar', '?a=1&c=c', null], 'bar?a=a&b=b', ['b' => null, 'c' => 'c', 'a' => 1]];
179-
yield [[null, null, 'bar', '?a=b+c&b=b-._~!$%26/%27()[]*+,;%3D:@%25\\^`{|}', null], 'bar?a=b+c', ['b' => 'b-._~!$&/\'()[]*+,;=:@%\\^`{|}']];
180-
yield [[null, null, 'bar', '?a=b+%20c', null], 'bar?a=b+c', ['a' => 'b+ c']];
179+
yield [[null, null, 'bar', '?a=b+c&b=b-._~!$%26/%27()[]*%2B,;%3D:@%25\\^`{|}', null], 'bar?a=b+c', ['b' => 'b-._~!$&/\'()[]*+,;=:@%\\^`{|}']];
180+
yield [[null, null, 'bar', '?a=b%2B%20c', null], 'bar?a=b+c', ['a' => 'b+ c']];
181181
yield [[null, null, 'bar', '?a[b]=c', null], 'bar', ['a' => ['b' => 'c']]];
182182
yield [[null, null, 'bar', '?a[b[c]=d', null], 'bar?a[b[c]=d', []];
183183
yield [[null, null, 'bar', '?a[b][c]=dd', null], 'bar?a[b][c]=d&e[f]=g', ['a' => ['b' => ['c' => 'dd']], 'e[f]' => null]];

0 commit comments

Comments
 (0)