Merge remote-tracking branch 'origin/MAGETWO-38994-Eliminate-code-duplication-ComposerInformation' into PR_Branch

Author: Olga Kopylova

app/code/Magento/Translation/Console/Command/UninstallLanguageCommand.php

@@ -19,6 +19,8 @@
 
 /**
  * Command for uninstalling language and backup-code feature
+ * 
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class UninstallLanguageCommand extends Command
 {
@@ -151,7 +153,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
      */
     private function validate($package)
     {
-        $installedPackages = $this->composerInfo->getRootRequiredPackagesAndTypes();
+        $installedPackages = $this->composerInfo->getRootRequiredPackageTypesByName();
 
         if (isset($installedPackages[$package]) && $installedPackages[$package] === 'magento2-language') {
             return true;

app/code/Magento/Translation/Test/Unit/Console/Command/UninstallLanguageCommandTest.php

@@ -93,7 +93,7 @@ public function testExecute()
             ->willReturn($dependencies);
 
         $this->composerInfo->expects($this->once())
-            ->method('getRootRequiredPackagesAndTypes')
+            ->method('getRootRequiredPackageTypesByName')
             ->willReturn(
                 [
                     'vendor/language-ua_ua' => 'magento2-language'
@@ -123,7 +123,7 @@ public function testExecuteNoBackupOption()
             ->willReturn($dependencies);
 
         $this->composerInfo->expects($this->once())
-            ->method('getRootRequiredPackagesAndTypes')
+            ->method('getRootRequiredPackageTypesByName')
             ->willReturn(
                 [
                     'vendor/language-ua_ua' => 'magento2-language'
@@ -148,7 +148,7 @@ public function testExecutePackageHasDependency()
             ->willReturn($dependencies);
 
         $this->composerInfo->expects($this->once())
-            ->method('getRootRequiredPackagesAndTypes')
+            ->method('getRootRequiredPackageTypesByName')
             ->willReturn(
                 [
                     'vendor/language-ua_ua' => 'magento2-language'
@@ -178,7 +178,7 @@ public function testExecutePackageNoLanguage()
             ->willReturn($dependencies);
 
         $this->composerInfo->expects($this->once())
-            ->method('getRootRequiredPackagesAndTypes')
+            ->method('getRootRequiredPackageTypesByName')
             ->willReturn(
                 [
                     'vendor/language-ua_ua' => 'library'

dev/tests/integration/testsuite/Magento/Setup/Model/ComposerInformationTest.php renamed to dev/tests/integration/testsuite/Magento/Framework/Composer/ComposerInformationTest.php

@@ -4,10 +4,10 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Setup\Model;
+namespace Magento\Framework\Composer;
 
 /**
- * Tests Magento\Setup\Model\ComposerInformation
+ * Tests Magento\Framework\ComposerInformation
  */
 class ComposerInformationTest extends \PHPUnit_Framework_TestCase
 {
@@ -84,6 +84,22 @@ public function testGetRequiredExtensions($composerDir)
         }
     }
 
+    /**
+     * @param $composerDir string Directory under _files that contains composer files
+     *
+     * @dataProvider getRequiredPhpVersionDataProvider
+     */
+    public function testGetRootRequiredPackagesAndTypes($composerDir)
+    {
+        $this->setupDirectoryMock($composerDir);
+        $composerInfo = new ComposerInformation($this->filesystemMock, $this->ioMock);
+
+        $requiredPackagesAndTypes = $composerInfo->getRootRequiredPackageTypesByName();
+
+        $this->assertArrayHasKey('composer/composer', $requiredPackagesAndTypes);
+        $this->assertEquals('library', $requiredPackagesAndTypes['composer/composer']);
+    }
+
     /**
      * Data provider that returns directories containing different types of composer files.
      *