Issue #3243057 by kunal.sachdev, tedbow: Properly use StringTranslationTrait

automatic_updates.services.yml

@@ -46,17 +46,20 @@ services:
       - { name: event_subscriber }
   automatic_updates.update_version_validator:
     class: Drupal\automatic_updates\Validator\UpdateVersionValidator
+    arguments:
+      - '@string_translation'
     tags:
       - { name: event_subscriber }
   automatic_updates.composer_executable_validator:
     class: Drupal\automatic_updates\Validator\ComposerExecutableValidator
-    arguments: ['@package_manager.composer_runner']
+    arguments: ['@package_manager.composer_runner','@string_translation']
     tags:
       - { name: event_subscriber }
   automatic_updates.disk_space_validator:
     class: Drupal\automatic_updates\Validator\DiskSpaceValidator
     arguments:
       - '@automatic_updates.path_locator'
+      - '@string_translation'
     tags:
       - { name: event_subscriber }
   automatic_updates.pending_updates_validator:
@@ -72,6 +75,7 @@ services:
     arguments:
       - '@automatic_updates.path_locator'
       - '%app.root%'
+      - '@string_translation'
     tags:
       - { name: event_subscriber }
   automatic_updates.validator.core_composer:

src/Validator/ComposerExecutableValidator.php

@@ -7,6 +7,7 @@ use Drupal\automatic_updates\Event\UpdateEvent;
 use Drupal\automatic_updates\Validation\ValidationResult;
 use Drupal\Core\Extension\ExtensionVersion;
 use Drupal\Core\StringTranslation\StringTranslationTrait;
+use Drupal\Core\StringTranslation\TranslationInterface;
 use PhpTuf\ComposerStager\Domain\Output\ProcessOutputCallbackInterface;
 use PhpTuf\ComposerStager\Exception\ExceptionInterface;
 use PhpTuf\ComposerStager\Infrastructure\Process\Runner\ComposerRunnerInterface;
@@ -38,9 +39,12 @@ class ComposerExecutableValidator implements EventSubscriberInterface, ProcessOu
    *
    * @param \PhpTuf\ComposerStager\Infrastructure\Process\Runner\ComposerRunnerInterface $composer
    *   The Composer runner.
+   * @param \Drupal\Core\StringTranslation\TranslationInterface $translation
+   *   The translation service.
    */
-  public function __construct(ComposerRunnerInterface $composer) {
+  public function __construct(ComposerRunnerInterface $composer, TranslationInterface $translation) {
     $this->composer = $composer;
+    $this->setStringTranslation($translation);
   }
 
   /**

src/Validator/DiskSpaceValidator.php

@@ -9,6 +9,7 @@ use Drupal\automatic_updates\Validation\ValidationResult;
 use Drupal\Component\FileSystem\FileSystem;
 use Drupal\Component\Utility\Bytes;
 use Drupal\Core\StringTranslation\StringTranslationTrait;
+use Drupal\Core\StringTranslation\TranslationInterface;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
 /**
@@ -30,9 +31,12 @@ class DiskSpaceValidator implements EventSubscriberInterface {
    *
    * @param \Drupal\automatic_updates\PathLocator $path_locator
    *   The path locator service.
+   * @param \Drupal\Core\StringTranslation\TranslationInterface $translation
+   *   The translation service.
    */
-  public function __construct(PathLocator $path_locator) {
+  public function __construct(PathLocator $path_locator, TranslationInterface $translation) {
     $this->pathLocator = $path_locator;
+    $this->setStringTranslation($translation);
   }
 
   /**

src/Validator/UpdateVersionValidator.php

@@ -8,6 +8,7 @@ use Drupal\automatic_updates\Event\UpdateEvent;
 use Drupal\automatic_updates\Validation\ValidationResult;
 use Drupal\Core\Extension\ExtensionVersion;
 use Drupal\Core\StringTranslation\StringTranslationTrait;
+use Drupal\Core\StringTranslation\TranslationInterface;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
 /**
@@ -17,6 +18,16 @@ class UpdateVersionValidator implements EventSubscriberInterface {
 
   use StringTranslationTrait;
 
+  /**
+   * Constructs a UpdateVersionValidation object.
+   *
+   * @param \Drupal\Core\StringTranslation\TranslationInterface $translation
+   *   The translation service.
+   */
+  public function __construct(TranslationInterface $translation) {
+    $this->setStringTranslation($translation);
+  }
+
   /**
    * Returns the running core version, according to the Update module.
    *

src/Validator/WritableFileSystemValidator.php

@@ -7,6 +7,7 @@ use Drupal\automatic_updates\Event\UpdateEvent;
 use Drupal\automatic_updates\PathLocator;
 use Drupal\automatic_updates\Validation\ValidationResult;
 use Drupal\Core\StringTranslation\StringTranslationTrait;
+use Drupal\Core\StringTranslation\TranslationInterface;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
 /**
@@ -37,10 +38,13 @@ class WritableFileSystemValidator implements EventSubscriberInterface {
    *   The path locator service.
    * @param string $app_root
    *   The Drupal root.
+   * @param \Drupal\Core\StringTranslation\TranslationInterface $translation
+   *   The translation service.
    */
-  public function __construct(PathLocator $path_locator, string $app_root) {
+  public function __construct(PathLocator $path_locator, string $app_root, TranslationInterface $translation) {
     $this->pathLocator = $path_locator;
     $this->appRoot = $app_root;
+    $this->setStringTranslation($translation);
   }
 
   /**

tests/src/Kernel/ReadinessValidation/DiskSpaceValidatorTest.php

@@ -6,6 +6,9 @@ use Drupal\automatic_updates\Event\UpdateEvent;
 use Drupal\automatic_updates\Validation\ValidationResult;
 use Drupal\automatic_updates\Validator\DiskSpaceValidator;
 use Drupal\Component\Utility\Bytes;
+use Drupal\Core\StringTranslation\PluralTranslatableMarkup;
+use Drupal\Core\StringTranslation\TranslatableMarkup;
+use Drupal\Core\StringTranslation\TranslationInterface;
 use Drupal\KernelTests\KernelTestBase;
 use Drupal\Tests\automatic_updates\Traits\ValidationTestTrait;
 
@@ -37,7 +40,7 @@ class DiskSpaceValidatorTest extends KernelTestBase {
 
     // Create a mocked version of the validator which can be rigged up to return
     // specific values for various filesystem checks.
-    $this->validator = new class ($path_locator->reveal()) extends DiskSpaceValidator {
+    $this->validator = new class ($path_locator->reveal(), new TestTranslationManager()) extends DiskSpaceValidator {
 
       /**
        * Whether the root and vendor directories are on the same logical disk.
@@ -215,3 +218,33 @@ class DiskSpaceValidatorTest extends KernelTestBase {
   }
 
 }
+/**
+ * Implements a translation manager in tests.
+ *
+ * @todo Copied from core/modules/user/tests/src/Unit/PermissionHandlerTest.php
+ *   when moving to core open an issue consolidate this test class.
+ */
+class TestTranslationManager implements TranslationInterface {
+
+  /**
+   * {@inheritdoc}
+   */
+  public function translate($string, array $args = [], array $options = []) {
+    return new TranslatableMarkup($string, $args, $options, $this);
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function translateString(TranslatableMarkup $translated_string) {
+    return $translated_string->getUntranslatedString();
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function formatPlural($count, $singular, $plural, array $args = [], array $options = []) {
+    return new PluralTranslatableMarkup($count, $singular, $plural, $args, $options, $this);
+  }
+
+}