111

core/Abstracts/BaseApplication.php

@@ -15,7 +15,6 @@ use Database\Connection;
 use Exception;
 use Http\Context\HttpHeaders;
 use Http\Context\HttpParams;
-use Http\Context\Request;
 use Http\Context\Response;
 use Http\Route\Router;
 use Http\Server;
@@ -485,7 +484,6 @@ abstract class BaseApplication extends Component
 			'async'           => ['class' => Async::class],
 			'kafka-container' => ['class' => KafkaProvider::class],
 			'response'        => ['class' => Response::class],
-			'request'         => ['class' => Request::class],
 			'shutdown'        => ['class' => Shutdown::class],
 		]);
 	}

core/Abstracts/TraitApplication.php

@@ -8,7 +8,6 @@ use Annotation\Annotation as SAnnotation;
 use Database\DatabasesProviders;
 use Http\Client\Client;
 use Http\Client\Curl;
-use Http\Context\Request;
 use Http\Context\Response;
 use Http\HttpFilter;
 use Http\Route\Router;
@@ -27,7 +26,6 @@ use Kiri\Jwt\Jwt;
  * @property \Redis|Redis $redis
  * @property Server $server
  * @property Response $response
- * @property Request $request
  * @property DatabasesProviders $db
  * @property Async $async
  * @property Logger $logger

core/Jwt/JWTAuthMiddleware.php

@@ -7,7 +7,6 @@ namespace Kiri\Jwt;
 
 use Closure;
 use Exception;
-use Http\Context\Request;
 use Http\Route\MiddlewareAbstracts;
 use Server\RequestInterface;
 use Kiri\Kiri;
@@ -26,14 +25,14 @@ class JWTAuthMiddleware extends MiddlewareAbstracts
 
 
 	/**
-	 * @param Request $request
+	 * @param RequestInterface $request
 	 * @param Closure $next
 	 * @return mixed
 	 * @throws Exception
 	 */
 	public function onHandler(RequestInterface $request, Closure $next): mixed
 	{
-		$authorization = $request->header('Authorization');
+		$authorization = $request->getHeaderLine('Authorization');
 		if (empty($authorization)) {
 			throw new JWTAuthTokenException('JWT voucher cannot be empty.');
 		}