rename http classes

Message/Console/ConsoleHeader.php

@@ -26,7 +26,7 @@ use phpOMS\Message\HeaderAbstract;
  *
  * @SuppressWarnings(PHPMD.Superglobals)
  */
-final class Header extends HeaderAbstract
+final class ConsoleHeader extends HeaderAbstract
 {
     /**
      * Protocol version.

Message/Console/ConsoleRequest.php

@@ -31,7 +31,7 @@ use phpOMS\Uri\UriInterface;
  *
  * @SuppressWarnings(PHPMD.Superglobals)
  */
-final class Request extends RequestAbstract
+final class ConsoleRequest extends RequestAbstract
 {
     /**
      * Uri.
@@ -75,7 +75,7 @@ final class Request extends RequestAbstract
      */
     public function __construct(UriInterface $uri = null, Localization $l11n = null)
     {
-        $this->header = new Header();
+        $this->header = new ConsoleHeader();
         $this->header->setL11n($l11n ?? new Localization());
 
         $this->uri = $uri ?? new Argument();

Message/Console/ConsoleResponse.php

@@ -30,7 +30,7 @@ use phpOMS\Views\View;
  * @link    https://orange-management.org
  * @since   1.0.0
  */
-final class Response extends ResponseAbstract implements RenderableInterface
+final class ConsoleResponse extends ResponseAbstract implements RenderableInterface
 {
     /**
      * Response status.
@@ -49,7 +49,7 @@ final class Response extends ResponseAbstract implements RenderableInterface
      */
     public function __construct(Localization $l11n = null)
     {
-        $this->header = new Header();
+        $this->header = new ConsoleHeader();
         $this->header->setL11n($l11n ?? new Localization());
     }
 

Message/Http/HttpHeader.php

@@ -27,7 +27,7 @@ use phpOMS\System\MimeType;
  *
  * @SuppressWarnings(PHPMD.Superglobals)
  */
-final class Header extends HeaderAbstract
+final class HttpHeader extends HeaderAbstract
 {
     /**
      * Header.

Message/Http/HttpRequest.php

@@ -31,7 +31,7 @@ use phpOMS\Uri\UriInterface;
  *
  * @SuppressWarnings(PHPMD.Superglobals)
  */
-final class Request extends RequestAbstract
+final class HttpRequest extends RequestAbstract
 {
     /**
      * Request method.
@@ -83,7 +83,7 @@ final class Request extends RequestAbstract
      */
     public function __construct(UriInterface $uri = null, Localization $l11n = null)
     {
-        $this->header = new Header();
+        $this->header = new HttpHeader();
         $this->header->setL11n($l11n ?? new Localization());
 
         if ($uri !== null) {
@@ -405,7 +405,7 @@ final class Request extends RequestAbstract
     /**
      * Create request from superglobals.
      *
-     * @return Request
+     * @return HttpRequest
      *
      * @since 1.0.0
      */
@@ -650,11 +650,11 @@ final class Request extends RequestAbstract
     /**
      * Perform rest request
      *
-     * @return Response
+     * @return HttpResponse
      *
      * @since 1.0.0
      */
-    public function rest() : Response
+    public function rest() : HttpResponse
     {
         return Rest::request($this);
     }

Message/Http/HttpResponse.php

@@ -30,7 +30,7 @@ use phpOMS\Views\View;
  * @link    https://orange-management.org
  * @since   1.0.0
  */
-final class Response extends ResponseAbstract implements RenderableInterface
+final class HttpResponse extends ResponseAbstract implements RenderableInterface
 {
     /**
      * Constructor.
@@ -41,7 +41,7 @@ final class Response extends ResponseAbstract implements RenderableInterface
      */
     public function __construct(Localization $l11n = null)
     {
-        $this->header = new Header();
+        $this->header = new HttpHeader();
         $this->header->setL11n($l11n ?? new Localization());
     }
 

Message/Http/Rest.php

@@ -27,15 +27,15 @@ final class Rest
     /**
      * Make request.
      *
-     * @param Request $request Request
+     * @param HttpRequest $request Request
      *
-     * @return Response Returns the request result
+     * @return HttpResponse Returns the request result
      *
      * @throws \Exception this exception is thrown if an internal curl_init error occurs
      *
      * @since 1.0.0
      */
-    public static function request(Request $request) : Response
+    public static function request(HttpRequest $request) : HttpResponse
     {
         $curl = \curl_init();
 
@@ -79,7 +79,7 @@ final class Rest
         }
 
         $cHeaderString = '';
-        $response      = new Response();
+        $response      = new HttpResponse();
 
         \curl_setopt($curl, \CURLOPT_HEADERFUNCTION,
             function($curl, $header) use ($response, &$cHeaderString) {

Message/Socket/PacketManager.php

@@ -16,6 +16,8 @@ namespace phpOMS\Message\Socket;
 
 use phpOMS\Dispatcher\Dispatcher;
 use phpOMS\Router\SocketRouter;
+use phpOMS\Message\Socket\SocketRequest;
+use phpOMS\Message\Socket\SocketResponse;
 
 /**
  * Server class.
@@ -70,10 +72,10 @@ class PacketManager
      */
     public function handle(string $data, $client) : void
     {
-        $request = new Request($data);
+        $request = new SocketRequest();
         $request->getHeader()->setAccount($client->getAccount()->getId());
 
-        $response = new Response();
+        $response = new SocketResponse();
 
         $this->dispatcher->dispatch(
             $this->router->route($data, 'Socket', 1, $client->getAccount()),

Message/Socket/SocketHeader.php

@@ -26,7 +26,7 @@ use phpOMS\Message\HeaderAbstract;
  * @link    https://orange-management.org
  * @since   1.0.0
  */
-class Header extends HeaderAbstract implements \Serializable
+class SocketHeader extends HeaderAbstract implements \Serializable
 {
     private $sendFrom = null;
 

Message/Socket/SocketRequest.php

@@ -24,7 +24,7 @@ use phpOMS\Message\RequestAbstract;
  * @link    https://orange-management.org
  * @since   1.0.0
  */
-final class Request extends RequestAbstract
+final class SocketRequest extends RequestAbstract
 {
     /**
      * Constructor
@@ -33,7 +33,7 @@ final class Request extends RequestAbstract
      */
     public function __construct()
     {
-        $this->header = new Header();
+        $this->header = new SocketHeader();
     }
 
     /**

Message/Socket/SocketResponse.php

@@ -17,6 +17,9 @@ namespace phpOMS\Message\Socket;
 use phpOMS\Contract\RenderableInterface;
 use phpOMS\Message\ResponseAbstract;
 use phpOMS\System\MimeType;
+use phpOMS\Utils\StringUtils;
+use phpOMS\Log\FileLogger;
+use phpOMS\Views\View;
 
 /**
  * Response class.
@@ -26,7 +29,7 @@ use phpOMS\System\MimeType;
  * @link    https://orange-management.org
  * @since   1.0.0
  */
-final class Response extends ResponseAbstract implements RenderableInterface
+final class SocketResponse extends ResponseAbstract implements RenderableInterface
 {
    /**
     * Set response.

Module/ModuleManager.php

@@ -17,7 +17,7 @@ namespace phpOMS\Module;
 use phpOMS\ApplicationAbstract;
 use phpOMS\Autoloader;
 use phpOMS\DataStorage\Database\Query\Builder;
-use phpOMS\Message\Http\Request;
+use phpOMS\Message\Http\HttpRequest;
 use phpOMS\Message\RequestAbstract;
 use phpOMS\Module\Exception\InvalidModuleException;
 use phpOMS\System\File\PathException;
@@ -795,13 +795,13 @@ final class ModuleManager
     /**
      * Initialize all modules for a request.
      *
-     * @param Request $request Request
+     * @param HttpRequest $request Request
      *
      * @return void
      *
      * @since 1.0.0
      */
-    public function initRequestModules(Request $request) : void
+    public function initRequestModules(HttpRequest $request) : void
     {
         $toInit = $this->getRoutedModules($request);
 
@@ -813,13 +813,13 @@ final class ModuleManager
     /**
      * Get modules that run on this page.
      *
-     * @param Request $request Request
+     * @param HttpRequest $request Request
      *
      * @return string[]
      *
      * @since 1.0.0
      */
-    public function getRoutedModules(Request $request) : array
+    public function getRoutedModules(HttpRequest $request) : array
     {
         $files   = $this->getUriLoad($request);
         $modules = [];

Utils/Converter/Currency.php

@@ -15,7 +15,7 @@ declare(strict_types=1);
 namespace phpOMS\Utils\Converter;
 
 use phpOMS\Localization\ISO4217CharEnum;
-use phpOMS\Message\Http\Request;
+use phpOMS\Message\Http\HttpRequest;
 use phpOMS\Message\Http\RequestMethod;
 use phpOMS\Message\Http\Rest;
 use phpOMS\Uri\Http;
@@ -98,7 +98,7 @@ final class Currency
     public static function getEcbEuroRates() : array
     {
         if (empty(self::$ecbCurrencies)) {
-            $request = new Request(new Http('https://www.ecb.europa.eu/stats/eurofxref/eurofxref-daily.xml'));
+            $request = new HttpRequest(new Http('https://www.ecb.europa.eu/stats/eurofxref/eurofxref-daily.xml'));
             $request->setMethod(RequestMethod::GET);
 
             try {

tests/Dispatcher/DispatcherTest.php

@@ -17,8 +17,8 @@ namespace phpOMS\tests\Dispatcher;
 use phpOMS\ApplicationAbstract;
 use phpOMS\Dispatcher\Dispatcher;
 use phpOMS\Localization\Localization;
-use phpOMS\Message\Http\Request;
+use phpOMS\Message\Http\HttpRequest;
-use phpOMS\Message\Http\Response;
+use phpOMS\Message\Http\HttpResponse;
 use phpOMS\Router\WebRouter;
 use phpOMS\Uri\Http;
 
@@ -63,8 +63,8 @@ class DispatcherTest extends \PHPUnit\Framework\TestCase
             !empty(
                 $this->app->dispatcher->dispatch(
                     function($req, $resp, $data = null) { return true; },
-                    new Request(new Http(''), $localization),
+                    new HttpRequest(new Http(''), $localization),
-                    new Response($localization)
+                    new HttpResponse($localization)
                 )
             )
         );
@@ -91,8 +91,8 @@ class DispatcherTest extends \PHPUnit\Framework\TestCase
             !empty(
                 $this->app->dispatcher->dispatch(
                     'phpOMS\tests\Dispatcher\TestController:testFunction',
-                    new Request(new Http(''), $localization),
+                    new HttpRequest(new Http(''), $localization),
-                    new Response($localization)
+                    new HttpResponse($localization)
                 )
             )
         );
@@ -111,8 +111,8 @@ class DispatcherTest extends \PHPUnit\Framework\TestCase
             !empty(
                 $this->app->dispatcher->dispatch(
                     ['dest' => 'phpOMS\tests\Dispatcher\TestController:testFunction'],
-                    new Request(new Http(''), $localization),
+                    new HttpRequest(new Http(''), $localization),
-                    new Response($localization)
+                    new HttpResponse($localization)
                 )
             )
         );
@@ -139,8 +139,8 @@ class DispatcherTest extends \PHPUnit\Framework\TestCase
             !empty(
                 $this->app->dispatcher->dispatch(
                     'phpOMS\tests\Dispatcher\TestController::testFunctionStatic',
-                    new Request(new Http(''), $localization),
+                    new HttpRequest(new Http(''), $localization),
-                    new Response($localization)
+                    new HttpResponse($localization)
                 )
             )
         );
@@ -163,8 +163,8 @@ class DispatcherTest extends \PHPUnit\Framework\TestCase
                         'phpOMS\tests\Dispatcher\TestController:testFunction',
                         'phpOMS\tests\Dispatcher\TestController::testFunctionStatic',
                     ],
-                    new Request(new Http(''), $localization),
+                    new HttpRequest(new Http(''), $localization),
-                    new Response($localization)
+                    new HttpResponse($localization)
                 )
             )
         );

tests/Message/Console/ConsoleHeaderTest.php

@@ -15,16 +15,16 @@ declare(strict_types=1);
 namespace phpOMS\tests\Message\Console;
 
 use phpOMS\Localization\Localization;
-use phpOMS\Message\Console\Header;
+use phpOMS\Message\Console\ConsoleHeader;
 
 /**
  * @internal
  */
-class HeaderTest extends \PHPUnit\Framework\TestCase
+class ConsoleHeaderTest extends \PHPUnit\Framework\TestCase
 {
     public function testDefaults() : void
     {
-        $header = new Header();
+        $header = new ConsoleHeader();
         self::assertFalse($header->isLocked());
         self::assertEquals(0, $header->getStatusCode());
         self::assertEquals('1.0', $header->getProtocolVersion());
@@ -37,7 +37,7 @@ class HeaderTest extends \PHPUnit\Framework\TestCase
 
     public function testGetSet() : void
     {
-        $header = new Header();
+        $header = new ConsoleHeader();
 
         self::assertTrue($header->set('key', 'header'));
         self::assertEquals(['header'], $header->get('key'));
@@ -59,7 +59,7 @@ class HeaderTest extends \PHPUnit\Framework\TestCase
 
     public function testLockedHeaderSet() : void
     {
-        $header = new Header();
+        $header = new ConsoleHeader();
         $header->lock();
         self::assertTrue($header->isLocked());
         self::assertFalse($header->set('key', 'value'));
@@ -67,7 +67,7 @@ class HeaderTest extends \PHPUnit\Framework\TestCase
 
     public function testLockedHeaderRemove() : void
     {
-        $header = new Header();
+        $header = new ConsoleHeader();
         $header->lock();
         self::assertTrue($header->isLocked());
         self::assertFalse($header->remove('key'));

tests/Message/Console/ConsoleRequestTest.php

@@ -15,7 +15,7 @@ declare(strict_types=1);
 namespace phpOMS\tests\Message\Console;
 
 use phpOMS\Localization\Localization;
-use phpOMS\Message\Console\Request;
+use phpOMS\Message\Console\ConsoleRequest;
 use phpOMS\Message\Http\OSType;
 use phpOMS\Message\Http\RequestMethod;
 use phpOMS\Router\RouteVerb;
@@ -24,11 +24,11 @@ use phpOMS\Uri\Argument;
 /**
  * @internal
  */
-class RequestTest extends \PHPUnit\Framework\TestCase
+class ConsoleRequestTest extends \PHPUnit\Framework\TestCase
 {
     public function testDefault() : void
     {
-        $request = new Request();
+        $request = new ConsoleRequest();
 
         self::assertEquals('en', $request->getHeader()->getL11n()->getLanguage());
         self::assertEquals(OSType::LINUX, $request->getOS());
@@ -36,7 +36,7 @@ class RequestTest extends \PHPUnit\Framework\TestCase
         self::assertEmpty($request->getBody());
         self::assertEquals(RouteVerb::GET, $request->getRouteVerb());
         self::assertEquals(RequestMethod::GET, $request->getMethod());
-        self::assertInstanceOf('\phpOMS\Message\Console\Header', $request->getHeader());
+        self::assertInstanceOf('\phpOMS\Message\Console\ConsoleHeader', $request->getHeader());
         self::assertEquals('', $request->__toString());
         self::assertFalse($request->hasData('key'));
         self::assertNull($request->getData('key'));
@@ -44,7 +44,7 @@ class RequestTest extends \PHPUnit\Framework\TestCase
 
     public function testSetGet() : void
     {
-        $request = new Request(new Argument('get:some/test/path'), $l11n = new Localization());
+        $request = new ConsoleRequest(new Argument('get:some/test/path'), $l11n = new Localization());
 
         $request->setOS(OSType::WINDOWS_XP);
         self::assertEquals(OSType::WINDOWS_XP, $request->getOS());
@@ -74,14 +74,14 @@ class RequestTest extends \PHPUnit\Framework\TestCase
 
     public function testToString() : void
     {
-        $request = new Request(new Argument('get:some/test/path'));
+        $request = new ConsoleRequest(new Argument('get:some/test/path'));
         self::assertEquals('get:some/test/path', $request->__toString());
 
         $request->setData('test', 'data');
         $request->setData('test2', 3);
         self::assertEquals('get:some/test/path', $request->__toString());
 
-        $request = new Request(new Argument('get:some/test/path?test=var'));
+        $request = new ConsoleRequest(new Argument('get:some/test/path?test=var'));
         self::assertEquals('get:some/test/path?test=var', $request->__toString());
     }
 
@@ -89,7 +89,7 @@ class RequestTest extends \PHPUnit\Framework\TestCase
     {
         self::expectException(\Exception::class);
 
-        $request = new Request(new Argument('get:some/test/path'));
+        $request = new ConsoleRequest(new Argument('get:some/test/path'));
         $request->setMethod('failure');
         $request->getRouteVerb();
     }

tests/Message/Console/ConsoleResponseTest.php

@@ -15,26 +15,26 @@ declare(strict_types=1);
 namespace phpOMS\tests\Message\Console;
 
 use phpOMS\Localization\Localization;
-use phpOMS\Message\Console\Response;
+use phpOMS\Message\Console\ConsoleResponse;
 
 /**
  * @internal
  */
-class ResponseTest extends \PHPUnit\Framework\TestCase
+class ConsoleResponseTest extends \PHPUnit\Framework\TestCase
 {
     public function testDefault() : void
     {
-        $response = new Response(new Localization());
+        $response = new ConsoleResponse(new Localization());
         self::assertEquals('', $response->getBody());
         self::assertEquals('', $response->render());
         self::assertEquals([], $response->toArray());
         self::assertInstanceOf('\phpOMS\Localization\Localization', $response->getHeader()->getL11n());
-        self::assertInstanceOf('\phpOMS\Message\Console\Header', $response->getHeader());
+        self::assertInstanceOf('\phpOMS\Message\Console\ConsoleHeader', $response->getHeader());
     }
 
     public function testSetGet() : void
     {
-        $response = new Response(new Localization());
+        $response = new ConsoleResponse(new Localization());
 
         $response->setResponse(['a' => 1]);
         self::assertTrue($response->remove('a'));

tests/Message/Http/HttpHeaderTest.php

@@ -15,27 +15,27 @@ declare(strict_types=1);
 namespace phpOMS\tests\Message\Http;
 
 use phpOMS\Localization\Localization;
-use phpOMS\Message\Http\Header;
+use phpOMS\Message\Http\HttpHeader;
 use phpOMS\Message\Http\RequestStatusCode;
 use phpOMS\System\MimeType;
 
 /**
- * @testdox phpOMS\tests\Message\Http\HeaderTest: Header for http requests/responses
+ * @testdox phpOMS\tests\Message\Http\HttpHeaderTest: Header for http requests/responses
  *
  * @internal
  */
-class HeaderTest extends \PHPUnit\Framework\TestCase
+class HttpHeaderTest extends \PHPUnit\Framework\TestCase
 {
-    protected Header $header;
+    protected HttpHeader $header;
 
     protected function setUp() : void
     {
-        $this->header = new Header();
+        $this->header = new HttpHeader();
     }
 
     /**
      * @testdox The header has the expected default values after initialization
-     * @covers phpOMS\Message\Http\Header<extended>
+     * @covers phpOMS\Message\Http\HttpHeader<extended>
      * @group framework
      */
     public function testDefaults() : void
@@ -43,7 +43,7 @@ class HeaderTest extends \PHPUnit\Framework\TestCase
         self::assertFalse($this->header->isLocked());
         self::assertEquals(0, $this->header->getStatusCode());
         self::assertEquals('HTTP/1.1', $this->header->getProtocolVersion());
-        self::assertEmpty(Header::getAllHeaders());
+        self::assertEmpty(HttpHeader::getAllHeaders());
         self::assertEquals('', $this->header->getReasonPhrase());
         self::assertEquals([], $this->header->get('key'));
         self::assertFalse($this->header->has('key'));
@@ -53,21 +53,21 @@ class HeaderTest extends \PHPUnit\Framework\TestCase
 
     /**
      * @testdox Security policy headers get correctly identified
-     * @covers phpOMS\Message\Http\Header<extended>
+     * @covers phpOMS\Message\Http\HttpHeader<extended>
      * @group framework
      */
     public function testSecurityHeader() : void
     {
-        self::assertTrue(Header::isSecurityHeader('content-security-policy'));
+        self::assertTrue(HttpHeader::isSecurityHeader('content-security-policy'));
-        self::assertTrue(Header::isSecurityHeader('X-xss-protection'));
+        self::assertTrue(HttpHeader::isSecurityHeader('X-xss-protection'));
-        self::assertTrue(Header::isSecurityHeader('x-conTent-tYpe-options'));
+        self::assertTrue(HttpHeader::isSecurityHeader('x-conTent-tYpe-options'));
-        self::assertTrue(Header::isSecurityHeader('x-frame-options'));
+        self::assertTrue(HttpHeader::isSecurityHeader('x-frame-options'));
-        self::assertFalse(Header::isSecurityHeader('x-frame-optionss'));
+        self::assertFalse(HttpHeader::isSecurityHeader('x-frame-optionss'));
     }
 
     /**
      * @testdox Header data can be set, checked for existence and returned
-     * @covers phpOMS\Message\Http\Header<extended>
+     * @covers phpOMS\Message\Http\HttpHeader<extended>
      * @group framework
      */
     public function testDataInputOutput() : void
@@ -79,7 +79,7 @@ class HeaderTest extends \PHPUnit\Framework\TestCase
 
     /**
      * @testdox Header data can be forced to get overwritten
-     * @covers phpOMS\Message\Http\Header<extended>
+     * @covers phpOMS\Message\Http\HttpHeader<extended>
      * @group framework
      */
     public function testOverwrite() : void
@@ -91,7 +91,7 @@ class HeaderTest extends \PHPUnit\Framework\TestCase
 
     /**
      * @testdox By default header data doesn't get overwritten
-     * @covers phpOMS\Message\Http\Header<extended>
+     * @covers phpOMS\Message\Http\HttpHeader<extended>
      * @group framework
      */
     public function testInvalidOverwrite() : void
@@ -103,7 +103,7 @@ class HeaderTest extends \PHPUnit\Framework\TestCase
 
     /**
      * @testdox Header data can be removed
-     * @covers phpOMS\Message\Http\Header<extended>
+     * @covers phpOMS\Message\Http\HttpHeader<extended>
      * @group framework
      */
     public function testRemove() : void
@@ -115,7 +115,7 @@ class HeaderTest extends \PHPUnit\Framework\TestCase
 
     /**
      * @testdox None-existing header data cannot be removed
-     * @covers phpOMS\Message\Http\Header<extended>
+     * @covers phpOMS\Message\Http\HttpHeader<extended>
      * @group framework
      */
     public function testInvalidRemove() : void
@@ -125,7 +125,7 @@ class HeaderTest extends \PHPUnit\Framework\TestCase
 
     /**
      * @testdox Account data can be set and returned
-     * @covers phpOMS\Message\Http\Header<extended>
+     * @covers phpOMS\Message\Http\HttpHeader<extended>
      * @group framework
      */
     public function testAccountInputOutput() : void
@@ -136,7 +136,7 @@ class HeaderTest extends \PHPUnit\Framework\TestCase
 
     /**
      * @testdox Data can be defined as downloadable
-     * @covers phpOMS\Message\Http\Header<extended>
+     * @covers phpOMS\Message\Http\HttpHeader<extended>
      * @group framework
      */
     public function testDownloadable() : void
@@ -147,7 +147,7 @@ class HeaderTest extends \PHPUnit\Framework\TestCase
 
     /**
      * @testdox A header can be locked
-     * @covers phpOMS\Message\Http\Header<extended>
+     * @covers phpOMS\Message\Http\HttpHeader<extended>
      * @group framework
      */
     public function testLockInputOutput() : void
@@ -158,7 +158,7 @@ class HeaderTest extends \PHPUnit\Framework\TestCase
 
     /**
      * @testdox A locked header cannot add new data
-     * @covers phpOMS\Message\Http\Header<extended>
+     * @covers phpOMS\Message\Http\HttpHeader<extended>
      * @group framework
      */
     public function testLockInvalidSet() : void
@@ -169,7 +169,7 @@ class HeaderTest extends \PHPUnit\Framework\TestCase
 
     /**
      * @testdox A locked header cannot remove data
-     * @covers phpOMS\Message\Http\Header<extended>
+     * @covers phpOMS\Message\Http\HttpHeader<extended>
      * @group framework
      */
     public function testLockInvalidRemove() : void
@@ -180,7 +180,7 @@ class HeaderTest extends \PHPUnit\Framework\TestCase
 
     /**
      * @testdox The header can generate default http headers based on status codes
-     * @covers phpOMS\Message\Http\Header<extended>
+     * @covers phpOMS\Message\Http\HttpHeader<extended>
      * @group framework
      */
     public function testHeaderGeneration() : void
@@ -206,7 +206,7 @@ class HeaderTest extends \PHPUnit\Framework\TestCase
 
     /**
      * @testdox Security header data cannot be changed once defined
-     * @covers phpOMS\Message\Http\Header<extended>
+     * @covers phpOMS\Message\Http\HttpHeader<extended>
      * @group framework
      */
     public function testInvalidOverwriteSecurityHeader() : void

tests/Message/Http/HttpRequestTest.php

@@ -17,26 +17,26 @@ namespace phpOMS\tests\Message\Http;
 use phpOMS\Localization\Localization;
 use phpOMS\Message\Http\BrowserType;
 use phpOMS\Message\Http\OSType;
-use phpOMS\Message\Http\Request;
+use phpOMS\Message\Http\HttpRequest;
 use phpOMS\Message\Http\RequestMethod;
 use phpOMS\Router\RouteVerb;
 use phpOMS\Uri\Http;
 
 /**
- * @testdox phpOMS\tests\Message\Http\RequestTest: Request wrapper for http requests
+ * @testdox phpOMS\tests\Message\Http\RequestTest: HttpRequest wrapper for http requests
  *
  * @internal
  */
-class RequestTest extends \PHPUnit\Framework\TestCase
+class HttpRequestTest extends \PHPUnit\Framework\TestCase
 {
     /**
      * @testdox The request has the expected default values after initialization
-     * @covers phpOMS\Message\Http\Request<extended>
+     * @covers phpOMS\Message\Http\HttpRequest<extended>
      * @group framework
      */
     public function testDefault() : void
     {
-        $request = new Request();
+        $request = new HttpRequest();
 
         $_SERVER['HTTP_USER_AGENT'] = OSType::UNKNOWN . BrowserType::UNKNOWN;
 
@@ -45,14 +45,14 @@ class RequestTest extends \PHPUnit\Framework\TestCase
         self::assertEquals(BrowserType::UNKNOWN, $request->getBrowser());
         self::assertEquals(OSType::UNKNOWN, $request->getOS());
         self::assertEquals('127.0.0.1', $request->getOrigin());
-        self::assertFalse(Request::isHttps());
+        self::assertFalse(HttpRequest::isHttps());
         self::assertEquals([], $request->getHash());
         self::assertEmpty($request->getBody());
         self::assertEmpty($request->getFiles());
         self::assertEquals(RouteVerb::GET, $request->getRouteVerb());
         self::assertEquals(RequestMethod::GET, $request->getMethod());
-        self::assertInstanceOf('\phpOMS\Message\Http\Header', $request->getHeader());
+        self::assertInstanceOf('\phpOMS\Message\Http\HttpHeader', $request->getHeader());
-        self::assertInstanceOf('\phpOMS\Message\Http\Request', Request::createFromSuperglobals());
+        self::assertInstanceOf('\phpOMS\Message\Http\HttpRequest', HttpRequest::createFromSuperglobals());
         self::assertEquals('http://', $request->__toString());
         self::assertFalse($request->hasData('key'));
         self::assertNull($request->getData('key'));
@@ -62,12 +62,12 @@ class RequestTest extends \PHPUnit\Framework\TestCase
 
     /**
      * @testdox The OS can be set and returned
-     * @covers phpOMS\Message\Http\Request<extended>
+     * @covers phpOMS\Message\Http\HttpRequest<extended>
      * @group framework
      */
     public function testOSInputOutput() : void
     {
-        $request = new Request(new Http('http://www.google.com/test/path'), $l11n = new Localization());
+        $request = new HttpRequest(new Http('http://www.google.com/test/path'), $l11n = new Localization());
 
         $request->setOS(OSType::WINDOWS_XP);
         self::assertEquals(OSType::WINDOWS_XP, $request->getOS());
@@ -75,12 +75,12 @@ class RequestTest extends \PHPUnit\Framework\TestCase
 
     /**
      * @testdox The browser can be set and returned
-     * @covers phpOMS\Message\Http\Request<extended>
+     * @covers phpOMS\Message\Http\HttpRequest<extended>
      * @group framework
      */
     public function testBrowserTypeInputOutput() : void
     {
-        $request = new Request(new Http('http://www.google.com/test/path'), $l11n = new Localization());
+        $request = new HttpRequest(new Http('http://www.google.com/test/path'), $l11n = new Localization());
 
         $request->setOS(OSType::WINDOWS_XP);
         self::assertEquals(OSType::WINDOWS_XP, $request->getOS());
@@ -92,12 +92,12 @@ class RequestTest extends \PHPUnit\Framework\TestCase
 
     /**
      * @testdox The request method can be set and returned
-     * @covers phpOMS\Message\Http\Request<extended>
+     * @covers phpOMS\Message\Http\HttpRequest<extended>
      * @group framework
      */
     public function testRequestMethodInputOutput() : void
     {
-        $request = new Request(new Http('http://www.google.com/test/path'), $l11n = new Localization());
+        $request = new HttpRequest(new Http('http://www.google.com/test/path'), $l11n = new Localization());
 
         $request->setMethod(RequestMethod::PUT);
         self::assertEquals(RequestMethod::PUT, $request->getMethod());
@@ -106,12 +106,12 @@ class RequestTest extends \PHPUnit\Framework\TestCase
 
     /**
      * @testdox The route verb gets correctly inferred from the request method
-     * @covers phpOMS\Message\Http\Request<extended>
+     * @covers phpOMS\Message\Http\HttpRequest<extended>
      * @group framework
      */
     public function testRequestMethodToRouteVerb() : void
     {
-        $request = new Request(new Http('http://www.google.com/test/path'), $l11n = new Localization());
+        $request = new HttpRequest(new Http('http://www.google.com/test/path'), $l11n = new Localization());
 
         $request->setMethod(RequestMethod::PUT);
         self::assertEquals(RouteVerb::PUT, $request->getRouteVerb());
@@ -125,24 +125,24 @@ class RequestTest extends \PHPUnit\Framework\TestCase
 
     /**
      * @testdox The request is correctly constructed
-     * @covers phpOMS\Message\Http\Request<extended>
+     * @covers phpOMS\Message\Http\HttpRequest<extended>
      * @group framework
      */
     public function testConstructInputOutput() : void
     {
-        $request = new Request(new Http('http://www.google.com/test/path'), $l11n = new Localization());
+        $request = new HttpRequest(new Http('http://www.google.com/test/path'), $l11n = new Localization());
 
         self::assertEquals('http://www.google.com/test/path', $request->__toString());
     }
 
     /**
      * @testdox The url hashes for the different paths get correctly generated
-     * @covers phpOMS\Message\Http\Request<extended>
+     * @covers phpOMS\Message\Http\HttpRequest<extended>
      * @group framework
      */
     public function testHashingInputOutput() : void
     {
-        $request = new Request(new Http('http://www.google.com/test/path'), $l11n = new Localization());
+        $request = new HttpRequest(new Http('http://www.google.com/test/path'), $l11n = new Localization());
 
         $request->createRequestHashs(0);
         self::assertEquals([
@@ -155,12 +155,12 @@ class RequestTest extends \PHPUnit\Framework\TestCase
 
     /**
      * @testdox Request data can be set and returned
-     * @covers phpOMS\Message\Http\Request<extended>
+     * @covers phpOMS\Message\Http\HttpRequest<extended>
      * @group framework
      */
     public function testDataInputOutput() : void
     {
-        $request = new Request(new Http('http://www.google.com/test/path'), $l11n = new Localization());
+        $request = new HttpRequest(new Http('http://www.google.com/test/path'), $l11n = new Localization());
 
         self::assertTrue($request->setData('key', 'value'));
         self::assertEquals('value', $request->getData('key'));
@@ -170,12 +170,12 @@ class RequestTest extends \PHPUnit\Framework\TestCase
 
     /**
      * @testdox Request data can be forcefully overwritten
-     * @covers phpOMS\Message\Http\Request<extended>
+     * @covers phpOMS\Message\Http\HttpRequest<extended>
      * @group framework
      */
     public function testOverwrite() : void
     {
-        $request = new Request(new Http('http://www.google.com/test/path'), $l11n = new Localization());
+        $request = new HttpRequest(new Http('http://www.google.com/test/path'), $l11n = new Localization());
 
         self::assertTrue($request->setData('key', 'value'));
         self::assertTrue($request->setData('key', 'value2', true));
@@ -184,12 +184,12 @@ class RequestTest extends \PHPUnit\Framework\TestCase
 
     /**
      * @testdox Request data is not overwritten by default
-     * @covers phpOMS\Message\Http\Request<extended>
+     * @covers phpOMS\Message\Http\HttpRequest<extended>
      * @group framework
      */
     public function testInvalidOverwrite() : void
     {
-        $request = new Request(new Http('http://www.google.com/test/path'), $l11n = new Localization());
+        $request = new HttpRequest(new Http('http://www.google.com/test/path'), $l11n = new Localization());
 
         self::assertTrue($request->setData('key', 'value'));
         self::assertFalse($request->setData('key', 'value2'));
@@ -198,12 +198,12 @@ class RequestTest extends \PHPUnit\Framework\TestCase
 
     /**
      * @testdox The uri can be changed and returned
-     * @covers phpOMS\Message\Http\Request<extended>
+     * @covers phpOMS\Message\Http\HttpRequest<extended>
      * @group framework
      */
     public function testUriInputOutput() : void
     {
-        $request = new Request(new Http('http://www.google.com/test/path'), $l11n = new Localization());
+        $request = new HttpRequest(new Http('http://www.google.com/test/path'), $l11n = new Localization());
 
         $request->setUri(new Http('http://www.google.com/test/path2'));
         self::assertEquals('http://www.google.com/test/path2', $request->__toString());
@@ -211,12 +211,12 @@ class RequestTest extends \PHPUnit\Framework\TestCase
 
     /**
      * @testdox Json data can be read from the request
-     * @covers phpOMS\Message\Http\Request<extended>
+     * @covers phpOMS\Message\Http\HttpRequest<extended>
      * @group framework
      */
     public function testDataJsonRead() : void
     {
-        $request = new Request(new Http(''));
+        $request = new HttpRequest(new Http(''));
 
         $data = [
             1, 2, 3,
@@ -230,24 +230,24 @@ class RequestTest extends \PHPUnit\Framework\TestCase
 
     /**
      * @testdox None-existing json data reads return empty data
-     * @covers phpOMS\Message\Http\Request<extended>
+     * @covers phpOMS\Message\Http\HttpRequest<extended>
      * @group framework
      */
     public function testEmptyDataJsonRead() : void
     {
-        $request = new Request(new Http(''));
+        $request = new HttpRequest(new Http(''));
 
         self::assertEquals([], $request->getDataJson('def'));
     }
 
     /**
      * @testdox Invalid json data returns empty data
-     * @covers phpOMS\Message\Http\Request<extended>
+     * @covers phpOMS\Message\Http\HttpRequest<extended>
      * @group framework
      */
     public function testInvalidDataJsonRead() : void
     {
-        $request = new Request(new Http(''));
+        $request = new HttpRequest(new Http(''));
 
         $data = [
             1, 2, 3,
@@ -261,12 +261,12 @@ class RequestTest extends \PHPUnit\Framework\TestCase
 
     /**
      * @testdox List data can be read from the request
-     * @covers phpOMS\Message\Http\Request<extended>
+     * @covers phpOMS\Message\Http\HttpRequest<extended>
      * @group framework
      */
     public function testDataList() : void
     {
-        $request = new Request(new Http(''));
+        $request = new HttpRequest(new Http(''));
 
         $data = [
             1, 2, 3,
@@ -279,24 +279,24 @@ class RequestTest extends \PHPUnit\Framework\TestCase
 
     /**
      * @testdox None-existing list data reads return empty data
-     * @covers phpOMS\Message\Http\Request<extended>
+     * @covers phpOMS\Message\Http\HttpRequest<extended>
      * @group framework
      */
     public function testEmptyDataList() : void
     {
-        $request = new Request(new Http(''));
+        $request = new HttpRequest(new Http(''));
 
         self::assertEquals([], $request->getDataList('def'));
     }
 
     /**
      * @testdox Request data can be read with pattern matching
-     * @covers phpOMS\Message\Http\Request<extended>
+     * @covers phpOMS\Message\Http\HttpRequest<extended>
      * @group framework
      */
     public function testDataLike() : void
     {
-        $request = new Request(new Http(''));
+        $request = new HttpRequest(new Http(''));
 
         $data = 'this is a test';
 
@@ -307,12 +307,12 @@ class RequestTest extends \PHPUnit\Framework\TestCase
 
     /**
      * @testdox In case of no pattern matches empty data is returned
-     * @covers phpOMS\Message\Http\Request<extended>
+     * @covers phpOMS\Message\Http\HttpRequest<extended>
      * @group framework
      */
     public function testInvalidDataLikeMatch() : void
     {
-        $request = new Request(new Http(''));
+        $request = new HttpRequest(new Http(''));
 
         $data = 'this is a test';
 
@@ -323,23 +323,23 @@ class RequestTest extends \PHPUnit\Framework\TestCase
 
     /**
      * @testdox A request with a path can be correctly casted to a string
-     * @covers phpOMS\Message\Http\Request<extended>
+     * @covers phpOMS\Message\Http\HttpRequest<extended>
      * @group framework
      */
     public function testToString() : void
     {
-        $request = new Request(new Http('http://www.google.com/test/path'));
+        $request = new HttpRequest(new Http('http://www.google.com/test/path'));
         self::assertEquals('http://www.google.com/test/path', $request->__toString());
     }
 
     /**
      * @testdox A request with a path and manually added data can be correctly casted to a string
-     * @covers phpOMS\Message\Http\Request<extended>
+     * @covers phpOMS\Message\Http\HttpRequest<extended>
      * @group framework
      */
     public function testToStringData() : void
     {
-        $request = new Request(new Http('http://www.google.com/test/path'));
+        $request = new HttpRequest(new Http('http://www.google.com/test/path'));
 
         $request->setData('test', 'data');
         $request->setData('test2', 3);
@@ -348,12 +348,12 @@ class RequestTest extends \PHPUnit\Framework\TestCase
 
     /**
      * @testdox A request with a path, query parameters and manually added data can be correctly casted to a string
-     * @covers phpOMS\Message\Http\Request<extended>
+     * @covers phpOMS\Message\Http\HttpRequest<extended>
      * @group framework
      */
     public function testToStringGetData() : void
     {
-        $request = new Request(new Http('http://www.google.com/test/path?test=var'));
+        $request = new HttpRequest(new Http('http://www.google.com/test/path?test=var'));
         self::assertEquals('http://www.google.com/test/path?test=var', $request->__toString());
 
         $request->setData('test', 'data');
@@ -363,12 +363,12 @@ class RequestTest extends \PHPUnit\Framework\TestCase
 
     /**
      * @testdox A rest request can be made from a request and the result can be read
-     * @covers phpOMS\Message\Http\Request<extended>
+     * @covers phpOMS\Message\Http\HttpRequest<extended>
      * @group framework
      */
     public function testRestRequest() : void
     {
-        $request = new Request(new Http('https://raw.githubusercontent.com/Orange-Management/Orange-Management/develop/LICENSE.txt'));
+        $request = new HttpRequest(new Http('https://raw.githubusercontent.com/Orange-Management/Orange-Management/develop/LICENSE.txt'));
         $request->setMethod(RequestMethod::GET);
 
         self::assertEquals(
@@ -379,27 +379,27 @@ class RequestTest extends \PHPUnit\Framework\TestCase
 
     /**
      * @testdox A invalid https port throws a OutOfRangeException
-     * @covers phpOMS\Message\Http\Request<extended>
+     * @covers phpOMS\Message\Http\HttpRequest<extended>
      * @group framework
      */
     public function testInvalidHttpsPort() : void
     {
         self::expectException(\OutOfRangeException::class);
 
-        $request = new Request(new Http('http://www.google.com/test/path'));
+        $request = new HttpRequest(new Http('http://www.google.com/test/path'));
         $request->isHttps(-1);
     }
 
     /**
      * @testdox A Invalid route verb throws a Exception
-     * @covers phpOMS\Message\Http\Request<extended>
+     * @covers phpOMS\Message\Http\HttpRequest<extended>
      * @group framework
      */
     public function testInvalidRouteVerb() : void
     {
         self::expectException(\Exception::class);
 
-        $request = new Request(new Http('http://www.google.com/test/path'));
+        $request = new HttpRequest(new Http('http://www.google.com/test/path'));
         $request->setMethod('failure');
         $request->getRouteVerb();
     }

tests/Message/Http/HttpResponseTest.php

@@ -14,26 +14,26 @@ declare(strict_types=1);
 
 namespace phpOMS\tests\Message\Http;
 
-use phpOMS\Message\Http\Response;
+use phpOMS\Message\Http\HttpResponse;
 use phpOMS\System\MimeType;
 
 /**
- * @testdox phpOMS\tests\Message\Http\ResponseTest: Response wrapper for http responses
+ * @testdox phpOMS\tests\Message\Http\ResponseTest: HttpResponse wrapper for http responses
  *
  * @internal
  */
 class ResponseTest extends \PHPUnit\Framework\TestCase
 {
-    protected Response $response;
+    protected HttpResponse $response;
 
     protected function setUp() : void
     {
-        $this->response = new Response();
+        $this->response = new HttpResponse();
     }
 
     /**
      * @testdox The response has the expected default values after initialization
-     * @covers phpOMS\Message\Http\Response<extended>
+     * @covers phpOMS\Message\Http\HttpResponse<extended>
      * @group framework
      */
     public function testDefault() : void
@@ -42,12 +42,12 @@ class ResponseTest extends \PHPUnit\Framework\TestCase
         self::assertEquals('', $this->response->render());
         self::assertEquals([], $this->response->toArray());
         self::assertInstanceOf('\phpOMS\Localization\Localization', $this->response->getHeader()->getL11n());
-        self::assertInstanceOf('\phpOMS\Message\Http\Header', $this->response->getHeader());
+        self::assertInstanceOf('\phpOMS\Message\Http\HttpHeader', $this->response->getHeader());
     }
 
     /**
      * @testdox Response data can be set and returned
-     * @covers phpOMS\Message\Http\Response<extended>
+     * @covers phpOMS\Message\Http\HttpResponse<extended>
      * @group framework
      */
     public function testResponseInputOutput() : void
@@ -58,7 +58,7 @@ class ResponseTest extends \PHPUnit\Framework\TestCase
 
     /**
      * @testdox Response data can be removed
-     * @covers phpOMS\Message\Http\Response<extended>
+     * @covers phpOMS\Message\Http\HttpResponse<extended>
      * @group framework
      */
     public function testRemove() : void
@@ -69,7 +69,7 @@ class ResponseTest extends \PHPUnit\Framework\TestCase
 
     /**
      * @testdox None-existing response data cannot be removed
-     * @covers phpOMS\Message\Http\Response<extended>
+     * @covers phpOMS\Message\Http\HttpResponse<extended>
      * @group framework
      */
     public function testInvalidRemove() : void
@@ -82,7 +82,7 @@ class ResponseTest extends \PHPUnit\Framework\TestCase
 
     /**
      * @testdox Response data can be turned into an array
-     * @covers phpOMS\Message\Http\Response<extended>
+     * @covers phpOMS\Message\Http\HttpResponse<extended>
      * @group framework
      */
     public function testToArray() : void
@@ -121,7 +121,7 @@ class ResponseTest extends \PHPUnit\Framework\TestCase
 
     /**
      * @testdox A response with json as content-type is automatically rendered as json data
-     * @covers phpOMS\Message\Http\Response<extended>
+     * @covers phpOMS\Message\Http\HttpResponse<extended>
      * @group framework
      */
     public function testJsonRender() : void
@@ -161,7 +161,7 @@ class ResponseTest extends \PHPUnit\Framework\TestCase
 
     /**
      * @testdox Json data can be decoded from the response data
-     * @covers phpOMS\Message\Http\Response<extended>
+     * @covers phpOMS\Message\Http\HttpResponse<extended>
      * @group framework
      */
     public function testJsonDataDecode() : void
@@ -174,7 +174,7 @@ class ResponseTest extends \PHPUnit\Framework\TestCase
 
     /**
      * @testdox A html response can be forced to minimize the content by removing newlines and whitespaces
-     * @covers phpOMS\Message\Http\Response<extended>
+     * @covers phpOMS\Message\Http\HttpResponse<extended>
      * @group framework
      */
     public function testMinimizedRender() : void
@@ -192,7 +192,7 @@ class ResponseTest extends \PHPUnit\Framework\TestCase
 
     /**
      * @testdox None-html responses cannot be forced to minimize the content by removing newlines and whitespaces
-     * @covers phpOMS\Message\Http\Response<extended>
+     * @covers phpOMS\Message\Http\HttpResponse<extended>
      * @group framework
      */
     public function testInvalidMinimizedRender() : void
@@ -210,7 +210,7 @@ class ResponseTest extends \PHPUnit\Framework\TestCase
 
     /**
      * @testdox Invalid response data results in an empty array
-     * @covers phpOMS\Message\Http\Response<extended>
+     * @covers phpOMS\Message\Http\HttpResponse<extended>
      * @group framework
      */
     public function testInvalidResponseDataToArray() : void
@@ -221,7 +221,7 @@ class ResponseTest extends \PHPUnit\Framework\TestCase
 
     /**
      * @testdox Invalid response data results in an empty render
-     * @covers phpOMS\Message\Http\Response<extended>
+     * @covers phpOMS\Message\Http\HttpResponse<extended>
      * @group framework
      */
     public function testInvalidResponseDataRender() : void

tests/Message/Http/RestTest.php

@@ -14,7 +14,7 @@ declare(strict_types=1);
 
 namespace phpOMS\tests\Message\Http;
 
-use phpOMS\Message\Http\Request;
+use phpOMS\Message\Http\HttpRequest;
 use phpOMS\Message\Http\RequestMethod;
 use phpOMS\Message\Http\Rest;
 use phpOMS\Uri\Http;
@@ -33,7 +33,7 @@ class RestTest extends \PHPUnit\Framework\TestCase
      */
     public function testRequest() : void
     {
-        $request = new Request(new Http('https://raw.githubusercontent.com/Orange-Management/Orange-Management/develop/LICENSE.txt'));
+        $request = new HttpRequest(new Http('https://raw.githubusercontent.com/Orange-Management/Orange-Management/develop/LICENSE.txt'));
         $request->setMethod(RequestMethod::GET);
 
         self::assertEquals(
@@ -49,7 +49,7 @@ class RestTest extends \PHPUnit\Framework\TestCase
      */
     public function testPost() : void
     {
-        $request = new Request(new Http('http://httpbin.org/post'));
+        $request = new HttpRequest(new Http('http://httpbin.org/post'));
         $request->setMethod(RequestMethod::POST);
         self::assertTrue($request->setData('pdata', 'abc'));
         self::assertEquals('abc', REST::request($request)->getJsonData()['form']['pdata']);
@@ -62,7 +62,7 @@ class RestTest extends \PHPUnit\Framework\TestCase
      */
     public function testPut() : void
     {
-        $request = new Request(new Http('http://httpbin.org/put'));
+        $request = new HttpRequest(new Http('http://httpbin.org/put'));
         $request->setMethod(RequestMethod::PUT);
         self::assertTrue($request->setData('pdata', 'abc'));
         self::assertEquals('abc', REST::request($request)->getJsonData()['form']['pdata']);
@@ -75,7 +75,7 @@ class RestTest extends \PHPUnit\Framework\TestCase
      */
     public function testDelete() : void
     {
-        $request = new Request(new Http('http://httpbin.org/delete'));
+        $request = new HttpRequest(new Http('http://httpbin.org/delete'));
         $request->setMethod(RequestMethod::DELETE);
         self::assertTrue($request->setData('ddata', 'abc'));
         self::assertEquals('abc', REST::request($request)->getJsonData()['form']['ddata']);
@@ -88,7 +88,7 @@ class RestTest extends \PHPUnit\Framework\TestCase
      */
     public function testGet() : void
     {
-        $request = new Request(new Http('http://httpbin.org/get'));
+        $request = new HttpRequest(new Http('http://httpbin.org/get'));
         $request->setMethod(RequestMethod::GET);
         self::assertTrue($request->setData('gdata', 'abc'));
         self::assertEquals('abc', REST::request($request)->getJsonData()['args']['gdata']);

tests/Module/ModuleAbstractTest.php

@@ -16,8 +16,8 @@ namespace phpOMS\tests\Module;
 
 require_once __DIR__ . '/../Autoloader.php';
 
-use phpOMS\Message\Http\Request;
+use phpOMS\Message\Http\HttpRequest;
-use phpOMS\Message\Http\Response;
+use phpOMS\Message\Http\HttpResponse;
 use phpOMS\Module\ModuleAbstract;
 use phpOMS\Uri\Http;
 
@@ -38,12 +38,12 @@ class ModuleAbstractTest extends \PHPUnit\Framework\TestCase
             const MODULE_ID                = 2;
             protected static array $dependencies = [1, 2];
 
-            public function fillJson(Request $request, Response $response, string $status, string $title, string $message, array $data) : void
+            public function fillJson(HttpRequest $request, HttpResponse $response, string $status, string $title, string $message, array $data) : void
             {
                 $this->fillJsonResponse($request, $response, $status, $title, $message, $data);
             }
 
-            public function fillJsonRaw(Request $request, Response $response, array $data) : void
+            public function fillJsonRaw(HttpRequest $request, HttpResponse $response, array $data) : void
             {
                 $this->fillJsonRawResponse($request, $response, $data);
             }
@@ -119,8 +119,8 @@ class ModuleAbstractTest extends \PHPUnit\Framework\TestCase
      */
     public function testFillJson() : void
     {
-        $request  = new Request(new Http(''));
+        $request  = new HttpRequest(new Http(''));
-        $response = new Response();
+        $response = new HttpResponse();
 
         $this->module->fillJson($request, $response, 'OK', 'Test Title', 'Test Message!', [1, 'test string', 'bool' => true]);
 
@@ -142,8 +142,8 @@ class ModuleAbstractTest extends \PHPUnit\Framework\TestCase
      */
     public function testFillJsonRaw() : void
     {
-        $request  = new Request(new Http(''));
+        $request  = new HttpRequest(new Http(''));
-        $response = new Response();
+        $response = new HttpResponse();
 
         $this->module->fillJsonRaw($request, $response, [1, 'test string', 'bool' => true]);
 

tests/Module/ModuleManagerTest.php

@@ -16,7 +16,7 @@ namespace phpOMS\tests\Module;
 
 use phpOMS\ApplicationAbstract;
 use phpOMS\Dispatcher\Dispatcher;
-use phpOMS\Message\Http\Request;
+use phpOMS\Message\Http\HttpRequest;
 use phpOMS\Module\ModuleManager;
 use phpOMS\Router\WebRouter;
 use phpOMS\Uri\Http;
@@ -179,7 +179,7 @@ class ModuleManagerTest extends \PHPUnit\Framework\TestCase
      */
     public function testRequestLoad() : void
     {
-        $request = new Request(new Http('http://127.0.0.1/en/backend/testmodule'));
+        $request = new HttpRequest(new Http('http://127.0.0.1/en/backend/testmodule'));
         $request->createRequestHashs(2);
 
         $loaded = $this->moduleManager->getUriLoad($request);

tests/Router/WebRouterTest.php

@@ -20,7 +20,7 @@ use phpOMS\Account\Account;
 use phpOMS\Account\PermissionAbstract;
 use phpOMS\Account\PermissionType;
 use phpOMS\Autoloader;
-use phpOMS\Message\Http\Request;
+use phpOMS\Message\Http\HttpRequest;
 use phpOMS\Router\RouteVerb;
 use phpOMS\Router\WebRouter;
 use phpOMS\Uri\Http;
@@ -50,7 +50,7 @@ class WebRouterTest extends \PHPUnit\Framework\TestCase
     {
         self::assertEmpty(
             $this->router->route(
-                (new Request(new Http('')))->getUri()->getRoute()
+                (new HttpRequest(new Http('')))->getUri()->getRoute()
             )
         );
     }
@@ -87,7 +87,7 @@ class WebRouterTest extends \PHPUnit\Framework\TestCase
         self::assertEquals(
             [['dest' => '\Modules\Admin\Controller:viewSettingsGeneral']],
             $this->router->route(
-                (new Request(
+                (new HttpRequest(
                     new Http('http://test.com/backend/admin/settings/general/something?test')
                 ))->getUri()->getRoute()
             )
@@ -106,7 +106,7 @@ class WebRouterTest extends \PHPUnit\Framework\TestCase
         self::assertNotEquals(
             [['dest' => '\Modules\Admin\Controller:viewSettingsGeneral']],
             $this->router->route(
-                (new Request(
+                (new HttpRequest(
                     new Http('http://test.com/backend/admin/settings/general/something?test')
                 ))->getUri()->getRoute(), null, RouteVerb::PUT)
         );
@@ -122,7 +122,7 @@ class WebRouterTest extends \PHPUnit\Framework\TestCase
         self::assertNotEquals(
             [['dest' => '\Modules\Admin\Controller:viewSettingsGeneral']],
             $this->router->route(
-                (new Request(
+                (new HttpRequest(
                     new Http('http://test.com/backends/admin/settings/general/something?test')
                 ))->getUri()->getRoute()
             )
@@ -132,7 +132,7 @@ class WebRouterTest extends \PHPUnit\Framework\TestCase
         self::assertEquals(
             [['dest' => 'Controller:test']],
             $this->router->route(
-                (new Request(
+                (new HttpRequest(
                     new Http('http://test.com/backends/admin/settings/general/something?test')
                 ))->getUri()->getRoute(), null, RouteVerb::ANY)
         );
@@ -140,7 +140,7 @@ class WebRouterTest extends \PHPUnit\Framework\TestCase
         self::assertEquals(
             [['dest' => 'Controller:test']],
             $this->router->route(
-                (new Request(
+                (new HttpRequest(
                     new Http('http://test.com/backends/admin/settings/general/something?test')
                 ))->getUri()->getRoute(), null, RouteVerb::SET)
         );
@@ -148,7 +148,7 @@ class WebRouterTest extends \PHPUnit\Framework\TestCase
         self::assertEquals(
             [['dest' => 'Controller:test']],
             $this->router->route(
-                (new Request(
+                (new HttpRequest(
                     new Http('http://test.com/backends/admin/settings/general/something?test')))->getUri()->getRoute(), null, RouteVerb::GET)
         );
     }
@@ -165,7 +165,7 @@ class WebRouterTest extends \PHPUnit\Framework\TestCase
         self::assertEquals(
             [['dest' => '\Modules\Admin\Controller:viewCsrf']],
             $this->router->route(
-                (new Request(
+                (new HttpRequest(
                     new Http('http://test.com/backend/admin/settings/csrf/something?test')
                 ))->getUri()->getRoute(),
                 'csrf_string'
@@ -185,7 +185,7 @@ class WebRouterTest extends \PHPUnit\Framework\TestCase
         self::assertEquals(
             [],
             $this->router->route(
-                (new Request(
+                (new HttpRequest(
                     new Http('http://test.com/backend/admin/settings/csrf/something?test')
                 ))->getUri()->getRoute()
             )
@@ -222,7 +222,7 @@ class WebRouterTest extends \PHPUnit\Framework\TestCase
         self::assertEquals(
             [['dest' => '\Modules\Admin\Controller:viewSettingsGeneral']],
             $this->router->route(
-                (new Request(new Http('http://test.com/backend/admin/settings/general/something?test')))->getUri()->getRoute(),
+                (new HttpRequest(new Http('http://test.com/backend/admin/settings/general/something?test')))->getUri()->getRoute(),
                 null,
                 RouteVerb::GET,
                 null,
@@ -286,7 +286,7 @@ class WebRouterTest extends \PHPUnit\Framework\TestCase
         self::assertNotEquals(
             [['dest' => '\Modules\Admin\Controller:viewSettingsGeneral']],
             $this->router->route(
-                (new Request(new Http('http://test.com/backend/admin/settings/general/something?test')))->getUri()->getRoute(),
+                (new HttpRequest(new Http('http://test.com/backend/admin/settings/general/something?test')))->getUri()->getRoute(),
                 null,
                 RouteVerb::GET,
                 null,

tests/Views/ViewTest.php

@@ -20,8 +20,8 @@ use phpOMS\ApplicationAbstract;
 use phpOMS\DataStorage\Database\DatabasePool;
 use phpOMS\Localization\L11nManager;
 use phpOMS\Localization\Localization;
-use phpOMS\Message\Http\Request;
+use phpOMS\Message\Http\HttpRequest;
-use phpOMS\Message\Http\Response;
+use phpOMS\Message\Http\HttpResponse;
 use phpOMS\Uri\Http;
 use phpOMS\Views\View;
 use phpOMS\Views\ViewAbstract;
@@ -59,7 +59,7 @@ class ViewTest extends \PHPUnit\Framework\TestCase
      */
     public function testDefault() : void
     {
-        $view = new View($this->app->l11nManager, new Request(new Http('')), new Response(new Localization()));
+        $view = new View($this->app->l11nManager, new HttpRequest(new Http('')), new HttpResponse(new Localization()));
 
         self::assertEmpty($view->getTemplate());
         self::assertEmpty($view->getViews());
@@ -78,7 +78,7 @@ class ViewTest extends \PHPUnit\Framework\TestCase
      */
     public function testGetText() : void
     {
-        $view = new View($this->app->l11nManager, $request = new Request(new Http('')), $response = new Response());
+        $view = new View($this->app->l11nManager, $request = new HttpRequest(new Http('')), $response = new HttpResponse());
         $view->setTemplate('/Modules/Admin/Theme/Backend/accounts-list');
 
         $expected = [
@@ -102,7 +102,7 @@ class ViewTest extends \PHPUnit\Framework\TestCase
      */
     public function testGetHtml() : void
     {
-        $view = new View($this->app->l11nManager, $request = new Request(new Http('')), $response = new Response());
+        $view = new View($this->app->l11nManager, $request = new HttpRequest(new Http('')), $response = new HttpResponse());
         $view->setTemplate('/Modules/Admin/Theme/Backend/accounts-list');
 
         $expected = [
@@ -126,7 +126,7 @@ class ViewTest extends \PHPUnit\Framework\TestCase
      */
     public function testDataInputOutput() : void
     {
-        $view = new View($this->app->l11nManager, $request = new Request(new Http('')), $response = new Response());
+        $view = new View($this->app->l11nManager, $request = new HttpRequest(new Http('')), $response = new HttpResponse());
 
         $view->setData('key', 'value');
         self::assertEquals('value', $view->getData('key'));
@@ -139,7 +139,7 @@ class ViewTest extends \PHPUnit\Framework\TestCase
      */
     public function testDataAdd() : void
     {
-        $view = new View($this->app->l11nManager, $request = new Request(new Http('')), $response = new Response());
+        $view = new View($this->app->l11nManager, $request = new HttpRequest(new Http('')), $response = new HttpResponse());
 
         self::assertTrue($view->addData('key2', 'valu2'));
         self::assertEquals('valu2', $view->getData('key2'));
@@ -152,7 +152,7 @@ class ViewTest extends \PHPUnit\Framework\TestCase
      */
     public function testInvalidDataOverwrite() : void
     {
-        $view = new View($this->app->l11nManager, $request = new Request(new Http('')), $response = new Response());
+        $view = new View($this->app->l11nManager, $request = new HttpRequest(new Http('')), $response = new HttpResponse());
 
         $view->addData('key2', 'valu2');
         self::assertFalse($view->addData('key2', 'valu3'));
@@ -166,7 +166,7 @@ class ViewTest extends \PHPUnit\Framework\TestCase
      */
     public function testRemove() : void
     {
-        $view = new View($this->app->l11nManager, $request = new Request(new Http('')), $response = new Response());
+        $view = new View($this->app->l11nManager, $request = new HttpRequest(new Http('')), $response = new HttpResponse());
 
         $view->addData('key2', 'valu2');
         self::assertTrue($view->removeData('key2'));
@@ -179,7 +179,7 @@ class ViewTest extends \PHPUnit\Framework\TestCase
      */
     public function testInvalidDataRemove() : void
     {
-        $view = new View($this->app->l11nManager, $request = new Request(new Http('')), $response = new Response());
+        $view = new View($this->app->l11nManager, $request = new HttpRequest(new Http('')), $response = new HttpResponse());
 
         self::assertFalse($view->removeData('key3'));
     }
@@ -191,7 +191,7 @@ class ViewTest extends \PHPUnit\Framework\TestCase
      */
     public function testGetRequest() : void
     {
-        $view = new View($this->app->l11nManager, $request = new Request(new Http('')), $response = new Response());
+        $view = new View($this->app->l11nManager, $request = new HttpRequest(new Http('')), $response = new HttpResponse());
 
         self::assertEquals($request, $view->getRequest());
         self::assertEquals($response, $view->getResponse());
@@ -204,7 +204,7 @@ class ViewTest extends \PHPUnit\Framework\TestCase
      */
     public function testGetResponse() : void
     {
-        $view = new View($this->app->l11nManager, $request = new Request(new Http('')), $response = new Response());
+        $view = new View($this->app->l11nManager, $request = new HttpRequest(new Http('')), $response = new HttpResponse());
 
         self::assertEquals($response, $view->getResponse());
     }
@@ -216,7 +216,7 @@ class ViewTest extends \PHPUnit\Framework\TestCase
      */
     public function testPrintHtml() : void
     {
-        $view = new View($this->app->l11nManager, $request = new Request(new Http('')), $response = new Response());
+        $view = new View($this->app->l11nManager, $request = new HttpRequest(new Http('')), $response = new HttpResponse());
 
         self::assertEquals('&lt;a href=&quot;test&quot;&gt;Test&lt;/a&gt;', $view->printHtml('<a href="test">Test</a>'));
         self::assertEquals('&lt;a href=&quot;test&quot;&gt;Test&lt;/a&gt;', ViewAbstract::html('<a href="test">Test</a>'));
@@ -229,7 +229,7 @@ class ViewTest extends \PHPUnit\Framework\TestCase
      */
     public function testViewInputOutput() : void
     {
-        $view = new View($this->app->l11nManager, $request = new Request(new Http('')), $response = new Response());
+        $view = new View($this->app->l11nManager, $request = new HttpRequest(new Http('')), $response = new HttpResponse());
 
         $tView = new View($this->app->l11nManager, $request, $response);
         self::assertTrue($view->addView('test', $tView));
@@ -244,7 +244,7 @@ class ViewTest extends \PHPUnit\Framework\TestCase
      */
     public function testInvalidViewGet() : void
     {
-        $view = new View($this->app->l11nManager, $request = new Request(new Http('')), $response = new Response());
+        $view = new View($this->app->l11nManager, $request = new HttpRequest(new Http('')), $response = new HttpResponse());
 
         self::assertFalse($view->getView('test'));
     }
@@ -256,7 +256,7 @@ class ViewTest extends \PHPUnit\Framework\TestCase
      */
     public function testViewRemove() : void
     {
-        $view = new View($this->app->l11nManager, $request = new Request(new Http('')), $response = new Response());
+        $view = new View($this->app->l11nManager, $request = new HttpRequest(new Http('')), $response = new HttpResponse());
 
         $tView = new View($this->app->l11nManager, $request, $response);
         $view->addView('test', $tView);
@@ -270,7 +270,7 @@ class ViewTest extends \PHPUnit\Framework\TestCase
      */
     public function testInvalidViewRemove() : void
     {
-        $view = new View($this->app->l11nManager, $request = new Request(new Http('')), $response = new Response());
+        $view = new View($this->app->l11nManager, $request = new HttpRequest(new Http('')), $response = new HttpResponse());
 
         self::assertFalse($view->removeView('test'));
     }