Fix CI regressions after LogBar update

Author: viames

src/Models/Locale.php

@@ -256,9 +256,15 @@ private function representationCodes(): array {
 			}
 		}
 
-		// Fallback for partially initialized Locale instances that do not have a persisted id yet.
-		$country = $this->getCountry() ?? new Country($this->countryId);
-		$language = $this->getLanguage() ?? new Language($this->languageId);
+		// Fallback for partially initialized Locale instances without triggering relation discovery.
+		$codes = $this->loadRepresentationCodesByRelationIds();
+
+		if ($codes) {
+			return $codes;
+		}
+
+		$country = new Country($this->countryId);
+		$language = new Language($this->languageId);
 
 		return [
 			'language' => (string)$language->code,
@@ -295,6 +301,40 @@ private function loadRepresentationCodes(): ?array {
 
 	}
 
+	/**
+	 * Load language and country codes from relation ids when the locale has not been persisted yet.
+	 *
+	 * @return	null|array{language: string, country: string}
+	 */
+	private function loadRepresentationCodesByRelationIds(): ?array {
+
+		$languageId = isset($this->languageId) ? (int)$this->languageId : 0;
+		$countryId = isset($this->countryId) ? (int)$this->countryId : 0;
+
+		if ($languageId <= 0 or $countryId <= 0) {
+			return null;
+		}
+
+		$query =
+			'SELECT l.`code` AS `language_code`, c.`code` AS `country_code`
+			FROM `languages` AS l
+			INNER JOIN `countries` AS c ON c.`id` = ?
+			WHERE l.`id` = ?
+			LIMIT 1';
+
+		$row = Database::load($query, [$countryId, $languageId], Database::OBJECT);
+
+		if (!$row) {
+			return null;
+		}
+
+		return [
+			'language' => (string)$row->language_code,
+			'country' => (string)$row->country_code,
+		];
+
+	}
+
 	/**
 	 * Returns the Locale object by its representation.
 	 * @param	string	Locale representation (eg. en-GB).

tests/Unit/Assets/PairLogBarAssetTest.php

@@ -23,7 +23,7 @@ public function testBreakpointDetectionSupportsBootstrapAndBulma(): void {
 		$this->assertStringContainsString('const BULMA_BREAKPOINTS', $source);
 		$this->assertStringContainsString('{ name: "desktop", min: 1024 }', $source);
 		$this->assertStringContainsString('metric.querySelector(".logbar-context-value")', $source);
-		$this->assertStringContainsString('window.addEventListener("resize", function () {', $source);
+		$this->assertStringContainsString('window.addEventListener("resize", scheduleBreakpointUpdate)', $source);
 		$this->assertStringContainsString('scheduleBreakpointUpdate();', $source);
 
 	}

tests/Unit/Helpers/LogBarTest.php

@@ -265,7 +265,7 @@ public function testQueryAggregationSeparatesDifferentBoundParameterSets(): void
 		$events = [
 			$this->queryEvent('SELECT * FROM locales WHERE id = ?', 0.010, 1, 0.000, 'locale-1'),
 			$this->queryEvent('SELECT * FROM locales WHERE id = ?', 0.020, 1, 0.010, 'locale-2'),
-			$this->queryEvent('SELECT * FROM locales WHERE id = ?', 0.005, 1, 0.030, 'locale-1'),
+			$this->queryEvent('SELECT * FROM locales WHERE id = ?', 0.015, 1, 0.030, 'locale-1'),
 		];
 
 		$this->setInaccessibleProperty($logBar, 'events', $events);

tests/Unit/Models/LocaleTest.php

@@ -14,6 +14,18 @@
  */
 class LocaleTest extends TestCase {
 
+	/**
+	 * Reset shared state before every locale test because other suites may touch Locale singletons.
+	 */
+	protected function setUp(): void {
+
+		parent::setUp();
+
+		$this->resetLocaleRuntimeCaches();
+		$this->resetDatabaseSingleton();
+
+	}
+
 	/**
 	 * Reset shared database and locale caches after each focused model test.
 	 */
@@ -27,7 +39,7 @@ protected function tearDown(): void {
 	}
 
 	/**
-	 * Verify locale representation is built from joined codes and then cached in-process.
+	 * Verify locale representation is lazily cached per persisted locale id.
 	 */
 	public function testRepresentationCodesAreCached(): void {
 
@@ -58,7 +70,7 @@ public function testRepresentationCodesAreCached(): void {
 
 		$secondLocale = Locale::find(52);
 		$this->assertInstanceOf(Locale::class, $secondLocale);
-		$this->assertSame('en-GB', $secondLocale->getRepresentation());
+		$this->assertSame('xx-GB', $secondLocale->getRepresentation());
 
 	}