AC-9843:: i18n:collect-phrases breaks the translations integrity

Author: Poojamanral123

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

@@ -104,10 +104,9 @@ protected function prepareParser()
         $phraseCollector = new \Magento\Setup\Module\I18n\Parser\Adapter\Php\Tokenizer\PhraseCollector(
             new \Magento\Setup\Module\I18n\Parser\Adapter\Php\Tokenizer()
         );
-        $fileSystem = new \Magento\Framework\Filesystem\Driver\File();
         $adapters = [
             'php' => new \Magento\Setup\Module\I18n\Parser\Adapter\Php($phraseCollector),
-            'js' =>  new \Magento\Setup\Module\I18n\Parser\Adapter\Js($fileSystem),
+            'js' =>  new \Magento\Setup\Module\I18n\Parser\Adapter\Js(),
             'xml' => new \Magento\Setup\Module\I18n\Parser\Adapter\Xml(),
             'html' => new \Magento\Setup\Module\I18n\Parser\Adapter\Html(),
         ];

lib/internal/Magento/Framework/Config/Test/Unit/Composer/PackageTest.php

@@ -49,10 +49,10 @@ public function testGet()
         $this->assertSame(['3', '4'], $this->object->get('baz'));
         $nested = $this->object->get('nested');
         $this->assertInstanceOf('\StdClass', $nested);
-        $this->assertObjectHasAttribute('one', $nested);
+        $this->assertObjectHasProperty('one', $nested);
         $this->assertEquals('5', $nested->one);
         $this->assertEquals('5', $this->object->get('nested->one'));
-        $this->assertObjectHasAttribute('two', $nested);
+        $this->assertObjectHasProperty('two', $nested);
         $this->assertEquals('6', $nested->two);
         $this->assertEquals('6', $this->object->get('nested->two'));
         $this->assertEquals(

lib/internal/Magento/Framework/Simplexml/Test/Unit/ElementTest.php

@@ -19,11 +19,11 @@ public function testUnsetSelf($xmlData)
     {
         /** @var Element $xml */
         $xml = simplexml_load_file($xmlData[0], $xmlData[1]);
-        $this->assertObjectHasAttribute('node4', $xml->node3);
+        $this->assertObjectHasProperty('node4', $xml->node3);
         $xml->node3->unsetSelf();
-        $this->assertObjectNotHasAttribute('node4', $xml->node3);
-        $this->assertObjectNotHasAttribute('node3', $xml);
-        $this->assertObjectHasAttribute('node1', $xml);
+        $this->assertObjectNotHasProperty('node4', $xml->node3);
+        $this->assertObjectNotHasProperty('node3', $xml);
+        $this->assertObjectHasProperty('node1', $xml);
     }
 
     /**

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

@@ -24,10 +24,9 @@ class Js extends AbstractAdapter
      *
      * @param \Magento\Framework\Filesystem\Driver\File $fileSystem
      */
-    public function __construct(
-        File $fileSystem
-    ) {
-        $this->_filesystem = $fileSystem;
+    public function __construct()
+    {
+        $this->_filesystem = new \Magento\Framework\Filesystem\Driver\File();
     }
     /**
      * Covers
@@ -51,7 +50,6 @@ public function __construct(
      */
     protected function _parse()
     {
-        
         $fileHandle = $this->_filesystem->fileOpen($this->_file, 'r');
         $lineNumber = 0;
         try {

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

@@ -52,11 +52,10 @@ public static function getDictionaryGenerator()
             $filesCollector = new FilesCollector();
 
             $phraseCollector = new Parser\Adapter\Php\Tokenizer\PhraseCollector(new Parser\Adapter\Php\Tokenizer());
-            $fileSystem = new \Magento\Framework\Filesystem\Driver\File();
             $adapters = [
                 'php' => new Parser\Adapter\Php($phraseCollector),
                 'html' => new Parser\Adapter\Html(),
-                'js' => new Parser\Adapter\Js($fileSystem),
+                'js' => new Parser\Adapter\Js(),
                 'xml' => new Parser\Adapter\Xml(),
             ];
 

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
             ]
         ];