refactor: add getQuery() to Http/Request

update package sources according to PSR-12 and phpstan

Author: Thorsten Suckow-Homberg

src/Http/Exception/BadRequestException.php

@@ -37,5 +37,8 @@
  */
 class BadRequestException extends HttpException
 {
+    /**
+     * @var int
+     */
     protected $code = StatusCodes::HTTP_400;
 }

src/Http/Exception/ForbiddenException.php

@@ -37,5 +37,8 @@
  */
 class ForbiddenException extends HttpException
 {
+    /**
+     * @var int
+     */
     protected $code = StatusCodes::HTTP_403;
 }

src/Http/Exception/InternalServerErrorException.php

@@ -37,5 +37,8 @@
  */
 class InternalServerErrorException extends HttpException
 {
+    /**
+     * @var int
+     */
     protected $code = StatusCodes::HTTP_500;
 }

src/Http/Exception/MethodNotAllowedException.php

@@ -37,5 +37,8 @@
  */
 class MethodNotAllowedException extends HttpException
 {
+    /**
+     * @var int
+     */
     protected $code = StatusCodes::HTTP_405;
 }

src/Http/Exception/NotFoundException.php

@@ -37,5 +37,8 @@
  */
 class NotFoundException extends HttpException
 {
+    /**
+     * @var int
+     */
     protected $code = StatusCodes::HTTP_404;
 }

src/Http/Exception/UnauthorizedException.php

@@ -37,5 +37,8 @@
  */
 class UnauthorizedException extends HttpException
 {
+    /**
+     * @var int
+     */
     protected $code = StatusCodes::HTTP_401;
 }

src/Http/Request.php

@@ -29,6 +29,7 @@
 
 namespace Conjoon\Http;
 
+use Conjoon\Net\Uri\Component\Query;
 use Conjoon\Net\Url;
 
 /**
@@ -40,13 +41,19 @@ class Request
     /**
      * @var Url
      */
-    protected readonly Url $url;
+    private readonly Url $url;
+
+
+    /**
+     * @var Query|null
+     */
+    private ?Query $query = null;
 
 
     /**
      * @var RequestMethod
      */
-    protected readonly RequestMethod $method;
+    private readonly RequestMethod $method;
 
 
     /**
@@ -74,12 +81,34 @@ public function getUrl(): Url
 
 
     /**
-     * Get the URL for the request.
+     * Get the HTTP request method used with this request.
      *
      * @return RequestMethod
      */
     public function getMethod(): RequestMethod
     {
         return $this->method;
     }
+
+
+    /**
+     * Returns the Query-component of the url of this request, or null
+     * if no query is available.
+     *
+     * @return Query|null
+     */
+    public function getQuery(): ?Query
+    {
+        if ($this->query) {
+            return $this->query;
+        }
+
+        $query = $this->url->getQuery();
+        if (!$query) {
+            return null;
+        }
+
+        $this->query = new Query($query);
+        return $this->query;
+    }
 }

src/Http/StatusCodes.php

@@ -66,7 +66,7 @@ class StatusCodes
     public const HTTP_500 = 500;
 
     /**
-     * @var array
+     * @var array<int, string>
      */
     public const HTTP_STATUS = [
         400 => "Bad Request",

tests/Http/Exception/BadRequestExceptionTest.php

@@ -43,7 +43,7 @@ class BadRequestExceptionTest extends TestCase
     /**
      * test instance
      */
-    public function testInstance()
+    public function testInstance(): void
     {
 
         $exception = new BadRequestException();

tests/Http/Exception/ForbiddenExceptionTest.php

@@ -43,7 +43,7 @@ class ForbiddenExceptionTest extends TestCase
     /**
      * test instance
      */
-    public function testInstance()
+    public function testInstance(): void
     {
 
         $exception = new ForbiddenException();