Merge remote-tracking branch 'origin/AC-9843-collect-phrases-issue' into spartans_pr_12062024

Author: glo60612

dev/tests/static/testsuite/Magento/Test/Integrity/App/Language/TranslationFilesTest.php

@@ -10,6 +10,7 @@
 use Magento\Setup\Module\I18n\Dictionary\Options\ResolverFactory;
 use Magento\Setup\Module\I18n\Locale;
 use Magento\Setup\Module\I18n\Pack\Writer\File\Csv;
+use Magento\Framework\Filesystem\Driver\File;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -104,9 +105,10 @@ protected static function prepareParser()
         $phraseCollector = new \Magento\Setup\Module\I18n\Parser\Adapter\Php\Tokenizer\PhraseCollector(
             new \Magento\Setup\Module\I18n\Parser\Adapter\Php\Tokenizer()
         );
+        $fileSystem = new File;
         $adapters = [
             'php' => new \Magento\Setup\Module\I18n\Parser\Adapter\Php($phraseCollector),
-            'js' =>  new \Magento\Setup\Module\I18n\Parser\Adapter\Js(),
+            'js' =>  new \Magento\Setup\Module\I18n\Parser\Adapter\Js($fileSystem),
             'xml' => new \Magento\Setup\Module\I18n\Parser\Adapter\Xml(),
             'html' => new \Magento\Setup\Module\I18n\Parser\Adapter\Html(),
         ];

setup/src/Magento/Setup/Module/I18n/Parser/Adapter/Js.php

@@ -15,18 +15,18 @@
 class Js extends AbstractAdapter
 {
     /**
-     * @var \Magento\Framework\Filesystem\Driver\File
+     * @var File
      */
-    protected $_filesystem;
+    private $filesystem;
 
     /**
      * Adapter construct
      *
-     * @param \Magento\Framework\Filesystem\Driver\File $fileSystem
+     * @param File $filesystem
      */
-    public function __construct()
+    public function __construct(File $filesystem)
     {
-        $this->_filesystem = new \Magento\Framework\Filesystem\Driver\File();
+        $this->filesystem = $filesystem;
     }
     /**
      * Covers
@@ -47,10 +47,12 @@ public function __construct()
 
     /**
      * @inheritdoc
+     *
+     * @throws FileSystemException
      */
     protected function _parse()
     {
-        $fileHandle = $this->_filesystem->fileOpen($this->_file, 'r');
+        $fileHandle = $this->filesystem->fileOpen($this->_file, 'r');
         $lineNumber = 0;
         try {
             while (($line = $this->fileReadLine($fileHandle, 0)) !== false) {
@@ -74,12 +76,12 @@ protected function _parse()
                 }
             }
         } catch (\Exception $e) {
-            $this->_filesystem->fileClose($fileHandle);
+            $this->filesystem->fileClose($fileHandle);
             throw new FileSystemException(
                 new \Magento\Framework\Phrase('Stream get line failed %1', [$e->getMessage()])
             );
         }
-        $this->_filesystem->fileClose($fileHandle);
+        $this->filesystem->fileClose($fileHandle);
     }
 
     /**

setup/src/Magento/Setup/Module/I18n/ServiceLocator.php

@@ -6,6 +6,7 @@
 namespace Magento\Setup\Module\I18n;
 
 use Magento\Framework\Component\ComponentRegistrar;
+use Magento\Framework\Filesystem\Driver\File;
 
 /**
  *  Service Locator (instead DI container)
@@ -52,10 +53,11 @@ public static function getDictionaryGenerator()
             $filesCollector = new FilesCollector();
 
             $phraseCollector = new Parser\Adapter\Php\Tokenizer\PhraseCollector(new Parser\Adapter\Php\Tokenizer());
+            $fileSystem = new File;
             $adapters = [
                 'php' => new Parser\Adapter\Php($phraseCollector),
                 'html' => new Parser\Adapter\Html(),
-                'js' => new Parser\Adapter\Js(),
+                'js' => new Parser\Adapter\Js($fileSystem),
                 'xml' => new Parser\Adapter\Xml(),
             ];
 

setup/src/Magento/Setup/Test/Unit/Module/I18n/Parser/Adapter/JsTest.php

@@ -7,6 +7,7 @@
 
 namespace Magento\Setup\Test\Unit\Module\I18n\Parser\Adapter;
 
+use Magento\Framework\Filesystem\Driver\File;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Setup\Module\I18n\Dictionary\Phrase;
 use Magento\Setup\Module\I18n\Parser\Adapter\Js;
@@ -33,8 +34,8 @@ protected function setUp(): void
     {
         $this->_testFile = str_replace('\\', '/', realpath(dirname(__FILE__))) . '/_files/file.js';
         $this->_stringsCount = count(file($this->_testFile));
-
-        $this->_adapter = (new ObjectManager($this))->getObject(Js::class);
+        $filesystem = new File();
+        $this->_adapter = (new ObjectManager($this))->getObject(Js::class, ['filesystem' => $filesystem]);
     }
 
     public function testParse()