Merge pull request #1160 from magento-nord/MAGETWO-67358

Fixed
- MAGETWO-67358: Remove unused code from Web Setup Wizard

Author: balex13

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

@@ -31,13 +31,9 @@ class SystemPackage
      */
     private $composerInfo;
 
-    /**#@+
-     * Constants for different Magento editions
-     */
     const EDITION_COMMUNITY = 'magento/product-community-edition';
+
     const EDITION_ENTERPRISE = 'magento/product-enterprise-edition';
-    const EDITION_B2B = 'magento/product-b2b-edition';
-    /**#@-*/
 
     /**
      * Constructor
@@ -63,7 +59,6 @@ public function __construct(
     public function getPackageVersions()
     {
         $currentCE = '0';
-        $currentEE = $currentCE;
 
         $result = [];
         $systemPackages = $this->getInstalledSystemPackages();
@@ -79,10 +74,6 @@ public function getPackageVersions()
                 $currentCE = $systemPackageInfo[InfoCommand::CURRENT_VERSION];
             }
 
-            if ($systemPackageInfo['name'] == static::EDITION_ENTERPRISE) {
-                $currentEE = $systemPackageInfo[InfoCommand::CURRENT_VERSION];
-            }
-
             if (count($versions) > 1) {
                 $versions[0]['name'] .= ' (latest)';
             }
@@ -97,12 +88,6 @@ public function getPackageVersions()
             $result = array_merge($this->getAllowedEnterpriseVersions($currentCE), $result);
         }
 
-        if (in_array(static::EDITION_ENTERPRISE, $systemPackages)
-            && !in_array(static::EDITION_B2B, $systemPackages)
-        ) {
-            $result = array_merge($this->getAllowedB2BVersions($currentEE), $result);
-        }
-
         $result = $this->formatPackages($result);
 
         return $result;
@@ -137,63 +122,6 @@ public function getAllowedEnterpriseVersions($currentCE)
         return $result;
     }
 
-    /**
-     * Retrieve allowed B2B versions
-     *
-     * @param string $currentEE
-     * @return array
-     */
-    public function getAllowedB2BVersions($currentEE)
-    {
-        $result = [];
-        $versions = $this->fetchInfoVersions(static::EDITION_B2B);
-        $versionsPrepared = [];
-        $maxVersion = '';
-
-        if ($versions[InfoCommand::AVAILABLE_VERSIONS]) {
-            $versions = $this->sortVersions($versions);
-            if (isset($versions[InfoCommand::AVAILABLE_VERSIONS][0])) {
-                $maxVersion = $versions[InfoCommand::AVAILABLE_VERSIONS][0];
-            }
-            $versionsPrepared = $this->filterB2bVersions($currentEE, $versions, $maxVersion);
-        }
-
-        if ($versionsPrepared) {
-            $result[] = [
-                'package' => static::EDITION_B2B,
-                'versions' => $versionsPrepared,
-            ];
-        }
-
-        return $result;
-    }
-
-    /**
-     * Fetching of info command response to display all correct versions
-     *
-     * @param string $command
-     * @return array
-     */
-    private function fetchInfoVersions($command)
-    {
-        $versions = (array)$this->infoCommand->run($command);
-
-        $versions[InfoCommand::CURRENT_VERSION] = isset($versions[InfoCommand::CURRENT_VERSION])
-            ? $versions[InfoCommand::CURRENT_VERSION]
-            : null;
-        $versions[InfoCommand::AVAILABLE_VERSIONS] = isset($versions[InfoCommand::AVAILABLE_VERSIONS])
-            ? $versions[InfoCommand::AVAILABLE_VERSIONS]
-            : null;
-        $versions[InfoCommand::AVAILABLE_VERSIONS] = array_unique(
-            array_merge(
-                (array)$versions[InfoCommand::CURRENT_VERSION],
-                (array)$versions[InfoCommand::AVAILABLE_VERSIONS]
-            )
-        );
-
-        return $versions;
-    }
-
     /**
      * Retrieve package versions
      *
@@ -209,8 +137,6 @@ public function getSystemPackageVersions($systemPackageInfo)
             $editionType .= 'CE';
         } elseif ($systemPackageInfo['name'] == static::EDITION_ENTERPRISE) {
             $editionType .= 'EE';
-        } elseif ($systemPackageInfo['name'] == static::EDITION_B2B) {
-            $editionType .= 'B2B';
         }
 
         foreach ($systemPackageInfo[InfoCommand::NEW_VERSIONS] as $version) {
@@ -229,6 +155,7 @@ public function getSystemPackageVersions($systemPackageInfo)
 
     /**
      * @return array
+     * @throws \Exception
      * @throws \RuntimeException
      */
     public function getInstalledSystemPackages()
@@ -342,36 +269,4 @@ public function filterEeVersions($currentCE, $enterpriseVersions, $maxVersion)
         }
         return $eeVersions;
     }
