relocate Http messages to Http\Message namespace

Machometec · Machometec · commit 94b395828a82 · 2024-03-10T23:17:43.000-04:00
diff --git a/lib/Diagnostics/ExceptionHandlerMiddleware.php b/lib/Diagnostics/ExceptionHandlerMiddleware.php
@@ -9,7 +9,7 @@
 namespace DevNet\Web\Diagnostics;
 
 use DevNet\System\MethodTrait;
-use DevNet\Web\Http\HttpContext;
+use DevNet\Web\Http\Message\HttpContext;
 use DevNet\Web\Middleware\IMiddleware;
 use DevNet\Web\Middleware\RequestDelegate;
 use DevNet\Web\View\ViewManager;
diff --git a/lib/Endpoint/ActionContext.php b/lib/Endpoint/ActionContext.php
@@ -9,7 +9,7 @@
 namespace DevNet\Web\Endpoint;
 
 use DevNet\System\PropertyTrait;
-use DevNet\Web\Http\HttpContext;
+use DevNet\Web\Http\Message\HttpContext;
 
 class ActionContext
 {
diff --git a/lib/Endpoint/ActionInvoker.php b/lib/Endpoint/ActionInvoker.php
@@ -12,7 +12,7 @@
 use DevNet\Web\Endpoint\ActionContext;
 use DevNet\Web\Endpoint\Binder\IValueProvider;
 use DevNet\Web\Endpoint\Binder\ParameterBinder;
-use DevNet\Web\Http\HttpContext;
+use DevNet\Web\Http\Message\HttpContext;
 use DevNet\Web\Middleware\IRequestHandler;
 
 class ActionInvoker implements IRequestHandler
diff --git a/lib/Endpoint/Binder/Providers/FileValueProvider.php b/lib/Endpoint/Binder/Providers/FileValueProvider.php
@@ -9,7 +9,7 @@
 namespace DevNet\Web\Endpoint\Binder\Providers;
 
 use DevNet\Web\Endpoint\Binder\IValueProvider;
-use DevNet\Web\Http\FormFileCollection;
+use DevNet\Web\Http\Message\FormFileCollection;
 
 /**
  * Describes the interface of a container that exposes methods to read its entries.
diff --git a/lib/Endpoint/Controller.php b/lib/Endpoint/Controller.php
@@ -16,7 +16,7 @@
 use DevNet\Web\Endpoint\Results\RedirectResult;
 use DevNet\Web\Endpoint\Results\StatusCodeResult;
 use DevNet\Web\Endpoint\Results\ViewResult;
-use DevNet\Web\Http\HttpContext;
+use DevNet\Web\Http\Message\HttpContext;
 use DevNet\Web\Security\Tokens\Csrf\IAntiforgery;
 use DevNet\Web\View\ViewManager;
 
diff --git a/lib/Endpoint/EndpointMiddleware.php b/lib/Endpoint/EndpointMiddleware.php
@@ -8,7 +8,7 @@
 
 namespace DevNet\Web\Endpoint;
 
-use DevNet\Web\Http\HttpContext;
+use DevNet\Web\Http\Message\HttpContext;
 use DevNet\Web\Middleware\IMiddleware;
 use DevNet\Web\Middleware\RequestDelegate;
 
diff --git a/lib/Extensions/ServiceCollectionExtensions.php b/lib/Extensions/ServiceCollectionExtensions.php
@@ -14,7 +14,7 @@
 use DevNet\System\Database\DbConnection;
 use DevNet\Entity\EntityContext;
 use DevNet\Entity\EntityOptions;
-use DevNet\Web\Http\HttpContext;
+use DevNet\Web\Http\Message\HttpContext;
 use DevNet\Web\Http\Client\HttpClient;
 use DevNet\Web\Http\Client\HttpClientOptions;
 use DevNet\Web\Security\Tokens\Csrf\IAntiforgery;
diff --git a/lib/Hosting/ApplicationBuilder.php b/lib/Hosting/ApplicationBuilder.php
@@ -13,7 +13,7 @@
 use DevNet\System\MethodTrait;
 use DevNet\System\PropertyTrait;
 use DevNet\Web\Hosting\WebHostEnvironment;
-use DevNet\Web\Http\HttpContext;
+use DevNet\Web\Http\Message\HttpContext;
 use DevNet\Web\Middleware\IMiddleware;
 use DevNet\Web\Middleware\MiddlewareDelegate;
 use DevNet\Web\Middleware\RequestDelegate;
diff --git a/lib/Hosting/WebHost.php b/lib/Hosting/WebHost.php
@@ -15,8 +15,8 @@
 use DevNet\System\Async\Task;
 use DevNet\System\Runtime\LauncherProperties;
 use DevNet\Web\Diagnostics\ExceptionHandlerMiddleware;
-use DevNet\Web\Http\HttpContext;
-use DevNet\Web\Http\HttpContextFactory;
+use DevNet\Web\Http\Message\HttpContext;
+use DevNet\Web\Http\Message\HttpContextFactory;
 use DevNet\Web\Routing\IRouteBuilder;
 use DevNet\Web\Routing\RouteBuilder;
 use Closure;
diff --git a/lib/Hosting/WebHostBuilder.php b/lib/Hosting/WebHostBuilder.php
@@ -14,7 +14,7 @@
 use DevNet\Common\Dependency\ServiceProvider;
 use DevNet\System\Runtime\LauncherProperties;
 use DevNet\System\PropertyTrait;
-use DevNet\Web\Http\HttpContext;
+use DevNet\Web\Http\Message\HttpContext;
 use Closure;
 
 class WebHostBuilder implements IWebHostBuilder
diff --git a/lib/Http/Client/HttpClient.php b/lib/Http/Client/HttpClient.php
@@ -8,11 +8,10 @@
 
 namespace DevNet\Web\Http\Client;
 
-use DevNet\Web\Http\Headers;
+use DevNet\Web\Http\Message\Headers;
 use DevNet\System\Async\Task;
 use DevNet\System\PropertyTrait;
-use DevNet\Web\Http\HttpRequest;
-use DevNet\Web\Http\Uri;
+use DevNet\Web\Http\Message\HttpRequest;
 
 class HttpClient extends HttpClientHandler
 {
@@ -40,9 +39,9 @@ public function requestAsync(string $method, string $url, ?HttpRequestContent $r
             $url = $this->Options->BaseAddress . $url;
         }
 
-        $uri     = new Uri($url);
-        $headers = new Headers(['host' => $uri->Host->Name]);
-        $request = new HttpRequest($method, $uri, $headers);
+        $host    = parse_url($url, PHP_URL_HOST);
+        $headers = new Headers(['host' => $host]);
+        $request = new HttpRequest($method, $url, $headers);
 
         $request->setProtocol($this->Options->HttpVersion);
         if ($requestContent) {
diff --git a/lib/Http/Client/HttpClientHandler.php b/lib/Http/Client/HttpClientHandler.php
@@ -11,8 +11,8 @@
 use DevNet\System\Async\Task;
 use DevNet\Web\Http\Client\Internal\HttpRequestRawBuilder;
 use DevNet\Web\Http\Client\Internal\HttpResponseParser;
-use DevNet\Web\Http\HttpRequest;
-use DevNet\Web\Http\HttpResponse;
+use DevNet\Web\Http\Message\HttpRequest;
+use DevNet\Web\Http\Message\HttpResponse;
 use DevNet\System\Net\Socket;
 
 use function DevNet\System\async;
diff --git a/lib/Http/Client/Internal/HttpRequestRawBuilder.php b/lib/Http/Client/Internal/HttpRequestRawBuilder.php
@@ -9,7 +9,7 @@
 namespace DevNet\Web\Http\Client\Internal;
 
 use DevNet\System\Text\StringBuilder;
-use DevNet\Web\Http\HttpRequest;
+use DevNet\Web\Http\Message\HttpRequest;
 
 class HttpRequestRawBuilder
 {
diff --git a/lib/Http/Client/Internal/HttpResponseParser.php b/lib/Http/Client/Internal/HttpResponseParser.php
@@ -8,8 +8,8 @@
 
 namespace DevNet\Web\Http\Client\Internal;
 
-use DevNet\Web\Http\Headers;
-use DevNet\Web\Http\HttpResponse;
+use DevNet\Web\Http\Message\Headers;
+use DevNet\Web\Http\Message\HttpResponse;
 
 class HttpResponseParser
 {
diff --git a/lib/Http/Message/ContentType.php b/lib/Http/Message/ContentType.php
@@ -6,7 +6,7 @@
  * @link        https://github.com/DevNet-Framework
  */
 
-namespace DevNet\Web\Http;
+namespace DevNet\Web\Http\Message;
 
 class ContentType
 {
diff --git a/lib/Http/Message/CookieOptions.php b/lib/Http/Message/CookieOptions.php
@@ -6,7 +6,7 @@
  * @link        https://github.com/DevNet-Framework
  */
 
-namespace DevNet\Web\Http;
+namespace DevNet\Web\Http\Message;
 
 use DateTime;
 
diff --git a/lib/Http/Message/Cookies.php b/lib/Http/Message/Cookies.php
@@ -6,7 +6,7 @@
  * @link        https://github.com/DevNet-Framework
  */
 
-namespace DevNet\Web\Http;
+namespace DevNet\Web\Http\Message;
 
 use DevNet\System\Collections\Enumerator;
 
diff --git a/lib/Http/Message/Form.php b/lib/Http/Message/Form.php
@@ -6,7 +6,7 @@
  * @link        https://github.com/DevNet-Framework
  */
 
-namespace DevNet\Web\Http;
+namespace DevNet\Web\Http\Message;
 
 use DevNet\System\PropertyTrait;
 
diff --git a/lib/Http/Message/FormFile.php b/lib/Http/Message/FormFile.php
@@ -6,7 +6,7 @@
  * @link        https://github.com/DevNet-Framework
  */
 
-namespace DevNet\Web\Http;
+namespace DevNet\Web\Http\Message;
 
 use DevNet\System\PropertyTrait;
 
diff --git a/lib/Http/Message/FormFileCollection.php b/lib/Http/Message/FormFileCollection.php
@@ -6,7 +6,7 @@
  * @link        https://github.com/DevNet-Framework
  */
 
-namespace DevNet\Web\Http;
+namespace DevNet\Web\Http\Message;
 
 use DevNet\System\Collections\Enumerator;
 use DevNet\System\Collections\IEnumerable;
diff --git a/lib/Http/Message/Headers.php b/lib/Http/Message/Headers.php
@@ -6,7 +6,7 @@
  * @link        https://github.com/DevNet-Framework
  */
 
-namespace DevNet\Web\Http;
+namespace DevNet\Web\Http\Message;
 
 class Headers
 {
diff --git a/lib/Http/Message/Host.php b/lib/Http/Message/Host.php
@@ -6,7 +6,7 @@
  * @link        https://github.com/DevNet-Framework
  */
 
-namespace DevNet\Web\Http;
+namespace DevNet\Web\Http\Message;
 
 use DevNet\System\PropertyTrait;
 
diff --git a/lib/Http/Message/HttpContext.php b/lib/Http/Message/HttpContext.php
@@ -6,7 +6,7 @@
  * @link        https://github.com/DevNet-Framework
  */
 
-namespace DevNet\Web\Http;
+namespace DevNet\Web\Http\Message;
 
 use DevNet\System\Collections\Dictionary;
 use DevNet\Common\Dependency\IServiceProvider;
diff --git a/lib/Http/Message/HttpContextFactory.php b/lib/Http/Message/HttpContextFactory.php
@@ -6,7 +6,7 @@
  * @link        https://github.com/DevNet-Framework
  */
 
-namespace DevNet\Web\Http;
+namespace DevNet\Web\Http\Message;
 
 use DevNet\System\IO\FileAccess;
 use DevNet\System\IO\FileMode;
diff --git a/lib/Http/Message/HttpException.php b/lib/Http/Message/HttpException.php
@@ -6,7 +6,7 @@
  * @link        https://github.com/DevNet-Framework
  */
 
-namespace DevNet\Web\Http;
+namespace DevNet\Web\Http\Message;
 
 use Exception;
 
diff --git a/lib/Http/Message/HttpMessage.php b/lib/Http/Message/HttpMessage.php
@@ -6,7 +6,7 @@
  * @link        https://github.com/DevNet-Framework
  */
 
-namespace DevNet\Web\Http;
+namespace DevNet\Web\Http\Message;
 
 use DevNet\System\IO\Stream;
 use DevNet\System\PropertyTrait;
diff --git a/lib/Http/Message/HttpRequest.php b/lib/Http/Message/HttpRequest.php
@@ -6,7 +6,7 @@
  * @link        https://github.com/DevNet-Framework
  */
 
-namespace DevNet\Web\Http;
+namespace DevNet\Web\Http\Message;
 
 use DevNet\System\IO\FileAccess;
 use DevNet\System\IO\FileMode;
diff --git a/lib/Http/Message/HttpResponse.php b/lib/Http/Message/HttpResponse.php
@@ -6,7 +6,7 @@
  * @link        https://github.com/DevNet-Framework
  */
 
-namespace DevNet\Web\Http;
+namespace DevNet\Web\Http\Message;
 
 use DevNet\System\Async\Task;
 use DevNet\System\IO\FileAccess;
diff --git a/lib/Http/Message/Query.php b/lib/Http/Message/Query.php
@@ -6,7 +6,7 @@
  * @link        https://github.com/DevNet-Framework
  */
 
-namespace DevNet\Web\Http;
+namespace DevNet\Web\Http\Message;
 
 use DevNet\System\Collections\Enumerator;
 use DevNet\System\Collections\IEnumerable;
diff --git a/lib/Middleware/IMiddleware.php b/lib/Middleware/IMiddleware.php
@@ -8,7 +8,7 @@
 
 namespace DevNet\Web\Middleware;
 
-use DevNet\Web\Http\HttpContext;
+use DevNet\Web\Http\Message\HttpContext;
 
 interface IMiddleware
 {
diff --git a/lib/Middleware/IRequestHandler.php b/lib/Middleware/IRequestHandler.php
@@ -8,7 +8,7 @@
 
 namespace DevNet\Web\Middleware;
 
-use DevNet\Web\Http\HttpContext;
+use DevNet\Web\Http\Message\HttpContext;
 
 interface IRequestHandler
 {
diff --git a/lib/Middleware/MiddlewareDelegate.php b/lib/Middleware/MiddlewareDelegate.php
@@ -9,7 +9,7 @@
 namespace DevNet\Web\Middleware;
 
 use DevNet\System\Delegate;
-use DevNet\Web\Http\HttpContext;
+use DevNet\Web\Http\Message\HttpContext;
 
 class MiddlewareDelegate extends Delegate
 {
diff --git a/lib/Middleware/RequestDelegate.php b/lib/Middleware/RequestDelegate.php
@@ -9,7 +9,7 @@
 namespace DevNet\Web\Middleware;
 
 use DevNet\System\Delegate;
-use DevNet\Web\Http\HttpContext;
+use DevNet\Web\Http\Message\HttpContext;
 
 class RequestDelegate extends Delegate
 {
diff --git a/lib/Routing/RouteContext.php b/lib/Routing/RouteContext.php
@@ -9,7 +9,7 @@
 namespace DevNet\Web\Routing;
 
 use DevNet\System\PropertyTrait;
-use DevNet\Web\Http\HttpContext;
+use DevNet\Web\Http\Message\HttpContext;
 
 class RouteContext
 {
diff --git a/lib/Routing/RouterException.php b/lib/Routing/RouterException.php
@@ -8,7 +8,7 @@
 
 namespace DevNet\Web\Routing;
 
-use DevNet\Web\Http\HttpException;
+use DevNet\Web\Http\Message\HttpException;
 
 class RouterException extends HttpException
 {
diff --git a/lib/Routing/RouterMiddleware.php b/lib/Routing/RouterMiddleware.php
@@ -9,7 +9,7 @@
 namespace DevNet\Web\Routing;
 
 use DevNet\System\Async\Task;
-use DevNet\Web\Http\HttpContext;
+use DevNet\Web\Http\Message\HttpContext;
 use DevNet\Web\Middleware\IMiddleware;
 use DevNet\Web\Middleware\RequestDelegate;
 
diff --git a/lib/Security/Authentication/AuthenticationBuilder.php b/lib/Security/Authentication/AuthenticationBuilder.php
@@ -9,7 +9,7 @@
 namespace DevNet\Web\Security\Authentication;
 
 use DevNet\System\Runtime\LauncherProperties;
-use DevNet\Web\Http\HttpContext;
+use DevNet\Web\Http\Message\HttpContext;
 use DevNet\Web\Security\Authentication\JwtBearer\JwtBearerHandler;
 use DevNet\Web\Security\Authentication\JwtBearer\JwtBearerOptions;
 use DevNet\Web\Security\Authentication\Cookies\AuthenticationCookieHandler;
diff --git a/lib/Security/Authentication/AuthenticationException.php b/lib/Security/Authentication/AuthenticationException.php
@@ -8,7 +8,7 @@
 
 namespace DevNet\Web\Security\Authentication;
 
-use DevNet\Web\Http\HttpException;
+use DevNet\Web\Http\Message\HttpException;
 
 class AuthenticationException extends HttpException
 {
diff --git a/lib/Security/Authentication/AuthenticationMiddleware.php b/lib/Security/Authentication/AuthenticationMiddleware.php
@@ -8,7 +8,7 @@
 
 namespace DevNet\Web\Security\Authentication;
 
-use DevNet\Web\Http\HttpContext;
+use DevNet\Web\Http\Message\HttpContext;
 use DevNet\Web\Middleware\IMiddleware;
 use DevNet\Web\Middleware\RequestDelegate;
 use DevNet\Web\Security\Authentication\IAuthentication;
diff --git a/lib/Security/Authentication/JwtBearer/JwtBearerHandler.php b/lib/Security/Authentication/JwtBearer/JwtBearerHandler.php
@@ -9,7 +9,7 @@
 namespace DevNet\Web\Security\Authentication\JwtBearer;
 
 use DevNet\System\PropertyTrait;
-use DevNet\Web\Http\HttpContext;
+use DevNet\Web\Http\Message\HttpContext;
 use DevNet\Web\Security\Authentication\AuthenticationResult;
 use DevNet\Web\Security\Authentication\IAuthenticationHandler;
 use DevNet\Web\Security\Tokens\Jwt\JwtSecurityTokenHandler;
diff --git a/lib/Security/Authorization/AuthorizationException.php b/lib/Security/Authorization/AuthorizationException.php
@@ -8,7 +8,7 @@
 
 namespace DevNet\Web\Security\Authorization;
 
-use DevNet\Web\Http\HttpException;
+use DevNet\Web\Http\Message\HttpException;
 
 class AuthorizationException extends HttpException
 {
diff --git a/lib/Security/Tokens/Csrf/Antiforgery.php b/lib/Security/Tokens/Csrf/Antiforgery.php
diff --git a/lib/Security/Tokens/Csrf/AntiforgeryOptions.php b/lib/Security/Tokens/Csrf/AntiforgeryOptions.php
diff --git a/lib/Security/Tokens/Csrf/AntiforgeryTokenGenerator.php b/lib/Security/Tokens/Csrf/AntiforgeryTokenGenerator.php
diff --git a/lib/Security/Tokens/Csrf/IAntiforgery.php b/lib/Security/Tokens/Csrf/IAntiforgery.php

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`namespace DevNet\Web\Endpoint;`
`10`	`10`
`11`	`11`	`use DevNet\System\PropertyTrait;`
`12`		`-use DevNet\Web\Http\HttpContext;`
	`12`	`+use DevNet\Web\Http\Message\HttpContext;`
`13`	`13`
`14`	`14`	`class ActionContext`
`15`	`15`	`{`