Merge branch '5.4' into 6.2

* 5.4:
  re-allow phpdocumentor/type-resolver 1.7
  skip test using attributes on PHP 7
  [HttpClient] Encode and decode curly brackets {}
  fix: GetSetMethodNormalizer::supportss should not check ignored methods
  Stop stopwatch events in case of exception
  add translations for the filename max length validator option
  [Validator] Update BIC validator IBAN mappings
  [String] Correct inflection of 'codes' and 'names'

Author: nicolas-grekas

HttpClientTrait.php

@@ -631,9 +631,7 @@ private static function mergeQueryString(?string $queryString, array $queryArray
                     '%5D' => ']',
                     '%5E' => '^',
                     '%60' => '`',
-                    '%7B' => '{',
                     '%7C' => '|',
-                    '%7D' => '}',
                 ]);
             }
 

Tests/HttpClientTraitTest.php

@@ -89,6 +89,8 @@ public static function provideResolveUrl(): array
             [self::RFC3986_BASE, '/g',            'http://a/g'],
             [self::RFC3986_BASE, '//g',           'http://g/'],
             [self::RFC3986_BASE, '?y',            'http://a/b/c/d;p?y'],
+            [self::RFC3986_BASE, '?y={"f":1}',    'http://a/b/c/d;p?y={%22f%22:1}'],
+            [self::RFC3986_BASE, 'g{oof}y',       'http://a/b/c/g{oof}y'],
             [self::RFC3986_BASE, 'g?y',           'http://a/b/c/g?y'],
             [self::RFC3986_BASE, '#s',            'http://a/b/c/d;p?q#s'],
             [self::RFC3986_BASE, 'g#s',           'http://a/b/c/g#s'],
@@ -173,10 +175,11 @@ public static function provideParseUrl(): iterable
         yield [['https:', '//xn--dj-kia8a.example.com:8000', '/', null, null], 'https://DÉjà.Example.com:8000/'];
         yield [[null, null, '/f%20o.o', '?a=b', '#c'], '/f o%2Eo?a=b#c'];
         yield [[null, '//a:b@foo', '/bar', null, null], '//a:b@foo/bar'];
+        yield [[null, '//a:b@foo', '/b{}', null, null], '//a:b@foo/b{}'];
         yield [['http:', null, null, null, null], 'http:'];
         yield [['http:', null, 'bar', null, null], 'http:bar'];
         yield [[null, null, 'bar', '?a=1&c=c', null], 'bar?a=a&b=b', ['b' => null, 'c' => 'c', 'a' => 1]];
-        yield [[null, null, 'bar', '?a=b+c&b=b-._~!$%26/%27()[]*%2B%2C;%3D:@%25\\^`{|}', null], 'bar?a=b+c', ['b' => 'b-._~!$&/\'()[]*+,;=:@%\\^`{|}']];
+        yield [[null, null, 'bar', '?a=b+c&b=b-._~!$%26/%27()[]*%2B%2C;%3D:@%25\\^`%7B|%7D', null], 'bar?a=b+c', ['b' => 'b-._~!$&/\'()[]*+,;=:@%\\^`{|}']];
         yield [[null, null, 'bar', '?a=b%2B%20c', null], 'bar?a=b+c', ['a' => 'b+ c']];
         yield [[null, null, 'bar', '?a[b]=c', null], 'bar', ['a' => ['b' => 'c']]];
         yield [[null, null, 'bar', '?a[b[c]=d', null], 'bar?a[b[c]=d', []];