MAGETWO-55193: Extension Management with Marketplace data

- Fix static

Author: viktym

setup/src/Magento/Setup/Controller/InstallExtensionGrid.php

@@ -60,6 +60,25 @@ public function extensionsAction()
     {
         $extensions = $this->packagesData->getPackagesForInstall();
         $packages = isset($extensions['packages']) ? $extensions['packages'] : [];
+        $packages = $this->formatPackageList($packages);
+
+        return new JsonModel(
+            [
+                'success' => true,
+                'extensions' => array_values($packages),
+                'total' => count($packages)
+            ]
+        );
+    }
+
+    /**
+     * Format package list
+     *
+     * @param array $packages
+     * @return array
+     */
+    private function formatPackageList(array $packages)
+    {
         array_walk($packages, function (&$package) {
             $package['vendor'] = ucfirst($package['vendor']);
             $package['link'] = isset($package['extra']['x-magento-ext-package-link']) ?
@@ -70,12 +89,6 @@ public function extensionsAction()
                 $package['extra']['x-magento-ext-type'] : $this->typeMapper->map($package['name'], $package['type']);
         });
 
-        return new JsonModel(
-            [
-                'success' => true,
-                'extensions' => array_values($packages),
-                'total' => count($packages)
-            ]
-        );
+        return $packages;
     }
 }

setup/src/Magento/Setup/Model/Grid/Module.php

@@ -6,10 +6,8 @@
 namespace Magento\Setup\Model\Grid;
 
 use Magento\Framework\Composer\ComposerInformation;
-use Magento\Framework\Module\FullModuleList;
 use Magento\Framework\Module\ModuleList;
 use Magento\Framework\Module\PackageInfoFactory;
-use Magento\Setup\Model\ObjectManagerProvider;
 use Magento\Setup\Model\PackagesData;
 
 /**
@@ -36,14 +34,14 @@ class Module
     private $packageInfo;
 
     /**
-     * @var ObjectManagerProvider
+     * @var \Magento\Setup\Model\ObjectManagerProvider
      */
     private $objectManagerProvider;
 
     /**
      * Full Module info
      *
-     * @var FullModuleList
+     * @var \Magento\Framework\Module\FullModuleList
      */
     private $fullModuleList;
 
@@ -66,17 +64,17 @@ class Module
 
     /**
      * @param ComposerInformation $composerInformation
-     * @param FullModuleList $fullModuleList
+     * @param \Magento\Framework\Module\FullModuleList $fullModuleList
      * @param ModuleList $moduleList
-     * @param ObjectManagerProvider $objectManagerProvider
+     * @param \Magento\Setup\Model\ObjectManagerProvider $objectManagerProvider
      * @param TypeMapper $typeMapper
      * @param PackagesData $packagesData
      */
     public function __construct(
         ComposerInformation $composerInformation,
-        FullModuleList $fullModuleList,
+        \Magento\Framework\Module\FullModuleList $fullModuleList,
         ModuleList $moduleList,
-        ObjectManagerProvider $objectManagerProvider,
+        \Magento\Setup\Model\ObjectManagerProvider $objectManagerProvider,
         TypeMapper $typeMapper,
         PackagesData $packagesData
     ) {
@@ -189,17 +187,30 @@ private function addGeneralInfo(array $items)
         foreach ($items as &$item) {
             $item['moduleName'] = $item['moduleName'] ?: $this->packageInfo->getModuleName($item['name']);
             $item['enable'] = $this->moduleList->has($item['moduleName']);
-
             $vendorSource = $item['name'] == self::UNKNOWN_PACKAGE_NAME ? $item['moduleName'] : $item['name'];
             $item['vendor'] = ucfirst(current(preg_split('%[/_]%', $vendorSource)));
+        }
+        $items = $this->addExtraInfo($items);
 
+        return array_values($items);
+    }
+
+    /**
+     * Add extra info to result array
+     *
+     * @param array $items
+     * @return array
+     */
+    private function addExtraInfo(array $items)
+    {
+        foreach ($items as &$item) {
             $extraInfo = $this->packagesData->getPackageExtraInfo($item['name'], $item['version']);
             $item['product_name'] =  isset($extraInfo['x-magento-ext-title']) ?
                 $extraInfo['x-magento-ext-title'] : $item['name'];
             $item['type'] = isset($extraInfo['x-magento-ext-type']) ? $extraInfo['x-magento-ext-type'] :
                 $this->typeMapper->map($item['name'], ComposerInformation::MODULE_PACKAGE_TYPE);
         }
 
-        return array_values($items);
+        return $items;
     }
 }

setup/src/Magento/Setup/Model/PackagesData.php

@@ -5,8 +5,6 @@
  */
 namespace Magento\Setup\Model;
 
-use Magento\Framework\Composer\ComposerInformation;
-
 /**
  * Class PackagesData returns system packages and available for update versions
  */
@@ -22,7 +20,7 @@ class PackagesData
     /**#@-*/
 
     /**
-     * @var ComposerInformation
+     * @var \Magento\Framework\Composer\ComposerInformation
      */
     private $composerInformation;
 
@@ -64,14 +62,14 @@ class PackagesData
     /**
      * PackagesData constructor.
      *
-     * @param ComposerInformation $composerInformation,
+     * @param \Magento\Framework\Composer\ComposerInformation $composerInformation,
      * @param \Magento\Setup\Model\DateTime\TimeZoneProvider $timeZoneProvider,
      * @param \Magento\Setup\Model\PackagesAuth $packagesAuth,
      * @param \Magento\Framework\Filesystem $filesystem,
      * @param \Magento\Setup\Model\ObjectManagerProvider $objectManagerProvider
      */
     public function __construct(
-        ComposerInformation $composerInformation,
+        \Magento\Framework\Composer\ComposerInformation $composerInformation,
         \Magento\Setup\Model\DateTime\TimeZoneProvider $timeZoneProvider,
         \Magento\Setup\Model\PackagesAuth $packagesAuth,
         \Magento\Framework\Filesystem $filesystem,
@@ -376,7 +374,7 @@ private function getMetaPackageForPackage($packages)
     {
         $result = [];
         foreach ($packages as $package) {
-            if ($package['type'] == ComposerInformation::METAPACKAGE_PACKAGE_TYPE) {
+            if ($package['type'] == \Magento\Framework\Composer\ComposerInformation::METAPACKAGE_PACKAGE_TYPE) {
                 if (isset($package['require'])) {
                     foreach ($package['require'] as $key => $requirePackage) {
                         $result[$key] = $package['name'];
@@ -400,7 +398,7 @@ public function getMetaPackagesMap()
             $packages = $this->getPackagesJson();
             array_walk($packages, function ($packageVersions) {
                 $package = array_shift($packageVersions);
-                if ($package['type'] == ComposerInformation::METAPACKAGE_PACKAGE_TYPE
+                if ($package['type'] == \Magento\Framework\Composer\ComposerInformation::METAPACKAGE_PACKAGE_TYPE
                     && isset($package['require'])
                 ) {
                     foreach (array_keys($package['require']) as $key) {

setup/src/Magento/Setup/Test/Unit/Model/Grid/ModuleTest.php

@@ -191,7 +191,6 @@ public function testGetList()
                 ],
             ]);
 
-
         $this->moduleListMock->expects(static::exactly(2))
             ->method('has')
             ->willReturn(true);

setup/src/Magento/Setup/Test/Unit/Model/PackagesDataTest.php

@@ -13,6 +13,7 @@
 
 /**
  * Tests Magento\Setup\Model\PackagesData
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class PackagesDataTest extends \PHPUnit_Framework_TestCase
 {