Skip to content

fix: Remove null caching for invalid language lookup #196

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
PantherX99 wants to merge 4 commits into
base: trunk
Choose a base branch
from
Open

fix: Remove null caching for invalid language lookup #196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
79b610c
Remove null caching for invalid language lookup
PantherX99 Jun 3, 2026
df6d7d2
Add test for missing language caching in LanguageLookup
PantherX99 Jun 4, 2026
93816a6
no whitespace in blank line
PantherX99 Jun 4, 2026
f7bb89f
use random testLocale instead od db data
PantherX99 Jun 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions src/Migration/Mapping/Lookup/LanguageLookup.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,6 @@ public function get(string $localeCode, Context $context): ?string

$language = $this->getLanguage($localeUuid, $context);
if (!$language instanceof LanguageEntity) {
$this->cache[$localeCode] = null;

return null;
}

Expand Down
49 changes: 49 additions & 0 deletions tests/Migration/Mapping/Lookup/LanguageLookupTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,55 @@ public function testGetShouldGetDataFromCache(string $localeCode, ?string $expec
static::assertSame($expectedResult, $documentTypeLookup->get($localeCode, Context::createDefaultContext()));
}

public function testGetDoesNotCacheMissingLanguage(): void
{
$context = Context::createDefaultContext();

$languageRepository = static::getContainer()->get('language.repository');
$localeRepository = static::getContainer()->get('locale.repository');

$localeId = Uuid::randomHex();
$localeCode = 'zz-ZZ';

@vintagesucks Nikolas Evers (vintagesucks) Jun 11, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To fix the failing test:

Suggested change
$localeCode = 'zz-ZZ';
$localeCode = 'en-US-' . Uuid::randomHex();

(zz-ZZ is rejected by the stricter locale validation introduced in shopware/shopware#16285)

$languageId = Uuid::randomHex();

try {
$localeRepository->create([
[
'id' => $localeId,
'code' => $localeCode,
'name' => 'Test Locale',
'territory' => 'Test Territory',
],
], $context);

$languageLookup = new LanguageLookup(
$languageRepository,
new LocaleLookup($localeRepository)
);

static::assertNull($languageLookup->get($localeCode, $context));

$languageRepository->create([
[
'id' => $languageId,
'name' => 'Test language',
'localeId' => $localeId,
'translationCodeId' => $localeId,
],
], $context);

static::assertSame($languageId, $languageLookup->get($localeCode, $context));
} finally {
$languageRepository->delete([
['id' => $languageId],
], $context);

$localeRepository->delete([
['id' => $localeId],
], $context);
}
}

#[DataProvider('getLanguageIdData')]
public function testGetDefaultLanguageEntity(string $languageId, ?string $expectedResult): void
{
Expand Down
Loading