Skip to content
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

Avoid using reserved characters in PSR-6 cache keys #70

Merged
merged 2 commits into from
Apr 26, 2024
Merged

Avoid using reserved characters in PSR-6 cache keys #70

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d4e0296
Avoid using reserved characters in PSR-6 cache keys
mpdude Apr 26, 2024
b9ef678
Fix CS with PHP-CS-Fixer
mpdude Apr 26, 2024
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
16 changes: 14 additions & 2 deletions src/Doctrine/PolyglotListener.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,8 @@ private function loadTranslationMetadataForClass($className, EntityManager $em):
$cacheDriver = $em->getConfiguration()->getMetadataCacheImpl();

if ($cacheDriver) {
if (($data = $cacheDriver->fetch($className.self::CACHE_SALT)) !== false) {
$cacheKey = $this->getCacheKey($className);
if (($data = $cacheDriver->fetch($cacheKey)) !== false) {
if (null === $data) {
$this->translatedClasses[$className] = null;

Expand All @@ -164,8 +165,19 @@ private function loadTranslationMetadataForClass($className, EntityManager $em):
}

// Save if cache driver available
$cacheDriver?->save($className.self::CACHE_SALT, $meta?->sleep());
$cacheDriver?->save($cacheKey, $meta?->sleep());

return $meta;
}

// this is taken from \Symfony\Component\Validator\Mapping\Factory\LazyLoadingMetadataFactory::escapeClassName
private function getCacheKey(string $class): string
{
if (str_contains($class, '@')) {
// anonymous class: replace all PSR6-reserved characters
return str_replace(["\0", '\\', '/', '@', ':', '{', '}', '(', ')'], '.', $class).self::CACHE_SALT;
}

return str_replace('\\', '.', $class).self::CACHE_SALT;
}
}
Loading