Filter out trans paths that are covered by a parent folder path

natewiebe13 · natewiebe13 · commit 12b311d202c6 · 2022-09-26T10:13:39.000-04:00
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php
@@ -21,6 +21,7 @@
 use Symfony\Component\Console\Output\ConsoleOutputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\Console\Style\SymfonyStyle;
+use Symfony\Component\Filesystem\Path;
 use Symfony\Component\HttpKernel\KernelInterface;
 use Symfony\Component\Translation\Catalogue\MergeOperation;
 use Symfony\Component\Translation\Catalogue\TargetOperation;
@@ -407,6 +408,7 @@ private function extractMessages(string $locale, array $transPaths, string $pref
     {
         $extractedCatalogue = new MessageCatalogue($locale);
         $this->extractor->setPrefix($prefix);
+        $transPaths = $this->filterDuplicateTransPaths($transPaths);
         foreach ($transPaths as $path) {
             if (is_dir($path) || is_file($path)) {
                 $this->extractor->extract($path, $extractedCatalogue);
@@ -416,6 +418,31 @@ private function extractMessages(string $locale, array $transPaths, string $pref
         return $extractedCatalogue;
     }
 
+    private function filterDuplicateTransPaths(array $transPaths): array
+    {
+        foreach ($transPaths as $index => $path) {
+            if (is_dir($path) || is_file($path)) {
+                $transPaths[$index] = realpath($path);
+            }
+        }
+
+        sort($transPaths);
+
+        $filteredPaths = [];
+
+        foreach ($transPaths as $path) {
+            foreach ($filteredPaths as $filteredPath) {
+                if (is_dir($filteredPath) && Path::isBasePath($filteredPath, $path)) {
+                    continue 2;
+                }
+            }
+
+            $filteredPaths[] = $path;
+        }
+
+        return $filteredPaths;
+    }
+
     private function loadCurrentMessages(string $locale, array $transPaths): MessageCatalogue
     {
         $currentCatalogue = new MessageCatalogue($locale);
