MAGETWO-51505: Improve Component Manager workflow

- CR fixes.

Author: mazhalai

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

@@ -61,7 +61,7 @@ public function saveAuthJsonAction()
         try {
             $userName = isset($params['username']) ? $params['username'] : '';
             $password = isset($params['password']) ? $params['password'] : '';
-            $isValid = $this->packagesAuth->checkCredentialsAction($userName, $password);
+            $isValid = $this->packagesAuth->checkCredentials($userName, $password);
             $isValid = json_decode($isValid, true);
             if ($isValid['success'] === true && $this->packagesAuth->saveAuthJson($userName, $password)) {
                 $this->packagesData->syncPackagesData();
@@ -84,10 +84,7 @@ public function checkAuthAction()
         try {
             $authDataJson = $this->packagesAuth->getAuthJsonData();
             if ($authDataJson) {
-                $isValid = $this->packagesAuth->checkCredentialsAction(
-                    $authDataJson['username'],
-                    $authDataJson['password']
-                );
+                $isValid = $this->packagesAuth->checkCredentials($authDataJson['username'], $authDataJson['password']);
                 $isValid = json_decode($isValid, true);
                 if ($isValid['success'] === true) {
                     return new JsonModel(['success' => true, 'data' => [

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

@@ -9,6 +9,9 @@
 use Magento\Framework\App\Filesystem\DirectoryList;
 use Zend\View\Model\JsonModel;
 
+/**
+ * Class PackagesAuth, checks, saves and removes auth details related to packages.
+ */
 class PackagesAuth
 {
     /**#@+
@@ -17,12 +20,14 @@ class PackagesAuth
     const KEY_HTTPBASIC = 'http-basic';
     const KEY_USERNAME = 'username';
     const KEY_PASSWORD = 'password';
+    /**#@-/
 
     /**#@+
      * Filenames for auth and package info
      */
     const PATH_TO_AUTH_FILE = 'auth.json';
     const PATH_TO_PACKAGES_FILE = 'packages.json';
+    /**#@-/
 
     /**
      * @var \Zend\ServiceManager\ServiceLocatorInterface
@@ -81,7 +86,7 @@ public function getCredentialBaseUrl()
      * @param string $secretKey
      * @return string
      */
-    public function checkCredentialsAction($token, $secretKey)
+    public function checkCredentials($token, $secretKey)
     {
         $serviceUrl = $this->getPackagesJsonUrl();
         $this->curlClient->setCredentials($token, $secretKey);

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

@@ -7,22 +7,18 @@
 namespace Magento\Setup\Model;
 
 /**
- * Class SyncPackages returns system package and available for update versions
+ * Class PackagesData returns system packages and available for update versions
  */
 class PackagesData
 {
-    /**#@+
-     * Composer command
-     */
-    const COMPOSER_SHOW = 'show';
-    /**#@-*/
-
     /**#@+
      * Composer command params and options
      */
+    const COMPOSER_SHOW = 'show';
     const PARAM_COMMAND = 'command';
     const PARAM_PACKAGE = 'package';
     const PARAM_AVAILABLE = '--available';
+    /**#@-*/
 
     /**
      * @var \Magento\Framework\Composer\ComposerInformation
@@ -59,7 +55,6 @@ class PackagesData
      *
      * @param \Magento\Framework\Composer\ComposerInformation $composerInformation,
      * @param \Magento\Setup\Model\DateTime\TimeZoneProvider $timeZoneProvider,
-     * @param \Magento\Framework\HTTP\Client\Curl $curl,
      * @param \Magento\Setup\Model\PackagesAuth $packagesAuth,
      * @param \Magento\Framework\Filesystem $filesystem,
      * @param \Magento\Setup\Model\ObjectManagerProvider $objectManagerProvider
@@ -368,13 +363,9 @@ private function getPackageAvailableVersions($package)
             count($magentoRepositories) === 1
             && strpos($magentoRepositories[0], $this->packagesAuth->getCredentialBaseUrl())
         ) {
-            $packagesJsonData = [];
-            if (empty($this->packagesJsonData)) {
-                $this->packagesJsonData = $this->getPackagesJson();
-            }
-
-            if ($this->packagesJsonData) {
-                $packagesJsonData = json_decode($this->packagesJsonData, true);
+            $packagesJsonData = $this->getPackagesJson();
+            if ($packagesJsonData) {
+                $packagesJsonData = json_decode($packagesJsonData, true);
             } else {
                 $packagesJsonData['packages'] = [];
             }

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

@@ -50,11 +50,11 @@ public function testCheckCredentialsActionBadCredentials()
         $this->curl->expects($this->once())->method('setCredentials')->with('username', 'password');
         $this->curl->expects($this->once())->method('getStatus');
         $expectedValue = '{"success":false,"message":"Bad credentials"}';
-        $returnValue = $this->packagesAuth->checkCredentialsAction('username', 'password');
+        $returnValue = $this->packagesAuth->checkCredentials('username', 'password');
         $this->assertSame($expectedValue, $returnValue);
     }
 
-    public function testCheckCredentialsAction()
+    public function testCheckCredentials()
     {
         $this->curl->expects($this->once())->method('setCredentials')->with('username', 'password');
         $this->curl->expects($this->once())->method('getStatus')->willReturn(200);
@@ -65,7 +65,7 @@ public function testCheckCredentialsAction()
             ->method('writeFile')
             ->with(PackagesAuth::PATH_TO_PACKAGES_FILE, "{'someJson'}");
         $expectedValue = '{"success":true}';
-        $returnValue = $this->packagesAuth->checkCredentialsAction('username', 'password');
+        $returnValue = $this->packagesAuth->checkCredentials('username', 'password');
         $this->assertSame($expectedValue, $returnValue);
     }
 
@@ -78,7 +78,7 @@ public function testCheckCredentialsActionWithException()
         $this->curl->expects($this->never())->method('getBody')->willReturn("{'someJson}");
 
         $expectedValue = '{"success":false,"message":"Test error"}';
-        $returnValue = $this->packagesAuth->checkCredentialsAction('username', 'password');
+        $returnValue = $this->packagesAuth->checkCredentials('username', 'password');
         $this->assertSame($expectedValue, $returnValue);
     }