Refactored

Author: rimi-itk

.editorconfig

@@ -0,0 +1,24 @@
+# This file is copied from config/symfony/.editorconfig in https://github.com/itk-dev/devops_itkdev-docker.
+# Feel free to edit the file, but consider making a pull request if you find a general issue with the file.
+
+# EditorConfig is awesome: https://editorconfig.org
+
+# top-most EditorConfig file
+root = true
+
+[*]
+charset = utf-8
+end_of_line = LF
+indent_size = 4
+indent_style = space
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.{js,css,scss}]
+indent_size = 2
+
+[*.{yml,yaml}]
+indent_size = 2
+
+[config/**/*.{yml,yaml}]
+indent_size = 4

drupal_translation_extractor.services.yml

@@ -12,9 +12,9 @@ services:
         - '@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\Twig\Translation\Extractor\TwigExtractor:
 
-  Drupal\drupal_translation_extractor\ItkTranslationExtractorTwigExtension:
+  Drupal\drupal_translation_extractor\Twig\Extension\ItkTranslationExtractorTwigExtension:
     tags:
       - { name: twig.extension }
 
@@ -32,7 +32,7 @@ services:
           "addExtractor",
           [
             "twig",
-            '@Drupal\drupal_translation_extractor\Translation\TwigExtractor',
+            '@Drupal\drupal_translation_extractor\Twig\Translation\Extractor\TwigExtractor',
           ],
         ]
 

phpstan.dist.neon

@@ -4,7 +4,7 @@ parameters:
 		- src
 		- tests
 	excludePaths:
