From 9aa9fa9abe736daefe82500d14483c1e74efc329 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Tue, 10 Nov 2020 22:08:07 +0100 Subject: [PATCH] simplify getLanguage call in request --- Message/RequestAbstract.php | 12 ++++++++++++ Message/ResponseAbstract.php | 12 ++++++++++++ tests/Message/Console/ConsoleRequestTest.php | 2 +- tests/Message/Http/HttpRequestTest.php | 2 +- 4 files changed, 26 insertions(+), 2 deletions(-) diff --git a/Message/RequestAbstract.php b/Message/RequestAbstract.php index d943257ff..5f38c2e3c 100644 --- a/Message/RequestAbstract.php +++ b/Message/RequestAbstract.php @@ -232,6 +232,18 @@ abstract class RequestAbstract implements MessageInterface return $this->header; } + /** + * Get request language. + * + * @return string + * + * @since 1.0.0 + */ + public function getLanguage() : string + { + return $this->header->getL11n()->getLanguage(); + } + /** * Get request hash. * diff --git a/Message/ResponseAbstract.php b/Message/ResponseAbstract.php index 9d3f60106..16511cb38 100644 --- a/Message/ResponseAbstract.php +++ b/Message/ResponseAbstract.php @@ -103,6 +103,18 @@ abstract class ResponseAbstract implements \JsonSerializable, MessageInterface return $this->header; } + /** + * Get response language. + * + * @return string + * + * @since 1.0.0 + */ + public function getLanguage() : string + { + return $this->header->getL11n()->getLanguage(); + } + /** * Get response body. * diff --git a/tests/Message/Console/ConsoleRequestTest.php b/tests/Message/Console/ConsoleRequestTest.php index a4ac42992..a575eb55a 100644 --- a/tests/Message/Console/ConsoleRequestTest.php +++ b/tests/Message/Console/ConsoleRequestTest.php @@ -39,7 +39,7 @@ class ConsoleRequestTest extends \PHPUnit\Framework\TestCase public function testDefault() : void { $request = new ConsoleRequest(); - self::assertEquals('en', $request->getHeader()->getL11n()->getLanguage()); + self::assertEquals('en', $request->getLanguage()); self::assertEquals(OSType::LINUX, $request->getOS()); self::assertEquals('127.0.0.1', $request->getOrigin()); self::assertEmpty($request->getBody()); diff --git a/tests/Message/Http/HttpRequestTest.php b/tests/Message/Http/HttpRequestTest.php index 392a73082..5c4b178cf 100644 --- a/tests/Message/Http/HttpRequestTest.php +++ b/tests/Message/Http/HttpRequestTest.php @@ -42,7 +42,7 @@ class HttpRequestTest extends \PHPUnit\Framework\TestCase $_SERVER['HTTP_USER_AGENT'] = OSType::UNKNOWN . BrowserType::UNKNOWN; - self::assertEquals('en', $request->getHeader()->getL11n()->getLanguage()); + self::assertEquals('en', $request->getLanguage()); self::assertFalse($request->isMobile()); self::assertEquals(BrowserType::UNKNOWN, $request->getBrowser()); self::assertEquals(OSType::UNKNOWN, $request->getOS());