Fix templates getContainer call

contao-community-alliance · May 21, 2024 · f5fc860 · f5fc860
1 parent 45d37d6
commit f5fc860
Show file tree

Hide file tree

Showing 13 changed files with 51 additions and 19 deletions.
diff --git a/src/Resources/contao/templates/dcbe_general_clipboard.html5 b/src/Resources/contao/templates/dcbe_general_clipboard.html5
@@ -1,5 +1,6 @@
 <?php
 
+use Contao\System;
 use Contao\StringUtil;
 use ContaoCommunityAlliance\Contao\Bindings\ContaoEvents;
 use ContaoCommunityAlliance\Contao\Bindings\Events\Image\GenerateHtmlEvent;
@@ -9,7 +10,7 @@ use Symfony\Contracts\Translation\TranslatorInterface;
 /** @var \ContaoCommunityAlliance\DcGeneral\EnvironmentInterface $environment */
 $environment     = $this->environment;
 $eventDispatcher = $environment->getEventDispatcher();
-$translator      = \System::getContainer()->get('translator');
+$translator      = System::getContainer()->get('translator');
 assert($translator instanceof TranslatorInterface);
 
 // pre render the clipboard icon

diff --git a/src/Resources/contao/templates/dcbe_general_common_list.html5 b/src/Resources/contao/templates/dcbe_general_common_list.html5
@@ -1,17 +1,19 @@
 <?php
 
+use Contao\Message;
+use Contao\System;
 use Contao\StringUtil;
 use ContaoCommunityAlliance\DcGeneral\Data\ModelId;
 use ContaoCommunityAlliance\DcGeneral\Data\ModelInterface;
 use ContaoCommunityAlliance\DcGeneral\DataDefinition\Definition\View\GroupAndSortingInformationInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
-$requestToken = \System::getContainer()->get('contao.csrf.token_manager')->getDefaultTokenValue();
-$translator   = \System::getContainer()->get('translator');
+$requestToken = System::getContainer()->get('contao.csrf.token_manager')->getDefaultTokenValue();
+$translator   = System::getContainer()->get('translator');
 assert($translator instanceof TranslatorInterface);
 ?>
 <?php $this->block('messages'); ?>
-<?= $this->getMessages() ?>
+<?= Message::generate() ?>
 <?php if ($this->info): ?>
     <div class="tl_message">
         <p class="tl_info"><?= \implode('<br />', $this->info) ?></p>

diff --git a/src/Resources/contao/templates/dcbe_general_edit.html5 b/src/Resources/contao/templates/dcbe_general_edit.html5
@@ -1,10 +1,12 @@
 <?php
+
+use Contao\System;
 use Contao\StringUtil;
 use ContaoCommunityAlliance\DcGeneral\Data\VersionModelInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
-$requestToken = \System::getContainer()->get('contao.csrf.token_manager')->getDefaultTokenValue();
-$translator   = \System::getContainer()->get('translator');
+$requestToken = System::getContainer()->get('contao.csrf.token_manager')->getDefaultTokenValue();
+$translator   = System::getContainer()->get('translator');
 assert($translator instanceof TranslatorInterface);
 // Add CSS
 $GLOBALS['TL_CSS'][] = 'bundles/ccadcgeneral/css/generalDriver.css';

diff --git a/src/Resources/contao/templates/dcbe_general_field.html5 b/src/Resources/contao/templates/dcbe_general_field.html5
@@ -1,5 +1,8 @@
 <?php
-$translator = \Contao\System::getContainer()->get('translator');
+
+use Contao\System;
+
+$translator = System::getContainer()->get('translator');
 assert($translator instanceof \Symfony\Contracts\Translation\TranslatorInterface);
 ?>
 <div id="widget_<?= $this->strName; ?>" class="widget <?= $this->strClass ?>">

diff --git a/src/Resources/contao/templates/dcbe_general_language_panel.html5 b/src/Resources/contao/templates/dcbe_general_language_panel.html5
@@ -1,7 +1,11 @@
 <?php
-$requestToken = \Contao\System::getContainer()->get('contao.csrf.token_manager')->getDefaultTokenValue();
-$translator   = \Contao\System::getContainer()->get('translator');
-assert($translator instanceof \Symfony\Contracts\Translation\TranslatorInterface);
+
+use Contao\System;
+use Symfony\Contracts\Translation\TranslatorInterface;
+
+$requestToken = System::getContainer()->get('contao.csrf.token_manager')->getDefaultTokenValue();
+$translator   = System::getContainer()->get('translator');
+assert($translator instanceof TranslatorInterface);
 
 $apply = $translator->trans(id: 'apply', domain: 'dc-general');
 ?>

diff --git a/src/Resources/contao/templates/dcbe_general_language_selector.html5 b/src/Resources/contao/templates/dcbe_general_language_selector.html5
@@ -1,4 +1,5 @@
 <?php
+use Contao\System;
 use Contao\StringUtil;
 ?>
 <?php if ($this->language && !empty($this->languages)): ?>
