Revert to encoding query with RFC3986

Bug fixed in league/uri-components 2.4.2 and 7.1.

composer.json

@@ -31,13 +31,13 @@
         "php": ">=8.1",
         "amphp/hpack": "^3",
         "amphp/parser": "^1.1",
-        "league/uri-components": "^2.4 || ^7",
-        "psr/http-message": "^1 || ^2"
+        "league/uri-components": "^2.4.2 | ^7.1",
+        "psr/http-message": "^1 | ^2"
     },
     "require-dev": {
         "phpunit/phpunit": "^9",
         "amphp/php-cs-fixer-config": "^2",
-        "league/uri": "^6.8 || ^7",
+        "league/uri": "^6.8 | ^7.1",
         "psalm/phar": "^5.4"
     },
     "scripts": {

src/HttpRequest.php

@@ -201,7 +201,7 @@ private function updateUriWithQuery(array $query): void
             \array_push($pairs, ...\array_map(static fn ($value) => [$key, $value], $values));
         }
 
-        $this->uri = $this->uri->withQuery(QueryString::build($pairs, '&', \PHP_QUERY_RFC1738) ?? '');
+        $this->uri = $this->uri->withQuery(QueryString::build($pairs, '&', \PHP_QUERY_RFC3986) ?? '');
         $this->queryMap = $query;
         $this->queryPairs = $pairs;
     }

test/HttpRequestTest.php

@@ -102,15 +102,15 @@ public function testQueryWithEmptyValues(): void
 
     public function testQueryWithEncodedChars(): void
     {
-        $query = 'key%5B1%5D=1%201&key%5B2%5D=2%261&key%5B3%5D=3%5B1%5D';
+        $query = 'key%5B1%5D=1+1&key%5B2%5D=2%261&key%5B3%5D=3%5B1%5D';
         $request = $this->createTestRequest($query);
         self::assertSame('1 1', $request->getQueryParameter('key[1]'));
         self::assertSame('2&1', $request->getQueryParameter('key[2]'));
         self::assertSame('3[1]', $request->getQueryParameter('key[3]'));
 
         $request->setQueryParameter('key[3]', '3[2]');
         $query = \str_replace('3%5B1%5D', '3%5B2%5D', $query);
-        $query = \str_replace('%20', '+', $query);
+        $query = \str_replace('+', '%20', $query);
         self::assertSame($query, $request->getUri()->getQuery());
     }
 
@@ -184,7 +184,7 @@ public function testRemoveQuery(): void
 
     public function testQueryWithEmptyPairs(): void
     {
-        $query = '&&&=to&&key=value&empty&encoded=%2B+%2B';
+        $query = '&&&=to&&key=value&empty&encoded=%2B%20%2B';
         $request = $this->createTestRequest($query);
 
         self::assertSame([
@@ -233,6 +233,17 @@ public function testSettingNonStringValues(): void
         $request->setQueryParameter('key4', [true]);
     }
 
+    public function testBothRfc1738AndRfc3986EncodingAccepted(): void
+    {
+        $rfc1738 = 'key=1+1';
+        $rfc3986 = 'key=1%201';
+
+        self::assertSame(
+            $this->createTestRequest($rfc1738)->getQueryParameter('key'),
+            $this->createTestRequest($rfc3986)->getQueryParameter('key'),
+        );
+    }
+
     public function testIsIdempotent(): void
     {
         self::assertTrue($this->createTestRequest('', 'HEAD')->isIdempotent());