Used dependency injection

Author: rimi-itk

drupal_translation_extractor.services.yml

@@ -2,8 +2,49 @@ services:
   _defaults:
     autowire: true
 
-  Drupal\drupal_translation_extractor\Translation\Dumper\PoFileDumper:
+  Drupal\drupal_translation_extractor\Translation\Extractor\Visitor\TransMethodVisitor:
+
+  Drupal\drupal_translation_extractor\Translation\Extractor\Visitor\TranslatableMarkupVisitor:
+
+  Drupal\drupal_translation_extractor\Translation\Extractor\PhpExtractor:
+    arguments:
+      $visitors:
+        - '@Drupal\drupal_translation_extractor\Translation\Extractor\Visitor\TransMethodVisitor'
+        - '@Drupal\drupal_translation_extractor\Translation\Extractor\Visitor\TranslatableMarkupVisitor'
+
+  Drupal\drupal_translation_extractor\Translation\TwigExtractor:
 
   Drupal\drupal_translation_extractor\ItkTranslationExtractorTwigExtension:
     tags:
       - { name: twig.extension }
+
+  drupal_translation_extractor.extractor:
+    class: Symfony\Component\Translation\Extractor\ChainExtractor
+    calls:
+      - [
+          "addExtractor",
+          [
+            "php",
+            '@Drupal\drupal_translation_extractor\Translation\Extractor\PhpExtractor',
+          ],
+        ]
+      - [
+          "addExtractor",
+          [
+            "twig",
+            '@Drupal\drupal_translation_extractor\Translation\TwigExtractor',
+          ],
+        ]
+
+  Drupal\drupal_translation_extractor\Translation\Dumper\PoFileDumper:
+
+  drupal_translation_extractor.translation_writer:
+    class: Symfony\Component\Translation\Writer\TranslationWriter
+    calls:
+      - [
+          "addDumper",
+          [
+            "po",
+            '@Drupal\drupal_translation_extractor\Translation\Dumper\PoFileDumper',
+          ],
+        ]

drush.services.yml

@@ -2,9 +2,10 @@ services:
   drupal_translation_extractor.translation_extract:
     class: Drupal\drupal_translation_extractor\Command\TranslationExtractCommand
     arguments:
-      - "@twig"
       - "@extension.path.resolver"
       - "@locale.storage"
+      - "@drupal_translation_extractor.extractor"
+      - "@drupal_translation_extractor.translation_writer"
       - "@Drupal\\drupal_translation_extractor\\Translation\\Dumper\\PoFileDumper"
     tags:
       - { name: console.command }

src/Command/TranslationExtractCommand.php

@@ -5,9 +5,7 @@
 namespace Drupal\drupal_translation_extractor\Command;
 
 use Drupal\Core\Extension\ExtensionPathResolver;
-use Drupal\drupal_translation_extractor\Translation\Dumper\PoFileDumper;
 use Drupal\drupal_translation_extractor\Translation\Dumper\PoItem;
-use Drupal\drupal_translation_extractor\Translation\TwigExtractor;
 use Drupal\locale\StringStorageInterface;
 use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Command\Command;
@@ -18,10 +16,10 @@
 use Symfony\Component\Console\Style\SymfonyStyle;
 use Symfony\Component\Translation\Catalogue\MergeOperation;
 use Symfony\Component\Translation\Catalogue\TargetOperation;
+use Symfony\Component\Translation\Extractor\ExtractorInterface;
 use Symfony\Component\Translation\MessageCatalogue;
 use Symfony\Component\Translation\MessageCatalogueInterface;
-use Symfony\Component\Translation\Writer\TranslationWriter;
-use Twig\Environment;
+use Symfony\Component\Translation\Writer\TranslationWriterInterface;
 
 /**
  * Lifted from Symfony's `translation:extract` command.
@@ -43,27 +41,12 @@ final class TranslationExtractCommand extends Command
     ];
     private const NO_FILL_PREFIX = "\0NoFill\0";
 
-    /**
-     * The writer.
-     */
-    private TranslationWriter $writer;
-
-    /**
-     * The extractor.
-     */
-    private TwigExtractor $extractor;
-
     public function __construct(
-        private readonly Environment $twig,
         private readonly ExtensionPathResolver $extensionPathResolver,
         private readonly StringStorageInterface $stringStorage,
-        PoFileDumper $poFileDumper,
+        private readonly ExtractorInterface $extractor,
+        private readonly TranslationWriterInterface $writer,
     ) {
-        $this->extractor = new TwigExtractor($this->twig);
-
-        $this->writer = new TranslationWriter();
-        $this->writer->addDumper('po', $poFileDumper);
-
         parent::__construct();
     }
 

src/Translation/TwigExtractor.php

@@ -5,6 +5,7 @@
 use Drupal\drupal_translation_extractor\ItkTranslationExtractorTwigExtension;
 use Drupal\drupal_translation_extractor\Translation\Dumper\PoItem;
 use Symfony\Bridge\Twig\Translation\TwigExtractor as BaseTwigExtractor;
+use Symfony\Component\DependencyInjection\Attribute\Autowire;
 use Symfony\Component\Translation\MessageCatalogue;
 use Twig\Environment;
 use Twig\Source;
@@ -17,6 +18,7 @@ class TwigExtractor extends BaseTwigExtractor
     private string $prefix = '';
 
     public function __construct(
+        #[Autowire(service: 'twig')]
         private Environment $twig,
     ) {
         parent::__construct($this->twig);