Merge pull request #157 from openeuropa/EWPP-3578

EWPP-3578: Fix the message of the import-local-translations drush command.
openeuropa · Jan 13, 2025 · 7c17a14 · 7c17a14
2 parents 4626419 + aebeb3c
commit 7c17a14
Show file tree

Hide file tree

Showing 34 changed files with 49 additions and 46 deletions.
diff --git a/.drone.yml b/.drone.yml
@@ -19,12 +19,12 @@ services:
       - COMPOSERVER=--2
       - DOCUMENT_ROOT=/test/oe_multilingual
   mysql:
-    image: registry.fpfis.eu/fpfis/sql:percona-5.7
+    image: git.fpfis.tech.ec.europa.eu/fpfis/dependency_proxy/containers/percona:5.7
     command: --innodb-log-file-size=1G --max_allowed_packet=1G --innodb-buffer-pool-size=512M --wait_timeout=3000 --net_write_timeout=3000 --log_error_verbosity=3
     environment:
       - MYSQL_ALLOW_EMPTY_PASSWORD=yes
   selenium:
-    image: registry.fpfis.eu/fpfis/selenium:standalone-chrome-3.141.59-oxygen
+    image: git.fpfis.tech.ec.europa.eu/fpfis/dependency_proxy/containers/selenium/standalone-chrome:4.1.3-20220405
     shm_size: 2g
     environment:
       - DISPLAY=:99