@@ -7,7 +8,7 @@ use Contao\StringUtil;
       <div class="tl_formbody">
         <input type="hidden" name="FORM_SUBMIT" value="language_switch" />
         <input type="hidden" name="REQUEST_TOKEN" value="<?= $this->REQUEST_TOKEN ?>" />
-          <label for="selectLanguage"><strong><?= \Contao\System::getContainer()->get('translator')->trans('language', [], 'dc-general') ?>: </strong></label>
+          <label for="selectLanguage"><strong><?= System::getContainer()->get('translator')->trans('language', [], 'dc-general') ?>: </strong></label>
           <select name="language" id="selectLanguage" class="tl_select" onchange="Backend.autoSubmit('language_switch')">
             <?php foreach ($this->languages as $langCode => $languageName) : ?>
               <option value="<?= $langCode; ?>"<?php if ($langCode === $this->language): ?> selected="selected"<?php endif; ?>>

diff --git a/src/Resources/contao/templates/dcbe_general_panel.html5 b/src/Resources/contao/templates/dcbe_general_panel.html5
@@ -1,5 +1,7 @@
 <?php
-$requestToken = \System::getContainer()->get('contao.csrf.token_manager')->getDefaultTokenValue();
+use Contao\System;
+
+$requestToken = System::getContainer()->get('contao.csrf.token_manager')->getDefaultTokenValue();
 ?>
 <form action="<?= $this->action ?>" class="tl_form dc_general_panel" method="post">
     <div class="tl_formbody">

diff --git a/src/Resources/contao/templates/dcbe_general_panel_limit.html5 b/src/Resources/contao/templates/dcbe_general_panel_limit.html5
@@ -1,5 +1,8 @@
 <?php
-$translator   = \Contao\System::getContainer()->get('translator');
+
+use Contao\System;
+
+$translator   = System::getContainer()->get('translator');
 assert($translator instanceof \Symfony\Contracts\Translation\TranslatorInterface);
 ?>
 <div class="tl_limit tl_subpanel <?= $this->rowClass; ?>">

diff --git a/src/Resources/contao/templates/dcbe_general_panel_search.html5 b/src/Resources/contao/templates/dcbe_general_panel_search.html5
@@ -1,5 +1,8 @@
 <?php
-$translator   = \Contao\System::getContainer()->get('translator');
+
+use Contao\System;
+
+$translator   = System::getContainer()->get('translator');
 assert($translator instanceof \Symfony\Contracts\Translation\TranslatorInterface);
 ?>
 <div class="tl_search tl_subpanel <?= $this->rowClass ?>">

diff --git a/src/Resources/contao/templates/dcbe_general_panel_sort.html5 b/src/Resources/contao/templates/dcbe_general_panel_sort.html5
@@ -1,5 +1,8 @@
 <?php
-$translator   = \Contao\System::getContainer()->get('translator');
+
+use Contao\System;
+
+$translator   = System::getContainer()->get('translator');
 assert($translator instanceof \Symfony\Contracts\Translation\TranslatorInterface);
 ?>
 <div class="tl_sorting tl_subpanel <?= $this->rowClass; ?>">

diff --git a/src/Resources/contao/templates/dcbe_general_panel_submit.html5 b/src/Resources/contao/templates/dcbe_general_panel_submit.html5
@@ -1,5 +1,8 @@
 <?php
-$translator   = \Contao\System::getContainer()->get('translator');
+
+use Contao\System;
+
+$translator   = System::getContainer()->get('translator');
 assert($translator instanceof \Symfony\Contracts\Translation\TranslatorInterface);
 
 $apply = $translator->trans(id: 'apply', domain: 'dc-general');

diff --git a/src/Resources/contao/templates/dcbe_general_show.html5 b/src/Resources/contao/templates/dcbe_general_show.html5
@@ -1,4 +1,8 @@
 <?php
+
+use Contao\System;
+use Symfony\Contracts\Translation\TranslatorInterface;
+
 $this->insert(
     'dcbe_general_language_selector',
     [
@@ -10,8 +14,8 @@ $this->insert(
     ]
 );
 
-$translator   = \Contao\System::getContainer()->get('translator');
-assert($translator instanceof \Symfony\Contracts\Translation\TranslatorInterface);
+$translator   = System::getContainer()->get('translator');
+assert($translator instanceof TranslatorInterface);
 ?>
 
 <div id="tl_buttons">

diff --git a/src/Resources/contao/templates/widget_common_picker.html5 b/src/Resources/contao/templates/widget_common_picker.html5
@@ -1,8 +1,9 @@
 <?php
 
+use Contao\System;
 use Contao\StringUtil;
 
-$requestToken = \System::getContainer()->get('contao.csrf.token_manager')->getDefaultTokenValue();
+$requestToken = System::getContainer()->get('contao.csrf.token_manager')->getDefaultTokenValue();
 ?>
 <input type="hidden" name="<?= $this->name ?>" id="ctrl_<?= $this->id ?>" value="<?= \implode(',', \array_keys($this->values)) ?>">