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.

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

[TranslatorBundle] Add Symfony 7 forward compatibility #3470

Merged
merged 1 commit into from
Nov 11, 2024
Merged
Changes from all commits
Commits
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
34 changes: 30 additions & 4 deletions src/Kunstmaan/TranslatorBundle/Service/Translator/Translator.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,37 @@

use Symfony\Bundle\FrameworkBundle\Translation\Translator as SymfonyTranslator;

if (class_exists(\Symfony\Component\Routing\Loader\AnnotationClassLoader::class)) {
/**
* @internal
*/
trait WarmupTrait
{
/**
* @param string|null $buildDir
*/
public function warmUp(string $cacheDir/*, string $buildDir = null*/): array
{
return $this->doWarmup($cacheDir);
}
}
} else {
/**
* @internal
*/
trait WarmupTrait
{
public function warmUp(string $cacheDir, string $buildDir = null): array
{
return $this->doWarmup($cacheDir, $buildDir);
}
}
}

class Translator extends SymfonyTranslator
{
use WarmupTrait;

private $translationRepository;

/**
Expand All @@ -32,10 +61,7 @@ public function addDatabaseResources()
}
}

/**
* @param string|null $buildDir
*/
public function warmUp(string $cacheDir /* , string $buildDir = null */): array
private function doWarmUp(string $cacheDir, string $buildDir = null): array
{
return [];
}
Expand Down