Move Structured fields to amphp/http

amphp · Jan 16, 2024 · 04cbf23 · 04cbf23
1 parent a3dbb24
commit 04cbf23
Show file tree

Hide file tree

Showing 13 changed files with 4 additions and 805 deletions.
diff --git a/composer.json b/composer.json
@@ -34,7 +34,7 @@
         "amphp/byte-stream": "^2",
         "amphp/cache": "^2",
         "amphp/hpack": "^3",
-        "amphp/http": "^2",
+        "amphp/http": "dev-structured-fields as v2.1.0",
         "amphp/pipeline": "^1",
         "amphp/quic": "dev-master",
         "amphp/socket": "^2.1",
@@ -50,7 +50,6 @@
         "amphp/http-client": "^5",
         "amphp/log": "^2",
         "amphp/php-cs-fixer-config": "^2",
-        "httpwg/structured-field-tests": "1.0",
         "league/uri-components": "^2.4.2 | ^7.1",
         "monolog/monolog": "^3",
         "phpunit/phpunit": "^9",
@@ -83,20 +82,6 @@
         "test": "@php -dzend.assertions=1 -dassert.exception=1 ./vendor/bin/phpunit",
         "code-style": "@php ./vendor/bin/php-cs-fixer fix"
     },
-    "repositories": [
-        {
-            "type": "package",
-            "package": {
-                "name": "httpwg/structured-field-tests",
-                "version": "1.0",
-                "source": {
-                    "url": "https://github.com/httpwg/structured-field-tests",
-                    "type": "git",
-                    "reference": "origin/main"
-                }
-            }
-        }
-    ],
     "config": {
         "allow-plugins": {
             "ocramius/package-versions": false

diff --git a/src/Driver/Internal/Http3/Http3Parser.php b/src/Driver/Internal/Http3/Http3Parser.php
@@ -2,9 +2,9 @@
 
 namespace Amp\Http\Server\Driver\Internal\Http3;
 
-use Amp\Http\Http2\Http2Parser;
-use Amp\Http\Server\Driver\Internal\Http3\Rfc8941\Boolean;
-use Amp\Http\Server\Driver\Internal\Http3\Rfc8941\Number;
+use Amp\Http\StructuredFields\Rfc8941;
+use Amp\Http\StructuredFields\Rfc8941\Boolean;
+use Amp\Http\StructuredFields\Rfc8941\Number;
 use Amp\Pipeline\ConcurrentIterator;
 use Amp\Pipeline\Queue;
 use Amp\Quic\QuicConnection;