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

Author: glo60612

dev/tests/integration/testsuite/Magento/Setup/Module/I18n/Parser/Adapter/JsTest.php

@@ -38,13 +38,13 @@ public function testParse()
             [
                 'phrase' => 'text single quote',
                 'file' => $file,
-                'line' => 2,
+                'line' => 1,
                 'quote' => '\''
             ],
             [
                 'phrase' => 'text "some',
                 'file' => $file,
-                'line' => 3,
+                'line' => 1,
                 'quote' => '\''
             ]
         ];

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

@@ -17,7 +17,7 @@
 class TranslationFilesTest extends TranslationFiles
 {
     /**
-     * Context
+     * I18n\Context
      *
      * @var \Magento\Setup\Module\I18n\Context
      */

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

@@ -5,11 +5,29 @@
  */
 namespace Magento\Setup\Module\I18n\Parser\Adapter;
 
+use Magento\Framework\Exception\FileSystemException;
+use Magento\Framework\Filesystem\Driver\File;
+
 /**
  * Js parser adapter
  */
+
 class Js extends AbstractAdapter
 {
+    /**
+     * @var \Magento\Framework\Filesystem\Driver\File
+     */
+    protected $_filesystem;
+
+    /**
+     * Adapter construct
+     *
+     * @param \Magento\Framework\Filesystem\Driver\File $fileSystem
+     */
+    public function __construct()
+    {
+        $this->_filesystem = new \Magento\Framework\Filesystem\Driver\File();
+    }
     /**
      * Covers
      * $.mage.__('Example text')
@@ -32,27 +50,58 @@ class Js extends AbstractAdapter
      */
     protected function _parse()
     {
-        $fileHandle = @fopen($this->_file, 'r');
+        $fileHandle = $this->_filesystem->fileOpen($this->_file, 'r');
         $lineNumber = 0;
-        while (!feof($fileHandle)) {
-            $lineNumber++;
-            $fileRow = fgets($fileHandle, 4096);
-            $results = [];
-            $regexes = [
-                static::REGEX_MAGE_TRANSLATE,
-                static::REGEX_TRANSLATE_FUNCTION
-            ];
-
-            foreach ($regexes as $regex) {
-                preg_match_all($regex, $fileRow, $results, PREG_SET_ORDER);
-                for ($i = 0, $count = count($results); $i < $count; $i++) {
-                    if (isset($results[$i][2])) {
-                        $quote = $results[$i][1];
-                        $this->_addPhrase($quote . $results[$i][2] . $quote, $lineNumber);
+        try {
+            while (($line = $this->fileReadLine($fileHandle, 0)) !== false) {
+                $lineNumber++;
+                $fileRow = preg_replace('/"\s+\+"|"\s+\+\s+\"|"\+\s+\"|"\+"/', '', $line);
+                $fileRow = preg_replace("/'\s+\+'|'\s+\+\s+\'|'\+\s+\'|'\+'/", "", $fileRow);
+                $results = [];
+                $regexes = [
+                    static::REGEX_MAGE_TRANSLATE,
+                    static::REGEX_TRANSLATE_FUNCTION
+                ];
+
+                foreach ($regexes as $regex) {
+                    preg_match_all($regex, $fileRow, $results, PREG_SET_ORDER);
+                    for ($i = 0, $count = count($results); $i < $count; $i++) {
+                        if (isset($results[$i][2])) {
+                            $quote = $results[$i][1];
+                            $this->_addPhrase($quote . $results[$i][2] . $quote, $lineNumber);
+                        }
                     }
                 }
             }
+        } catch (\Exception $e) {
+            $this->_filesystem->fileClose($fileHandle);
+            throw new FileSystemException(
+                new \Magento\Framework\Phrase('Stream get line failed %1', [$e->getMessage()])
+            );
+        }
+        $this->_filesystem->fileClose($fileHandle);
+    }
+
+    /**
+     * Reads the line content from file pointer (with specified number of bytes from the current position).
+     *
+     * @param resource $resource
+     * @param int $length
+     * @param string $ending [optional]
+     * @return string
+     * @throws FileSystemException
+     */
+    public function fileReadLine($resource, $length, $ending = null)
+    {
+        try {
+            // phpcs:disable
+            $result = @stream_get_line($resource, $length, $ending);
+            // phpcs:enable
+        } catch (\Exception $e) {
+            throw new FileSystemException(
+                new \Magento\Framework\Phrase('Stream get line failed %1', [$e->getMessage()])
+            );
         }
-        fclose($fileHandle);
+        return $result;
     }
 }

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

@@ -28,14 +28,14 @@ class ServiceLocator
     private static $_context;
 
     /**
-     * Dictionary generator
+     * I18n Dictionary generator
      *
      * @var \Magento\Setup\Module\I18n\Dictionary\Generator
      */
     private static $_dictionaryGenerator;
 
     /**
-     * Pack generator
+     * I18n Pack generator
      *
      * @var \Magento\Setup\Module\I18n\Pack\Generator
      */

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

@@ -43,31 +43,31 @@ public function testParse()
             [
                 'phrase' => 'Phrase 1',
                 'file' => $this->_testFile,
-                'line' => $this->_stringsCount - 4,
+                'line' => 1,
                 'quote' => Phrase::QUOTE_SINGLE,
             ],
             [
                 'phrase' => 'Phrase 2 %1',
                 'file' => $this->_testFile,
-                'line' => $this->_stringsCount - 3,
+                'line' => 1,
                 'quote' => Phrase::QUOTE_DOUBLE
             ],
             [
                 'phrase' => 'Field ',
                 'file' => $this->_testFile,
-                'line' => $this->_stringsCount - 2,
+                'line' => 1,
                 'quote' => Phrase::QUOTE_SINGLE
             ],
             [
                 'phrase' => ' is required.',
                 'file' => $this->_testFile,
-                'line' => $this->_stringsCount - 2,
+                'line' => 1,
                 'quote' => Phrase::QUOTE_SINGLE
             ],
             [
                 'phrase' => 'Welcome, %1!',
                 'file' => $this->_testFile,
-                'line' => $this->_stringsCount - 1,
+                'line' => 1,
                 'quote' => Phrase::QUOTE_SINGLE
             ]
         ];