Internal: In legacy, remove Container::getTranslator method - refs BT#21304

For legacy, to get the translator service is necessary get it by `Container::$container->get('translator')`
pull/5031/head
Angel Fernando Quiroz Campos 2 years ago
parent 8d51bbaf27
commit 97c8010231
  1. 2
      public/main/course_info/infocours.php
  2. 2
      public/main/inc/lib/ExerciseCategoryManager.php
  3. 2
      public/main/inc/lib/internationalization.lib.php
  4. 19
      src/CoreBundle/Framework/Container.php

@ -44,7 +44,7 @@ if (!$isAllowToEdit) {
}
$router = Container::getRouter();
$translator = Container::getTranslator();
$translator = Container::$container->get('translator');
$show_delete_watermark_text_message = false;
if ('true' === api_get_setting('pdf_export_watermark_by_course')) {

@ -88,7 +88,7 @@ class ExerciseCategoryManager extends Model
$parameters
) {
$repo = Container::getExerciseCategoryRepository();
$translator = Container::getTranslator();
$translator = Container::$container->get('translator');
foreach ($primaryKeys as $id) {
$category = $repo->find($id);
$repo->hardDelete($category);

@ -56,7 +56,7 @@ define('PERSON_NAME_DATA_EXPORT', PERSON_NAME_EASTERN_ORDER);
*/
function get_lang(string $variable): string
{
$translator = Container::getTranslator();
$translator = Container::$translator ?: Container::$container->get('translator');
if (!$translator) {
return $variable;

@ -91,7 +91,7 @@ use Symfony\Component\Routing\Router;
use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorage;
use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
use Symfony\Component\Security\Core\Authorization\AuthorizationChecker;
use Symfony\Contracts\Translation\TranslatorInterface;
use Symfony\Component\Translation\Translator;
use Twig\Environment;
/**
@ -101,7 +101,8 @@ class Container
{
public static ?ContainerInterface $container = null;
public static ?Request $request = null;
public static ?TranslatorInterface $translator = null;
// For legacy, to get the translator service is necessary get it by Container::$container->get('translator')
public static ?Translator $translator = null;
public static Environment $twig;
public static ?Session $session = null;
public static string $legacyTemplate = '@ChamiloCore/Layout/layout_one_col.html.twig';
@ -231,20 +232,6 @@ class Container
return self::$container->get('security.token_storage');
}
/**
* @return TranslatorInterface
*/
public static function getTranslator()
{
if (null !== self::$translator) {
return self::$translator;
}
// if (self::$container->has('translator')) {
return self::$container->get('translator');
// }
}
public static function getMailer(): Mailer
{
return self::$container->get(Mailer::class);

Loading…
Cancel
Save