diff --git a/modules/oe_multilingual_front_page/src/PathProcessorFrontPage.php b/modules/oe_multilingual_front_page/src/PathProcessorFrontPage.php
@@ -43,7 +43,7 @@ public function __construct(ConfigFactoryInterface $config, AliasManager $aliasM
   /**
    * {@inheritdoc}
    */
-  public function processOutbound($path, &$options = [], Request $request = NULL, BubbleableMetadata $bubbleable_metadata = NULL) {
+  public function processOutbound($path, &$options = [], ?Request $request = NULL, ?BubbleableMetadata $bubbleable_metadata = NULL) {
     // Ensure front-page path has the configured alias of the front-page
     // in order to avoid links pointing to "/_[language_suffix]".
     if (in_array($path, ['/<front>', '/'])) {

diff --git a/modules/oe_multilingual_front_page/tests/src/Kernel/PathProcessorFrontPageTest.php b/modules/oe_multilingual_front_page/tests/src/Kernel/PathProcessorFrontPageTest.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\Tests\oe_multilingual_front_page\Unit;
 

diff --git a/modules/oe_multilingual_selection_page/oe_multilingual_selection_page.install b/modules/oe_multilingual_selection_page/oe_multilingual_selection_page.install
@@ -5,7 +5,7 @@
  * Install, update and uninstall functions for the module.
  */
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 use Drupal\language_selection_page\Plugin\LanguageNegotiation\LanguageNegotiationLanguageSelectionPage;
 

diff --git a/modules/oe_multilingual_selection_page/oe_multilingual_selection_page.module b/modules/oe_multilingual_selection_page/oe_multilingual_selection_page.module
@@ -5,7 +5,7 @@
  * Contains hooks to manipulate language links for selection page.
  */
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 /**
  * Implements hook_page_preprocess().

diff --git a/modules/oe_multilingual_selection_page/oe_multilingual_selection_page.post_update.php b/modules/oe_multilingual_selection_page/oe_multilingual_selection_page.post_update.php
@@ -5,7 +5,7 @@
  * Post update hooks.
  */
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 /**
  * Updates the language selection page to not include the private files.

diff --git a/modules/oe_multilingual_url_suffix/oe_multilingual_url_suffix.install b/modules/oe_multilingual_url_suffix/oe_multilingual_url_suffix.install
@@ -5,7 +5,7 @@
  * Install, update and uninstall functions for the module.
  */
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 use Drupal\language\Plugin\LanguageNegotiation\LanguageNegotiationUrl;
 

diff --git a/modules/oe_multilingual_url_suffix/oe_multilingual_url_suffix.module b/modules/oe_multilingual_url_suffix/oe_multilingual_url_suffix.module
@@ -5,7 +5,7 @@
  * The OpenEuropa Multilingual URL suffix module.
  */
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 use Drupal\Core\Language\LanguageInterface;
 use Drupal\language\Plugin\LanguageNegotiation\LanguageNegotiationUrlFallback;

diff --git a/modules/oe_multilingual_url_suffix/src/Event/UrlSuffixesAlterEvent.php b/modules/oe_multilingual_url_suffix/src/Event/UrlSuffixesAlterEvent.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\oe_multilingual_url_suffix\Event;
 

diff --git a/modules/oe_multilingual_url_suffix/src/Form/NegotiationUrlSuffixForm.php b/modules/oe_multilingual_url_suffix/src/Form/NegotiationUrlSuffixForm.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\oe_multilingual_url_suffix\Form;
 

diff --git a/...e_multilingual_url_suffix/src/Plugin/LanguageNegotiation/LanguageNegotiationUrlSuffix.php b/...e_multilingual_url_suffix/src/Plugin/LanguageNegotiation/LanguageNegotiationUrlSuffix.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\oe_multilingual_url_suffix\Plugin\LanguageNegotiation;
 
@@ -100,7 +100,7 @@ public static function create(ContainerInterface $container, array $configuratio
    * @SuppressWarnings(PHPMD.CyclomaticComplexity)
    * @SuppressWarnings(PHPMD.NPathComplexity)
    */
-  public function getLangcode(Request $request = NULL) {
+  public function getLangcode(?Request $request = NULL) {
     $langcode = NULL;
 
     $url_suffixes = $this->getUrlSuffixes($request->getPathInfo());
@@ -170,7 +170,7 @@ public function processInbound($path, Request $request) {
   /**
    * {@inheritdoc}
    */
-  public function processOutbound($path, &$options = [], Request $request = NULL, BubbleableMetadata $bubbleable_metadata = NULL) {
+  public function processOutbound($path, &$options = [], ?Request $request = NULL, ?BubbleableMetadata $bubbleable_metadata = NULL) {
     $languages = array_flip(array_keys($this->languageManager->getLanguages()));
     // Language can be passed as an option, or we go for current URL language.
     if (!isset($options['language'])) {

diff --git a/..._multilingual_url_suffix_test/src/EventSubscriber/TestUrlSuffixesAlterEventSubscriber.php b/..._multilingual_url_suffix_test/src/EventSubscriber/TestUrlSuffixesAlterEventSubscriber.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\oe_multilingual_url_suffix_test\EventSubscriber;
 

diff --git a/modules/oe_multilingual_url_suffix/tests/src/Functional/LanguageNegotiationUrlSuffixTest.php b/modules/oe_multilingual_url_suffix/tests/src/Functional/LanguageNegotiationUrlSuffixTest.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\Tests\oe_multilingual_url_suffix\Functional;
 
@@ -73,7 +73,7 @@ protected function setUp(): void {
       'language_content[enabled][language-url]' => 0,
     ];
     $this->drupalGet('admin/config/regional/language/detection');
-    $this->submitForm($edit, t('Save settings'));
+    $this->submitForm($edit, 'Save settings');
   }
 
   /**
@@ -88,14 +88,14 @@ public function testInbound(): void {
       'suffix[en]' => 'eng',
     ];
     $this->drupalGet('/admin/config/regional/language/detection/url-suffix_en', ['external' => FALSE]);
-    $this->submitForm($edit, $this->t('Save configuration'));
+    $this->submitForm($edit, 'Save configuration');
 
     $nodeValues = [
       'title[0][value]' => 'Test',
       'path[0][alias]' => '/test_eng',
     ];
     $this->drupalGet('/node/add/article_eng', ['external' => FALSE]);
-    $this->submitForm($nodeValues, $this->t('Save'));
+    $this->submitForm($nodeValues, 'Save');
     $this->assertSession()->statusCodeEquals(200);
 
     $this->drupalGet('/test_eng_eng', ['external' => FALSE]);

diff --git a/modules/oe_multilingual_url_suffix/tests/src/Kernel/EntityUrlSuffixLanguageTest.php b/modules/oe_multilingual_url_suffix/tests/src/Kernel/EntityUrlSuffixLanguageTest.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\Tests\oe_multilingual_url_suffix\Kernel;
 

diff --git a/modules/oe_multilingual_url_suffix/tests/src/Unit/LanguageNegotiationUrlSuffixTest.php b/modules/oe_multilingual_url_suffix/tests/src/Unit/LanguageNegotiationUrlSuffixTest.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\Tests\oe_multilingual_url_suffix\Unit;
 
@@ -96,7 +96,7 @@ protected function setUp(): void {
    *
    * @dataProvider providerTestPathSuffix
    */
-  public function testPathSuffix(string $suffix, array $suffixes, string $expected_langcode = NULL): void {
+  public function testPathSuffix(string $suffix, array $suffixes, ?string $expected_langcode = NULL): void {
     $language_code = (in_array($expected_langcode, ['en', 'de'])) ? $expected_langcode : 'en';
     $this->languageManager->expects($this->any())
       ->method('getCurrentLanguage')

diff --git a/oe_multilingual.install b/oe_multilingual.install
@@ -5,7 +5,7 @@
  * Install, update and uninstall functions for the oe_multilingual module.
  */
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 use Drupal\Core\Language\LanguageInterface;
 use Drupal\language\Plugin\LanguageNegotiation\LanguageNegotiationSelected;

diff --git a/oe_multilingual.module b/oe_multilingual.module
@@ -5,7 +5,7 @@
  * Multilingual module.
  */
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 use Drupal\Component\Gettext\PoStreamReader;
 use Drupal\Core\Entity\EntityInterface;

diff --git a/oe_multilingual.post_update.php b/oe_multilingual.post_update.php
@@ -5,7 +5,7 @@
  * Post update functions for OpenEuropa Multilingual module.
  */
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 /**
  * Invalidate service containers.

diff --git a/src/Commands/MultilingualCommands.php b/src/Commands/MultilingualCommands.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\oe_multilingual\Commands;
 

diff --git a/src/ContentLanguageSwitcherProvider.php b/src/ContentLanguageSwitcherProvider.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\oe_multilingual;
 
@@ -56,7 +56,7 @@ class ContentLanguageSwitcherProvider {
    * @param \Drupal\Core\Routing\RouteMatchInterface $route_match
    *   The current route match.
    */
-  public function __construct(LanguageManagerInterface $language_manager, PathMatcherInterface $path_matcher, MultilingualHelperInterface $multilingual_helper, RouteMatchInterface $route_match = NULL) {
+  public function __construct(LanguageManagerInterface $language_manager, PathMatcherInterface $path_matcher, MultilingualHelperInterface $multilingual_helper, ?RouteMatchInterface $route_match = NULL) {
     $this->languageManager = $language_manager;
     $this->pathMatcher = $path_matcher;
     $this->multilingualHelper = $multilingual_helper;

diff --git a/src/LanguageNegotiationSetter.php b/src/LanguageNegotiationSetter.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\oe_multilingual;
 

diff --git a/src/LanguageNegotiationSetterInterface.php b/src/LanguageNegotiationSetterInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\oe_multilingual;
 

diff --git a/src/LocalTranslationsBatcher.php b/src/LocalTranslationsBatcher.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\oe_multilingual;
 
@@ -190,6 +190,7 @@ public function importProjectPoFiles($extension, $langcodes, &$context): void {
       $this->fileSystem->dirname($extension['info']['interface translation server pattern']),
       '/.*-(' . implode('|', $langcodes) . ')\.po/'
     );
+    $message = '';
     foreach ($files as $file) {
       preg_match('/(' . implode('|', $langcodes) . ')$/', $file->name, $matches);
       $file->langcode = $matches[0];
@@ -198,12 +199,14 @@ public function importProjectPoFiles($extension, $langcodes, &$context): void {
           'not_customized' => TRUE,
         ],
       ]);
-
-      $context['message'] = $this->t('Imported translation for %project (%langcode).', [
+      // Drush won't print the message for each file of the same extension, so
+      // build a single message per extension to be printed at the end.
+      $message = $message . $this->t("Imported translation for %project (%langcode).\n", [
         '%project' => $extension['name'],
         '%langcode' => $file->langcode,
       ]);
     }
+    $context['message'] = $message;
   }
 
 }
diff --git a/src/MultilingualHelper.php b/src/MultilingualHelper.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\oe_multilingual;
 
@@ -57,7 +57,7 @@ class MultilingualHelper implements MultilingualHelperInterface {
    * @param \Drupal\Core\Entity\EntityTypeManagerInterface|null $entity_type_manager
    *   The entity type manager.
    */
-  public function __construct(EntityRepositoryInterface $entity_repository, RouteMatchInterface $current_route_match, PathValidatorInterface $path_validator = NULL, EntityTypeManagerInterface $entity_type_manager = NULL) {
+  public function __construct(EntityRepositoryInterface $entity_repository, RouteMatchInterface $current_route_match, ?PathValidatorInterface $path_validator = NULL, ?EntityTypeManagerInterface $entity_type_manager = NULL) {
     if (!$path_validator) {
       $path_validator = \Drupal::service('path.validator');
     }

diff --git a/src/MultilingualHelperInterface.php b/src/MultilingualHelperInterface.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\oe_multilingual;
 

diff --git a/src/Plugin/Block/ContentLanguageBlock.php b/src/Plugin/Block/ContentLanguageBlock.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\oe_multilingual\Plugin\Block;
 

diff --git a/src/Plugin/LanguageNegotiation/LanguageNegotiationAdmin.php b/src/Plugin/LanguageNegotiation/LanguageNegotiationAdmin.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\oe_multilingual\Plugin\LanguageNegotiation;
 
@@ -28,7 +28,7 @@ class LanguageNegotiationAdmin extends LanguageNegotiationUserAdmin {
   /**
    * {@inheritdoc}
    */
-  public function getLangcode(Request $request = NULL): ?string {
+  public function getLangcode(?Request $request = NULL): ?string {
     $langcode = NULL;
 
     if ($this->currentUser->hasPermission('access administration pages') && $this->isAdminPath($request)) {

diff --git a/tests/modules/translation_importer_test/src/Controller/TranslationImporterController.php b/tests/modules/translation_importer_test/src/Controller/TranslationImporterController.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\translation_importer_test\Controller;
 

diff --git a/tests/src/Behat/DrupalContext.php b/tests/src/Behat/DrupalContext.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\Tests\oe_multilingual\Behat;
 

diff --git a/tests/src/Behat/InterfaceTranslationContext.php b/tests/src/Behat/InterfaceTranslationContext.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\Tests\oe_multilingual\Behat;
 

diff --git a/tests/src/Functional/ConfigurableLanguageTest.php b/tests/src/Functional/ConfigurableLanguageTest.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\Tests\oe_multilingual\Functional;
 

diff --git a/tests/src/FunctionalJavascript/TranslationImporterTest.php b/tests/src/FunctionalJavascript/TranslationImporterTest.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\Tests\oe_multilingual\FunctionalJavascript;
 

diff --git a/tests/src/Kernel/InstallationTest.php b/tests/src/Kernel/InstallationTest.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\Tests\oe_multilingual\Kernel;
 

diff --git a/tests/src/Kernel/LanguageNegotiationSetterTest.php b/tests/src/Kernel/LanguageNegotiationSetterTest.php
@@ -1,6 +1,6 @@
 <?php
 
-declare(strict_types = 1);
+declare(strict_types=1);
 
 namespace Drupal\Tests\oe_multilingual\Kernel;