Fixed some small aspects

Author: PandaHugMonster

src/generic/BasicInitConfig.php

@@ -2,6 +2,7 @@
 
 namespace spaf\simputils\generic;
 
+use spaf\simputils\attributes\DebugHide;
 use spaf\simputils\attributes\markers\Shortcut;
 use spaf\simputils\attributes\Property;
 use spaf\simputils\DT;
@@ -58,10 +59,15 @@ abstract class BasicInitConfig extends SimpleObject {
 	public ?string $code_root = null;
 	public ?string $working_dir = null;
 	public array|Box $disable_init_for = [];
+
+	#[DebugHide]
 	protected null|string $_l10n_name = null;
+	#[DebugHide]
 	protected mixed $_l10n = null;
 
+	#[DebugHide]
 	protected array $_successful_init_blocks = [];
+	#[DebugHide]
 	protected bool $_is_already_setup = false;
 
 	#[Property('default_tz')]
@@ -76,11 +82,6 @@ protected function setDefaultTimeZone(string|DateTimeZone $tz) {
 		DT::setDefaultTimeZone($tz);
 	}
 
-	#[Property('l10n_name')]
-	protected function getL10nName(): mixed {
-		return $this->_l10n_name;
-	}
-
 	#[Property('l10n')]
 	protected function getL10n(): mixed {
 		return $this->_l10n;
@@ -93,11 +94,11 @@ protected function setL10n(null|string|L10n $val): void {
 			$this->_l10n_name = $val; // @codeCoverageIgnore
 		} else {
 			if (Str::is($val)) {
-				$this->_l10n_name = $val;
 
 				$class = PHP::redef(L10n::class);
 				$l10n_name = Str::upper($val);
 				$path = FS::path(PHP::frameworkDir(), 'data', 'l10n', "{$l10n_name}.json");
+				/** @var L10n $val */
 				$val = $class::createFrom($path);
 
 				$custom_file = FS::file(
@@ -108,6 +109,7 @@ protected function setL10n(null|string|L10n $val): void {
 						$val, 'setup', $custom_file->content ?? [] // @codeCoverageIgnore
 					); // @codeCoverageIgnore
 				}
+				$val->name = $l10n_name;
 			}
 
 			/** @var L10n $val */

src/models/L10n.php

@@ -2,14 +2,34 @@
 
 namespace spaf\simputils\models;
 
+use spaf\simputils\attributes\DebugHide;
+use spaf\simputils\attributes\Property;
 use spaf\simputils\DT;
 use spaf\simputils\generic\SimpleObject;
 use spaf\simputils\PHP;
 use spaf\simputils\traits\RedefinableComponentTrait;
 
+/**
+ * @property $name Name of the locale (basically-read only, can be set only once)
+ */
 class L10n extends SimpleObject {
 	use RedefinableComponentTrait;
 
+	#[DebugHide]
+	protected ?string $_name = null;
+
+	#[Property('name')]
+	protected function setName(string $val) {
+		if (empty($this->_name)) {
+			$this->_name = $val;
+		}
+	}
+
+	#[Property('name')]
+	protected function getName(): ?string {
+		return $this->_name;
+	}
+
 	public static $is_auto_setup = true;
 
 	protected $DateTime = [
@@ -22,7 +42,6 @@ class L10n extends SimpleObject {
 	protected $DataUnit = [
 		'translations' => []
 	];
-
 	/**
 	 * Apply those settings to other classes
 	 *

tests/general/InitConfigTest.php

@@ -27,6 +27,7 @@ public function initBlock(BasicInitConfig $config) {
 class InitConfigTest extends TestCase {
 
 	/**
+	 * @covers \spaf\simputils\models\L10n
 	 * @runInSeparateProcess
 	 * @return void
 	 */
@@ -37,7 +38,7 @@ function testBasics() {
 			new CustomInitCodeBlock(),
 		]);
 		$this->assertInstanceOf(L10n::class, $config->l10n);
-		$this->assertEquals('RU', $config->l10n_name);
+		$this->assertEquals('RU', $config->l10n->name);
 		$this->assertEquals('Asia/Novosibirsk', $config->default_tz);
 
 	}