move to sub-namespace

README.md

@@ -1,3 +1,3 @@
 # Request
 
-Potter Framework Request Interface
+Potter Framework Request Component

composer.json

@@ -1,11 +1,12 @@
 {
     "name": "potter/request",
-    "description": "Potter Framework Request Interface",
+    "description": "Potter Framework Request Component",
     "type": "library",
     "require": {
         "php": "^8.5",
         "psr/http-message": "^2.0",
-        "psr/http-server-handler": "^1.0"
+        "psr/http-server-handler": "^1.0",
+        "guzzlehttp/psr7": "^2.11"
     },
     "license": "MIT",
     "autoload": {

src/Potter/Request/AbstractRequest.php

@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Potter\Request;
+
+use \GuzzleHttp\Psr7\Request as BaseRequest;
+
+abstract class AbstractRequest extends BaseRequest implements RequestInterface
+{ }

src/Potter/Request/AbstractServerRequest.php

@@ -0,0 +1,10 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Potter\Request;
+
+use \GuzzleHttp\Psr7\ServerRequest as BaseServerRequest;
+
+abstract class AbstractServerRequest extends BaseServerRequest implements ServerRequestInterface
+{ }

src/Potter/Request/Contracts/ParsedBodyInterface.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Potter\Request;
+namespace Potter\Request\Contracts;
 
 use \Psr\Http\Message\ServerRequestInterface as PsrServerRequestInterface;
 

src/Potter/Request/Contracts/RequestAttributeInterface.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Potter\Request;
+namespace Potter\Request\Contracts;
 
 use \Psr\Http\Message\ServerRequestInterface as PsrServerRequestInterface;
 

src/Potter/Request/Contracts/RequestMethodInterface.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Potter\Request;
+namespace Potter\Request\Contracts;
 
 use \Psr\Http\Message\RequestInterface as PsrRequestInterface;
 

src/Potter/Request/Contracts/RequestParameterInterface.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Potter\Request;
+namespace Potter\Request\Contracts;
 
 use \Psr\Http\Message\ServerRequestInterface as PsrServerRequestInterface;
 

src/Potter/Request/Contracts/RequestTargetInterface.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Potter\Request;
+namespace Potter\Request\Contracts;
 
 use \Psr\Http\Message\RequestInterface as PsrRequestInterface;
 

src/Potter/Request/Contracts/RequestUploadInterface.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Potter\Request;
+namespace Potter\Request\Contracts;
 
 use \Psr\Http\Message\ServerRequestInterface as PsrServerRequestInterface;
 

src/Potter/Request/Contracts/RequestUriInterface.php

@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Potter\Request;
+namespace Potter\Request\Contracts;
 
 use \Psr\Http\Message\RequestInterface as PsrRequestInterface;
 

src/Potter/Request/Request.php

@@ -0,0 +1,8 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Potter\Request;
+
+class Request extends AbstractRequest
+{ }

src/Potter/Request/RequestInterface.php

@@ -5,6 +5,9 @@ declare(strict_types=1);
 namespace Potter\Request;
 
 use \Psr\Http\Message\RequestInterface as PsrRequestInterface;
+use \Potter\Request\Contracts\RequestMethodInterface;
+use \Potter\Request\Contracts\RequestTargetInterface;
+use \Potter\Request\Contracts\RequestUriInterface;
 
 interface RequestInterface extends PsrRequestInterface,
     RequestMethodInterface, RequestTargetInterface, RequestUriInterface

src/Potter/Request/ServerRequest.php

@@ -0,0 +1,8 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Potter\Request;
+
+class ServerRequest extends AbstractServerRequest
+{ }

src/Potter/Request/ServerRequestInterface.php

@@ -5,9 +5,12 @@ declare(strict_types=1);
 namespace Potter\Request;
 
 use \Psr\Http\Message\ServerRequestInterface as PsrServerRequestInterface;
+use \Potter\Request\Contracts\ParsedBodyInterface;
+use \Potter\Request\Contracts\RequestAttributeInterface;
+use \Potter\Request\Contracts\RequestParameterInterface;
+use \Potter\Request\Contracts\RequestUploadInterface;
 
 interface ServerRequestInterface extends PsrServerRequestInterface, 
-    RequestInterface, RequestAttributeInterface, 
-    RequestParameterInterface, RequestUploadInterface,
-    ParsedBodyInterface
+    RequestInterface, ParsedBodyInterface, RequestAttributeInterface, 
+    RequestParameterInterface, RequestUploadInterface
 { }