From e05dbd415674828ffabd4e22228d6c2ab56c42c2 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Tue, 30 May 2023 04:15:43 +0200 Subject: [PATCH] continue with getter/setter removal --- Localization/L11nManager.php | 2 +- Localization/Localization.php | 24 --------- Message/Http/HttpRequest.php | 2 +- Message/RequestAbstract.php | 62 ---------------------- Message/ResponseAbstract.php | 2 +- Module/ModuleAbstract.php | 34 ++++++------ Views/View.php | 8 +-- tests/Message/Cli/CliRequestTest.php | 2 +- tests/Message/Http/HttpRequestLanguage.php | 2 +- tests/Message/Http/HttpRequestTest.php | 8 +-- tests/Message/Http/HttpResponseTest.php | 2 +- tests/Message/ResponseAbstractTest.php | 2 +- 12 files changed, 32 insertions(+), 118 deletions(-) diff --git a/Localization/L11nManager.php b/Localization/L11nManager.php index af7d2b229..b823d4f21 100755 --- a/Localization/L11nManager.php +++ b/Localization/L11nManager.php @@ -275,7 +275,7 @@ final class L11nManager int $divide = 1 ) : string { - $language = $l11n->getLanguage(); + $language = $l11n->language; $symbol ??= $l11n->getCurrency(); if (\is_float($currency)) { diff --git a/Localization/Localization.php b/Localization/Localization.php index 286dbd3c7..d7456c5a3 100755 --- a/Localization/Localization.php +++ b/Localization/Localization.php @@ -347,18 +347,6 @@ class Localization implements \JsonSerializable $this->setDatetime($locale['datetime'] ?? []); } - /** - * Get country - * - * @return string - * - * @since 1.0.0 - */ - public function getCountry() : string - { - return $this->country; - } - /** * Set country name * @@ -409,18 +397,6 @@ class Localization implements \JsonSerializable $this->timezone = $timezone; } - /** - * Get language - * - * @return string - * - * @since 1.0.0 - */ - public function getLanguage() : string - { - return $this->language; - } - /** * Set language code * diff --git a/Message/Http/HttpRequest.php b/Message/Http/HttpRequest.php index c571f27b6..030ada013 100755 --- a/Message/Http/HttpRequest.php +++ b/Message/Http/HttpRequest.php @@ -404,7 +404,7 @@ final class HttpRequest extends RequestAbstract public function getLocale() : string { if (!empty($this->locale)) { - return $this->locale = $this->header->l11n->getLanguage() . '_' . $this->header->l11n->getCountry(); + return $this->locale = $this->header->l11n->language . '_' . $this->header->l11n->getCountry(); } if (!isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) { diff --git a/Message/RequestAbstract.php b/Message/RequestAbstract.php index aeadb4e62..d5992e45e 100755 --- a/Message/RequestAbstract.php +++ b/Message/RequestAbstract.php @@ -380,30 +380,6 @@ abstract class RequestAbstract implements MessageInterface $this->lock = true; } - /** - * Get request language. - * - * @return string - * - * @since 1.0.0 - */ - public function getLanguage() : string - { - return $this->header->l11n->getLanguage(); - } - - /** - * Get request language. - * - * @return string - * - * @since 1.0.0 - */ - public function getCountry() : string - { - return $this->header->l11n->getCountry(); - } - /** * Get request hash. * @@ -442,44 +418,6 @@ abstract class RequestAbstract implements MessageInterface return $this->uri->__toString(); } - /** - * Get files. - * - * @return array - * - * @since 1.0.0 - */ - public function getFiles() : array - { - return $this->files; - } - - /** - * Get files by name. - * - * @param string $name File name - * - * @return array - * - * @since 1.0.0 - */ - public function getFile(string $name) : array - { - return $this->files[$name] ?? []; - } - - /** - * Has files. - * - * @return bool - * - * @since 1.0.0 - */ - public function hasFiles() : bool - { - return !empty($this->files); - } - /** * Add file to request * diff --git a/Message/ResponseAbstract.php b/Message/ResponseAbstract.php index aa886fb80..6b5e8b752 100755 --- a/Message/ResponseAbstract.php +++ b/Message/ResponseAbstract.php @@ -104,7 +104,7 @@ abstract class ResponseAbstract implements \JsonSerializable, MessageInterface return ISO639x1Enum::_EN; } - return $this->header->l11n->getLanguage(); + return $this->header->l11n->language; } /** diff --git a/Module/ModuleAbstract.php b/Module/ModuleAbstract.php index f8ad6103b..7980d1043 100755 --- a/Module/ModuleAbstract.php +++ b/Module/ModuleAbstract.php @@ -71,7 +71,7 @@ abstract class ModuleAbstract * @var string[] * @since 1.0.0 */ - protected static array $providing = []; + public static array $providing = []; /** * Dependencies. @@ -79,7 +79,7 @@ abstract class ModuleAbstract * @var string[] * @since 1.0.0 */ - protected static array $dependencies = []; + public static array $dependencies = []; /** * Receiving modules from? @@ -87,7 +87,7 @@ abstract class ModuleAbstract * @var string[] * @since 1.0.0 */ - protected array $receiving = []; + public array $receiving = []; /** * Application instance. @@ -249,7 +249,7 @@ abstract class ModuleAbstract $response->data[$request->uri->__toString()] = [ 'status' => NotificationLevel::OK, 'title' => '', - 'message' => $this->app->l11nManager->getText($response->getLanguage(), '0', '0', 'SuccessfulCreate'), + 'message' => $this->app->l11nManager->getText($response->header->l11n->language, '0', '0', 'SuccessfulCreate'), 'response' => $obj, ]; } @@ -275,7 +275,7 @@ abstract class ModuleAbstract $response->data[$request->uri->__toString()] = [ 'status' => NotificationLevel::OK, 'title' => '', - 'message' => $this->app->l11nManager->getText($response->getLanguage(), '0', '0', 'SuccessfulUpdate'), + 'message' => $this->app->l11nManager->getText($response->header->l11n->language, '0', '0', 'SuccessfulUpdate'), 'response' => $obj, ]; } @@ -301,7 +301,7 @@ abstract class ModuleAbstract $response->data[$request->uri->__toString()] = [ 'status' => NotificationLevel::OK, 'title' => '', - 'message' => $this->app->l11nManager->getText($response->getLanguage(), '0', '0', 'SuccessfulDelete'), + 'message' => $this->app->l11nManager->getText($response->header->l11n->language, '0', '0', 'SuccessfulDelete'), 'response' => $obj, ]; } @@ -327,7 +327,7 @@ abstract class ModuleAbstract $response->data[$request->uri->__toString()] = [ 'status' => NotificationLevel::OK, 'title' => '', - 'message' => $this->app->l11nManager->getText($response->getLanguage(), '0', '0', 'SuccessfulRemove'), + 'message' => $this->app->l11nManager->getText($response->header->l11n->language, '0', '0', 'SuccessfulRemove'), 'response' => $obj, ]; } @@ -353,7 +353,7 @@ abstract class ModuleAbstract $response->data[$request->uri->__toString()] = [ 'status' => NotificationLevel::OK, 'title' => '', - 'message' => $this->app->l11nManager->getText($response->getLanguage(), '0', '0', 'SuccessfulReturn'), + 'message' => $this->app->l11nManager->getText($response->header->l11n->language, '0', '0', 'SuccessfulReturn'), 'response' => $obj, ]; } @@ -379,7 +379,7 @@ abstract class ModuleAbstract $response->data[$request->uri->__toString()] = [ 'status' => NotificationLevel::OK, 'title' => '', - 'message' => $this->app->l11nManager->getText($response->getLanguage(), '0', '0', 'SuccessfulAdd'), + 'message' => $this->app->l11nManager->getText($response->header->l11n->language, '0', '0', 'SuccessfulAdd'), 'response' => $obj, ]; } @@ -405,7 +405,7 @@ abstract class ModuleAbstract $response->data[$request->uri->__toString()] = [ 'status' => NotificationLevel::WARNING, 'title' => '', - 'message' => $this->app->l11nManager->getText($response->getLanguage(), '0', '0', 'InvalidCreate'), + 'message' => $this->app->l11nManager->getText($response->header->l11n->language, '0', '0', 'InvalidCreate'), 'response' => $obj, ]; } @@ -431,7 +431,7 @@ abstract class ModuleAbstract $response->data[$request->uri->__toString()] = [ 'status' => NotificationLevel::WARNING, 'title' => '', - 'message' => $this->app->l11nManager->getText($response->getLanguage(), '0', '0', 'InvalidUpdate'), + 'message' => $this->app->l11nManager->getText($response->header->l11n->language, '0', '0', 'InvalidUpdate'), 'response' => $obj, ]; } @@ -457,7 +457,7 @@ abstract class ModuleAbstract $response->data[$request->uri->__toString()] = [ 'status' => NotificationLevel::WARNING, 'title' => '', - 'message' => $this->app->l11nManager->getText($response->getLanguage(), '0', '0', 'InvalidDelete'), + 'message' => $this->app->l11nManager->getText($response->header->l11n->language, '0', '0', 'InvalidDelete'), 'response' => $obj, ]; } @@ -483,7 +483,7 @@ abstract class ModuleAbstract $response->data[$request->uri->__toString()] = [ 'status' => NotificationLevel::WARNING, 'title' => '', - 'message' => $this->app->l11nManager->getText($response->getLanguage(), '0', '0', 'InvalidRemove'), + 'message' => $this->app->l11nManager->getText($response->header->l11n->language, '0', '0', 'InvalidRemove'), 'response' => $obj, ]; } @@ -509,7 +509,7 @@ abstract class ModuleAbstract $response->data[$request->uri->__toString()] = [ 'status' => NotificationLevel::WARNING, 'title' => '', - 'message' => $this->app->l11nManager->getText($response->getLanguage(), '0', '0', 'InvalidReturn'), + 'message' => $this->app->l11nManager->getText($response->header->l11n->language, '0', '0', 'InvalidReturn'), 'response' => $obj, ]; } @@ -535,7 +535,7 @@ abstract class ModuleAbstract $response->data[$request->uri->__toString()] = [ 'status' => NotificationLevel::WARNING, 'title' => '', - 'message' => $this->app->l11nManager->getText($response->getLanguage(), '0', '0', 'InvalidAdd'), + 'message' => $this->app->l11nManager->getText($response->header->l11n->language, '0', '0', 'InvalidAdd'), 'response' => $obj, ]; } @@ -561,7 +561,7 @@ abstract class ModuleAbstract $response->data[$request->uri->__toString()] = [ 'status' => NotificationLevel::WARNING, 'title' => '', - 'message' => $this->app->l11nManager->getText($response->getLanguage(), '0', '0', 'InvalidPermission'), + 'message' => $this->app->l11nManager->getText($response->header->l11n->language, '0', '0', 'InvalidPermission'), 'response' => $obj, ]; } @@ -580,7 +580,7 @@ abstract class ModuleAbstract protected function fillJsonRawResponse(RequestAbstract $request, ResponseAbstract $response, mixed $obj) : void { $response->header->set('Content-Type', MimeType::M_JSON . '; charset=utf-8', true); - $response->data[$request->uri->__toString()] = $obj); + $response->data[$request->uri->__toString()] = $obj; } /** diff --git a/Views/View.php b/Views/View.php index 5d7c95598..fe70239f8 100755 --- a/Views/View.php +++ b/Views/View.php @@ -39,7 +39,7 @@ class View extends ViewAbstract * @var array * @since 1.0.0 */ - protected array $data = []; + public array $data = []; /** * View Localization. @@ -47,7 +47,7 @@ class View extends ViewAbstract * @var Localization * @since 1.0.0 */ - protected Localization $l11n; + public Localization $l11n; /** * Application. @@ -55,7 +55,7 @@ class View extends ViewAbstract * @var L11nManager * @since 1.0.0 */ - protected L11nManager $l11nManager; + public L11nManager $l11nManager; /** * Request. @@ -216,7 +216,7 @@ class View extends ViewAbstract /** @var string $theme */ $theme = $theme ?? $this->theme; - return $this->l11nManager->getText($this->l11n->getLanguage(), $module, $theme, $translation); + return $this->l11nManager->getText($this->l11n->language, $module, $theme, $translation); } /** diff --git a/tests/Message/Cli/CliRequestTest.php b/tests/Message/Cli/CliRequestTest.php index f69673b60..0fe514e1e 100755 --- a/tests/Message/Cli/CliRequestTest.php +++ b/tests/Message/Cli/CliRequestTest.php @@ -42,7 +42,7 @@ final class CliRequestTest extends \PHPUnit\Framework\TestCase public function testDefault() : void { $request = new CliRequest(); - self::assertEquals('en', $request->getLanguage()); + self::assertEquals('en', $request->header->l11n->language); self::assertEquals(OSType::LINUX, $request->getOS()); self::assertEquals('127.0.0.1', $request->getOrigin()); self::assertEmpty($request->getBody()); diff --git a/tests/Message/Http/HttpRequestLanguage.php b/tests/Message/Http/HttpRequestLanguage.php index 9bdb12c00..9a24b3b8f 100755 --- a/tests/Message/Http/HttpRequestLanguage.php +++ b/tests/Message/Http/HttpRequestLanguage.php @@ -7,4 +7,4 @@ use phpOMS\Message\Http\HttpRequest; $request = HttpRequest::createFromSuperglobals(); -echo $request->getCountry(); +echo $request->header->l11n->country; diff --git a/tests/Message/Http/HttpRequestTest.php b/tests/Message/Http/HttpRequestTest.php index b26dd3993..021d63f5f 100755 --- a/tests/Message/Http/HttpRequestTest.php +++ b/tests/Message/Http/HttpRequestTest.php @@ -43,7 +43,7 @@ final class HttpRequestTest extends \PHPUnit\Framework\TestCase $_SERVER['HTTP_USER_AGENT'] = OSType::UNKNOWN . BrowserType::UNKNOWN; - self::assertEquals('en', $request->getLanguage()); + self::assertEquals('en', $request->header->l11n->language); self::assertFalse($request->isMobile()); self::assertEquals(BrowserType::UNKNOWN, $request->getBrowser()); self::assertEquals(OSType::UNKNOWN, $request->getOS()); @@ -51,7 +51,7 @@ final class HttpRequestTest extends \PHPUnit\Framework\TestCase self::assertFalse(HttpRequest::isHttps()); self::assertEquals([], $request->getHash()); self::assertEmpty($request->getBody()); - self::assertEmpty($request->getFiles()); + self::assertEmpty($request->files); self::assertEquals(RouteVerb::GET, $request->getRouteVerb()); self::assertEquals(RequestMethod::GET, $request->getMethod()); self::assertInstanceOf('\phpOMS\Message\Http\HttpHeader', $request->header); @@ -59,7 +59,7 @@ final class HttpRequestTest extends \PHPUnit\Framework\TestCase self::assertEquals('', $request->__toString()); self::assertFalse($request->hasData('key')); self::assertNull($request->getData('key')); - self::assertEquals('en', $request->getCountry()); + self::assertEquals('en', $request->header->l11n->country); self::assertEquals('en_US', $request->getLocale()); } @@ -162,7 +162,7 @@ final class HttpRequestTest extends \PHPUnit\Framework\TestCase $request->header->l11n = new Localization(); $request->header->l11n->setLanguage(ISO639x1Enum::_DE); - self::assertEquals(ISO639x1Enum::_DE, $request->getLanguage()); + self::assertEquals(ISO639x1Enum::_DE, $request->header->l11n->language); } /** diff --git a/tests/Message/Http/HttpResponseTest.php b/tests/Message/Http/HttpResponseTest.php index a91a6398f..581312498 100755 --- a/tests/Message/Http/HttpResponseTest.php +++ b/tests/Message/Http/HttpResponseTest.php @@ -115,7 +115,7 @@ final class HttpResponseTest extends \PHPUnit\Framework\TestCase $this->response->header->l11n = new Localization(); $this->response->header->l11n->setLanguage(ISO639x1Enum::_DE); - self::assertEquals(ISO639x1Enum::_DE, $this->response->getLanguage()); + self::assertEquals(ISO639x1Enum::_DE, $this->response->header->l11n->language); } /** diff --git a/tests/Message/ResponseAbstractTest.php b/tests/Message/ResponseAbstractTest.php index 2460af20c..d81d3a09a 100755 --- a/tests/Message/ResponseAbstractTest.php +++ b/tests/Message/ResponseAbstractTest.php @@ -56,7 +56,7 @@ final class ResponseAbstractTest extends \PHPUnit\Framework\TestCase { self::assertNull($this->response->get('asdf')); self::assertEquals('', $this->response->getBody()); - self::assertTrue(ISO639x1Enum::isValidValue($this->response->getLanguage())); + self::assertTrue(ISO639x1Enum::isValidValue($this->response->header->l11n->language)); } /**