-		- tests/Unit/*/resources/*
+		- tests/resources/*
 
 	treatPhpDocTypesAsCertain: false
 

…ItkTranslationExtractorTwigExtension.php …ItkTranslationExtractorTwigExtension.phpsrc/ItkTranslationExtractorTwigExtension.php renamed to src/Twig/Extension/ItkTranslationExtractorTwigExtension.php src/ItkTranslationExtractorTwigExtension.php renamed to src/Twig/Extension/ItkTranslationExtractorTwigExtension.php

@@ -2,9 +2,9 @@
 
 declare(strict_types=1);
 
-namespace Drupal\drupal_translation_extractor;
+namespace Drupal\drupal_translation_extractor\Twig\Extension;
 
-use Drupal\drupal_translation_extractor\NodeVisitor\TranslationNodeVisitor;
+use Drupal\drupal_translation_extractor\Twig\NodeVisitor\TranslationNodeVisitor;
 use Twig\Extension\AbstractExtension;
 
 /**

…c/NodeVisitor/TranslationNodeVisitor.php …g/NodeVisitor/TranslationNodeVisitor.phpsrc/NodeVisitor/TranslationNodeVisitor.php renamed to src/Twig/NodeVisitor/TranslationNodeVisitor.php src/NodeVisitor/TranslationNodeVisitor.php renamed to src/Twig/NodeVisitor/TranslationNodeVisitor.php

@@ -1,8 +1,7 @@
 <?php
 
-namespace Drupal\drupal_translation_extractor\NodeVisitor;
+namespace Drupal\drupal_translation_extractor\Twig\NodeVisitor;
 
-use Drupal\Core\Template\TwigNodeTrans;
 use Drupal\Core\Template\TwigNodeTrans as TransNode;
 use Drupal\drupal_translation_extractor\Translation\Dumper\PoItem;
 use Twig\Environment;
@@ -66,18 +65,6 @@ public function enterNode(Node $node, Environment $env): Node
                 $this->getReadDomainFromArguments($node->getNode('arguments'), 1),
             ];
         // {{ t('…') }} is not supported in Drupal.
-        // } elseif (
-        //     $node instanceof FunctionExpression
-        //     && 't' === $node->getAttribute('name')
-        // ) {
-        //     $nodeArguments = $node->getNode('arguments');
-        //
-        //     if ($nodeArguments->getIterator()->current() instanceof ConstantExpression) {
-        //         $this->messages[] = [
-        //             $this->getReadMessageFromArguments($nodeArguments, 0),
-        //             $this->getReadDomainFromArguments($nodeArguments, 2),
-        //         ];
-        //     }
         } elseif ($node instanceof TransNode) {
             // extract trans nodes
             $body = $node->getNode('body');
@@ -191,7 +178,7 @@ private function getStringValue(Node $node): string
      *
      * Return type has been added.
      *
-     * @see TwigNodeTrans::compileString()
+     * @see TransNode::compileString()
      */
     private function compileString(Node $body): array
     {

src/Translation/TwigExtractor.php …/Translation/Extractor/TwigExtractor.phpsrc/Translation/TwigExtractor.php renamed to src/Twig/Translation/Extractor/TwigExtractor.php src/Translation/TwigExtractor.php renamed to src/Twig/Translation/Extractor/TwigExtractor.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace Drupal\drupal_translation_extractor\Translation;
+namespace Drupal\drupal_translation_extractor\Twig\Translation\Extractor;
 
-use Drupal\drupal_translation_extractor\ItkTranslationExtractorTwigExtension;
 use Drupal\drupal_translation_extractor\Translation\Dumper\PoItem;
+use Drupal\drupal_translation_extractor\Twig\Extension\ItkTranslationExtractorTwigExtension;
 use Symfony\Bridge\Twig\Translation\TwigExtractor as BaseTwigExtractor;
 use Symfony\Component\DependencyInjection\Attribute\Autowire;
 use Symfony\Component\Translation\MessageCatalogue;

tests/Unit/AbstractTestCase.php

@@ -3,14 +3,19 @@
 namespace Drupal\drupal_translation_extractor\Test\Unit;
 
 use Drupal\Core\Template\TwigTransTokenParser;
-use Drupal\drupal_translation_extractor\ItkTranslationExtractorTwigExtension;
+use Drupal\drupal_translation_extractor\Twig\Extension\ItkTranslationExtractorTwigExtension;
 use PHPUnit\Framework\TestCase;
 use Twig;
 use Twig\Environment;
 use Twig\Loader\FilesystemLoader;
 
 abstract class AbstractTestCase extends TestCase
 {
+    protected function getResourcePath(string $path = ''): string
+    {
+        return dirname(__DIR__).'/resources/'.$path;
+    }
+
     protected function createTwig(): Environment
     {
         $twig = new Environment(new FilesystemLoader());

tests/Unit/Command/TranslationExtractCommandTest.php

@@ -10,7 +10,7 @@
 use Drupal\drupal_translation_extractor\Translation\Extractor\PhpExtractor;
 use Drupal\drupal_translation_extractor\Translation\Extractor\Visitor\TranslatableMarkupVisitor;
 use Drupal\drupal_translation_extractor\Translation\Extractor\Visitor\TransMethodVisitor;
-use Drupal\drupal_translation_extractor\Translation\TwigExtractor;
+use Drupal\drupal_translation_extractor\Twig\Translation\Extractor\TwigExtractor;
 use Drupal\locale\StringStorageInterface;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\ArrayInput;
@@ -25,7 +25,7 @@ public function testNoTranslations(): void
         $command = $this->createCommand();
         $input = new ArrayInput([
             'locale' => 'da',
-            'source' => __DIR__.'/resources/translations/',
+            'source' => $this->getResourcePath('translations'),
             '--dump-messages' => true,
         ]);
         $output = new BufferedOutput();
@@ -42,11 +42,11 @@ public function testNoTranslationsOutput(): void
         $command = $this->createCommand();
         $input = new ArrayInput([
             'locale' => 'da',
-            'source' => __DIR__.'/resources/templates/',
+            'source' => $this->getResourcePath('templates/'),
             '--force' => true,
             '--output' => $outputPath,
         ]);
-        $expectedPath = __DIR__.'/resources/expected/'.__FUNCTION__.'.da.po';
+        $expectedPath = $this->getResourcePath('expected/'.__FUNCTION__.'.da.po');
 
         $output = new BufferedOutput();
         $result = $command->run($input, $output);