Jingga/phpOMS
1
0
Fork 0
mirror of https://github.com/Karaka-Management/phpOMS.git synced 2026-02-05 03:58:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

continue with getter/setter removal

Browse Source
This commit is contained in:
Dennis Eichhorn 2023-05-30 04:15:43 +02:00
parent 678f066a41
commit e05dbd4156
12 changed files with 32 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Localization/L11nManager.php
View File

@ -275,7 +275,7 @@ final class L11nManager
int $divide = 1 int $divide = 1
) : string ) : string
{ {
$language = $l11n->getLanguage(); $language = $l11n->language;
$symbol ??= $l11n->getCurrency(); $symbol ??= $l11n->getCurrency();
if (\is_float($currency)) { if (\is_float($currency)) {

24
Localization/Localization.php
View File

@ -347,18 +347,6 @@ class Localization implements \JsonSerializable
$this->setDatetime($locale['datetime'] ?? []); $this->setDatetime($locale['datetime'] ?? []);
} }
/**
* Get country
*
* @return string
*
* @since 1.0.0
*/
public function getCountry() : string
{
return $this->country;
}
/** /**
* Set country name * Set country name
* *
@ -409,18 +397,6 @@ class Localization implements \JsonSerializable
$this->timezone = $timezone; $this->timezone = $timezone;
} }
/**
* Get language
*
* @return string
*
* @since 1.0.0
*/
public function getLanguage() : string
{
return $this->language;
}
/** /**
* Set language code * Set language code
* *

2
Message/Http/HttpRequest.php
View File

@ -404,7 +404,7 @@ final class HttpRequest extends RequestAbstract
public function getLocale() : string public function getLocale() : string
{ {
if (!empty($this->locale)) { 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'])) { if (!isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {

62
Message/RequestAbstract.php
View File

@ -380,30 +380,6 @@ abstract class RequestAbstract implements MessageInterface
$this->lock = true; $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. * Get request hash.
* *
@ -442,44 +418,6 @@ abstract class RequestAbstract implements MessageInterface
return $this->uri->__toString(); 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 * Add file to request
* *

2
Message/ResponseAbstract.php
View File

@ -104,7 +104,7 @@ abstract class ResponseAbstract implements \JsonSerializable, MessageInterface
return ISO639x1Enum::_EN; return ISO639x1Enum::_EN;
} }
return $this->header->l11n->getLanguage(); return $this->header->l11n->language;
} }
/** /**

34
Module/ModuleAbstract.php
View File

@ -71,7 +71,7 @@ abstract class ModuleAbstract
* @var string[] * @var string[]
* @since 1.0.0 * @since 1.0.0
*/ */
protected static array $providing = []; public static array $providing = [];
/** /**
* Dependencies. * Dependencies.
@ -79,7 +79,7 @@ abstract class ModuleAbstract
* @var string[] * @var string[]
* @since 1.0.0 * @since 1.0.0
*/ */
protected static array $dependencies = []; public static array $dependencies = [];
/** /**
* Receiving modules from? * Receiving modules from?
@ -87,7 +87,7 @@ abstract class ModuleAbstract
* @var string[] * @var string[]
* @since 1.0.0 * @since 1.0.0
*/ */
protected array $receiving = []; public array $receiving = [];
/** /**
* Application instance. * Application instance.
@ -249,7 +249,7 @@ abstract class ModuleAbstract
$response->data[$request->uri->__toString()] = [ $response->data[$request->uri->__toString()] = [
'status' => NotificationLevel::OK, 'status' => NotificationLevel::OK,
'title' => '', '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, 'response' => $obj,
]; ];
} }
@ -275,7 +275,7 @@ abstract class ModuleAbstract
$response->data[$request->uri->__toString()] = [ $response->data[$request->uri->__toString()] = [
'status' => NotificationLevel::OK, 'status' => NotificationLevel::OK,
'title' => '', '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, 'response' => $obj,
]; ];
} }
@ -301,7 +301,7 @@ abstract class ModuleAbstract
$response->data[$request->uri->__toString()] = [ $response->data[$request->uri->__toString()] = [
'status' => NotificationLevel::OK, 'status' => NotificationLevel::OK,
'title' => '', '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, 'response' => $obj,
]; ];
} }
@ -327,7 +327,7 @@ abstract class ModuleAbstract
$response->data[$request->uri->__toString()] = [ $response->data[$request->uri->__toString()] = [
'status' => NotificationLevel::OK, 'status' => NotificationLevel::OK,
'title' => '', '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, 'response' => $obj,
]; ];
} }
@ -353,7 +353,7 @@ abstract class ModuleAbstract
$response->data[$request->uri->__toString()] = [ $response->data[$request->uri->__toString()] = [
'status' => NotificationLevel::OK, 'status' => NotificationLevel::OK,
'title' => '', '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, 'response' => $obj,
]; ];
} }
@ -379,7 +379,7 @@ abstract class ModuleAbstract
$response->data[$request->uri->__toString()] = [ $response->data[$request->uri->__toString()] = [
'status' => NotificationLevel::OK, 'status' => NotificationLevel::OK,
'title' => '', '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, 'response' => $obj,
]; ];
} }
@ -405,7 +405,7 @@ abstract class ModuleAbstract
$response->data[$request->uri->__toString()] = [ $response->data[$request->uri->__toString()] = [
'status' => NotificationLevel::WARNING, 'status' => NotificationLevel::WARNING,
'title' => '', '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, 'response' => $obj,
]; ];
} }
@ -431,7 +431,7 @@ abstract class ModuleAbstract
$response->data[$request->uri->__toString()] = [ $response->data[$request->uri->__toString()] = [
'status' => NotificationLevel::WARNING, 'status' => NotificationLevel::WARNING,
'title' => '', '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, 'response' => $obj,
]; ];
} }
@ -457,7 +457,7 @@ abstract class ModuleAbstract
$response->data[$request->uri->__toString()] = [ $response->data[$request->uri->__toString()] = [
'status' => NotificationLevel::WARNING, 'status' => NotificationLevel::WARNING,
'title' => '', '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, 'response' => $obj,
]; ];
} }
@ -483,7 +483,7 @@ abstract class ModuleAbstract
$response->data[$request->uri->__toString()] = [ $response->data[$request->uri->__toString()] = [
'status' => NotificationLevel::WARNING, 'status' => NotificationLevel::WARNING,
'title' => '', '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, 'response' => $obj,
]; ];
} }
@ -509,7 +509,7 @@ abstract class ModuleAbstract
$response->data[$request->uri->__toString()] = [ $response->data[$request->uri->__toString()] = [
'status' => NotificationLevel::WARNING, 'status' => NotificationLevel::WARNING,
'title' => '', '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, 'response' => $obj,
]; ];
} }
@ -535,7 +535,7 @@ abstract class ModuleAbstract
$response->data[$request->uri->__toString()] = [ $response->data[$request->uri->__toString()] = [
'status' => NotificationLevel::WARNING, 'status' => NotificationLevel::WARNING,
'title' => '', '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, 'response' => $obj,
]; ];
} }
@ -561,7 +561,7 @@ abstract class ModuleAbstract
$response->data[$request->uri->__toString()] = [ $response->data[$request->uri->__toString()] = [
'status' => NotificationLevel::WARNING, 'status' => NotificationLevel::WARNING,
'title' => '', '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, 'response' => $obj,
]; ];
} }
@ -580,7 +580,7 @@ abstract class ModuleAbstract
protected function fillJsonRawResponse(RequestAbstract $request, ResponseAbstract $response, mixed $obj) : void protected function fillJsonRawResponse(RequestAbstract $request, ResponseAbstract $response, mixed $obj) : void
{ {
$response->header->set('Content-Type', MimeType::M_JSON . '; charset=utf-8', true); $response->header->set('Content-Type', MimeType::M_JSON . '; charset=utf-8', true);
$response->data[$request->uri->__toString()] = $obj); $response->data[$request->uri->__toString()] = $obj;
} }
/** /**

8
Views/View.php
View File

@ -39,7 +39,7 @@ class View extends ViewAbstract
* @var array<string, mixed> * @var array<string, mixed>
* @since 1.0.0 * @since 1.0.0
*/ */
protected array $data = []; public array $data = [];
/** /**
* View Localization. * View Localization.
@ -47,7 +47,7 @@ class View extends ViewAbstract
* @var Localization * @var Localization
* @since 1.0.0 * @since 1.0.0
*/ */
protected Localization $l11n; public Localization $l11n;
/** /**
* Application. * Application.
@ -55,7 +55,7 @@ class View extends ViewAbstract
* @var L11nManager * @var L11nManager
* @since 1.0.0 * @since 1.0.0
*/ */
protected L11nManager $l11nManager; public L11nManager $l11nManager;
/** /**
* Request. * Request.
@ -216,7 +216,7 @@ class View extends ViewAbstract
/** @var string $theme */ /** @var string $theme */
$theme = $theme ?? $this->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);
} }
/** /**

2
tests/Message/Cli/CliRequestTest.php
View File

@ -42,7 +42,7 @@ final class CliRequestTest extends \PHPUnit\Framework\TestCase
public function testDefault() : void public function testDefault() : void
{ {
$request = new CliRequest(); $request = new CliRequest();
self::assertEquals('en', $request->getLanguage()); self::assertEquals('en', $request->header->l11n->language);
self::assertEquals(OSType::LINUX, $request->getOS()); self::assertEquals(OSType::LINUX, $request->getOS());
self::assertEquals('127.0.0.1', $request->getOrigin()); self::assertEquals('127.0.0.1', $request->getOrigin());
self::assertEmpty($request->getBody()); self::assertEmpty($request->getBody());

2
tests/Message/Http/HttpRequestLanguage.php
View File

@ -7,4 +7,4 @@ use phpOMS\Message\Http\HttpRequest;
$request = HttpRequest::createFromSuperglobals(); $request = HttpRequest::createFromSuperglobals();
echo $request->getCountry(); echo $request->header->l11n->country;

8
tests/Message/Http/HttpRequestTest.php
View File

@ -43,7 +43,7 @@ final class HttpRequestTest extends \PHPUnit\Framework\TestCase
$_SERVER['HTTP_USER_AGENT'] = OSType::UNKNOWN . BrowserType::UNKNOWN; $_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::assertFalse($request->isMobile());
self::assertEquals(BrowserType::UNKNOWN, $request->getBrowser()); self::assertEquals(BrowserType::UNKNOWN, $request->getBrowser());
self::assertEquals(OSType::UNKNOWN, $request->getOS()); self::assertEquals(OSType::UNKNOWN, $request->getOS());
@ -51,7 +51,7 @@ final class HttpRequestTest extends \PHPUnit\Framework\TestCase
self::assertFalse(HttpRequest::isHttps()); self::assertFalse(HttpRequest::isHttps());
self::assertEquals([], $request->getHash()); self::assertEquals([], $request->getHash());
self::assertEmpty($request->getBody()); self::assertEmpty($request->getBody());
self::assertEmpty($request->getFiles()); self::assertEmpty($request->files);
self::assertEquals(RouteVerb::GET, $request->getRouteVerb()); self::assertEquals(RouteVerb::GET, $request->getRouteVerb());
self::assertEquals(RequestMethod::GET, $request->getMethod()); self::assertEquals(RequestMethod::GET, $request->getMethod());
self::assertInstanceOf('\phpOMS\Message\Http\HttpHeader', $request->header); self::assertInstanceOf('\phpOMS\Message\Http\HttpHeader', $request->header);
@ -59,7 +59,7 @@ final class HttpRequestTest extends \PHPUnit\Framework\TestCase
self::assertEquals('', $request->__toString()); self::assertEquals('', $request->__toString());
self::assertFalse($request->hasData('key')); self::assertFalse($request->hasData('key'));
self::assertNull($request->getData('key')); self::assertNull($request->getData('key'));
self::assertEquals('en', $request->getCountry()); self::assertEquals('en', $request->header->l11n->country);
self::assertEquals('en_US', $request->getLocale()); 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 = new Localization();
$request->header->l11n->setLanguage(ISO639x1Enum::_DE); $request->header->l11n->setLanguage(ISO639x1Enum::_DE);
self::assertEquals(ISO639x1Enum::_DE, $request->getLanguage()); self::assertEquals(ISO639x1Enum::_DE, $request->header->l11n->language);
} }
/** /**

2
tests/Message/Http/HttpResponseTest.php
View File

@ -115,7 +115,7 @@ final class HttpResponseTest extends \PHPUnit\Framework\TestCase
$this->response->header->l11n = new Localization(); $this->response->header->l11n = new Localization();
$this->response->header->l11n->setLanguage(ISO639x1Enum::_DE); $this->response->header->l11n->setLanguage(ISO639x1Enum::_DE);
self::assertEquals(ISO639x1Enum::_DE, $this->response->getLanguage()); self::assertEquals(ISO639x1Enum::_DE, $this->response->header->l11n->language);
} }
/** /**

2
tests/Message/ResponseAbstractTest.php
View File

@ -56,7 +56,7 @@ final class ResponseAbstractTest extends \PHPUnit\Framework\TestCase
{ {
self::assertNull($this->response->get('asdf')); self::assertNull($this->response->get('asdf'));
self::assertEquals('', $this->response->getBody()); self::assertEquals('', $this->response->getBody());
self::assertTrue(ISO639x1Enum::isValidValue($this->response->getLanguage())); self::assertTrue(ISO639x1Enum::isValidValue($this->response->header->l11n->language));
} }
/** /**