-
-    /**
-     * Filtering B2B versions
-     *
-     * @param string $currentEE
-     * @param array $b2bVersions
-     * @param string $maxVersion
-     * @return array
-     */
-    public function filterB2bVersions($currentEE, $b2bVersions, $maxVersion)
-    {
-        $b2bVersionsPrepared = [];
-        foreach ($b2bVersions[InfoCommand::AVAILABLE_VERSIONS] as $version) {
-            $requires = $this->composerInfo->getPackageRequirements(static::EDITION_B2B, $version);
-            if (array_key_exists(static::EDITION_ENTERPRISE, $requires)) {
-                /** @var \Composer\Package\Link $eeRequire */
-                $eeRequire = $requires[static::EDITION_ENTERPRISE];
-                if (version_compare(
-                    $eeRequire->getConstraint()->getPrettyString(),
-                    $currentEE,
-                    '>='
-                )) {
-                    $name = 'Version ' . $version . ' B2B';
-                    if ($maxVersion == $version) {
-                        $name .= ' (latest)';
-                    }
-                    $b2bVersionsPrepared[] = ['id' => $version, 'name' => $name, 'current' => false];
-                }
-            }
-        }
-        return $b2bVersionsPrepared;
-    }
 }

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

@@ -214,24 +214,7 @@ public function testGetPackageVersions()
                         'new_versions' => ['1.2.0', '1.1.0', '1.1.0-RC1'],
                     ],
 
-                ],
-                [
-
-                    SystemPackage::EDITION_B2B,
-                    false,
-                    [
-                        'name' => SystemPackage::EDITION_B2B,
-                        'description' => 'eCommerce Platform for Growth (B2B Edition)',
-                        'keywords' => '',
-                        'versions' => '1.2.0, 1.1.0, 1.1.0-RC1, * 1.0.0',
-                        'type' => 'metapackage',
-                        'license' => 'OSL-3.0, AFL-3.0',
-                        'source' => '[]',
-                        'names' => SystemPackage::EDITION_B2B,
-                        InfoCommand::AVAILABLE_VERSIONS => [],
-                        'new_versions' => ['1.2.0', '1.1.0', '1.1.0-RC1'],
-                    ],
-                ],
+                ]
             ]);
         $this->assertEquals($this->expectedPackages, $this->systemPackage->getPackageVersions());
     }
@@ -340,39 +323,6 @@ public function testGetAllowedEnterpriseVersions($ceCurrentVersion, $expectedRes
         );
     }
 
-    /**
-     * @param string $eeCurrentVersion
-     * @param array $expectedResult
-     *
-     * @dataProvider getAllowedB2bVersionsDataProvider
-     */
-    public function testGetAllowedB2bVersions($eeCurrentVersion, $expectedResult)
-    {
-        $this->composerAppFactory->expects($this->once())
-            ->method('createInfoCommand')
-            ->willReturn($this->infoCommand);
-        $this->systemPackage = new SystemPackage($this->composerAppFactory, $this->composerInformation);
-        $this->infoCommand->expects($this->once())
-            ->method('run')
-            ->with(SystemPackage::EDITION_B2B)
-            ->willReturn([InfoCommand::AVAILABLE_VERSIONS => ['1.0.0', '1.0.1', '1.0.2']]);
-        $require = $this->getMock(\Composer\Package\Link::class, [], [], '', false);
-        $constraintMock = $this->getMock(\Composer\Semver\Constraint\Constraint::class, [], [], '', false);
-        $constraintMock->expects($this->any())->method('getPrettyString')
-            ->willReturn('1.0.1');
-        $require->expects($this->any())
-            ->method('getConstraint')
-            ->willReturn($constraintMock);
-
-        $this->composerInformation->expects($this->any())
-            ->method('getPackageRequirements')
-            ->willReturn([SystemPackage::EDITION_ENTERPRISE => $require]);
-        $this->assertEquals(
-            $expectedResult,
-            $this->systemPackage->getAllowedB2BVersions($eeCurrentVersion)
-        );
-    }
-
     /**
      * @return array
      */
@@ -408,40 +358,4 @@ public function getAllowedEnterpriseVersionsDataProvider()
             ],
         ];
     }
-
-    /**
-     * @return array
-     */
-    public function getAllowedB2bVersionsDataProvider()
-    {
-        return [
-            ['2.0.0', []],
-            [
-                '1.0.0',
-                [
-                    [
-                        'package' => SystemPackage::EDITION_B2B,
-                        'versions' => [
-                            [
-                                'id' => '1.0.2',
-                                'name' => 'Version 1.0.2 B2B (latest)',
-                                'current' => false,
-                            ],
-                            [
-                                'id' => '1.0.1',
-                                'name' => 'Version 1.0.1 B2B',
-                                'current' => false,
-                            ],
-                            [
-
-                                'id' => '1.0.0',
-                                'name' => 'Version 1.0.0 B2B',
-                                'current' => false,
-                            ],
-                        ],
-                    ],
-                ],
-            ],
-        ];
-    }
 }