MAGETWO-90388: [FAT] Fix UpgradeSystemTest to correctly work with other components list

Author: svitja

dev/tests/functional/tests/app/Magento/Setup/Test/Block/Readiness.php

@@ -195,7 +195,7 @@ public function getDependencyCheck()
     /**
      * @return bool
      */
-    public function isPhpVersionCheckVisible()
+    public function isPhpVersionCheckVisible() : bool
     {
         return $this->_rootElement->find($this->phpVersionCheck)->isVisible();
     }

dev/tests/functional/tests/app/Magento/Setup/Test/Block/SelectVersion.php

@@ -105,7 +105,7 @@ private function chooseShowAllVersions()
      * @param array $packages
      * @return void
      */
-    public function chooseUpgradeOtherComponents(array $packages)
+    public function chooseUpgradeOtherComponents(array $packages) :void
     {
         $this->_rootElement->find("[for=yesUpdateComponents]")->click();
         $this->waitForElementNotVisible("[ng-show=\"!componentsProcessed\"");
@@ -125,6 +125,7 @@ public function chooseUpgradeOtherComponents(array $packages)
     public function isComponentsEmpty()
     {
         $this->waitForElementVisible($this->waitEmpty, Locator::SELECTOR_XPATH);
+
         return $this->_rootElement->find($this->empty)->isVisible();
     }
 
@@ -143,14 +144,15 @@ public function getSelectedPackages()
      *
      * @return OtherComponentsGrid
      */
-    private function getOtherComponentsGrid()
+    private function getOtherComponentsGrid() : OtherComponentsGrid
     {
         if (!isset($this->otherComponentGrid)) {
             $this->otherComponentGrid = $this->blockFactory->create(
                 OtherComponentsGrid::class,
                 ['element' => $this->_rootElement->find($this->otherComponentsGrid)]
             );
         }
+
         return $this->otherComponentGrid;
     }
 }

dev/tests/functional/tests/app/Magento/Setup/Test/Block/SelectVersion/OtherComponentsGrid.php

@@ -12,6 +12,9 @@
 use Magento\Mtf\Client\Locator;
 use Magento\Setup\Test\Block\SelectVersion\OtherComponentsGrid\Item;
 
+/**
+ * Perform OtherComponentsGrid block.
+ */
 class OtherComponentsGrid extends Block
 {
     /**
@@ -30,9 +33,12 @@ class OtherComponentsGrid extends Block
     private $selectedPackages = [];
 
     /**
-     * @param $packages
+     * Set version of the packages.
+     *
+     * @param array $packages
+     * @return void
      */
-    public function setVersions(array $packages)
+    public function setVersions(array $packages) : void
     {
         foreach ($packages as $package) {
             $selector = sprintf($this->itemComponent, $package['name']);
@@ -50,24 +56,29 @@ public function setVersions(array $packages)
      *
      * @return array
      */
-    public function getSelectedPackages()
+    public function getSelectedPackages() : array
     {
         return $this->selectedPackages;
     }
 
     /**
+     * Set pager size.
+     *
      * @param int $count
+     * @return void
      */
-    public function setItemsPerPage($count)
+    public function setItemsPerPage(int $count) : void
     {
         $this->_rootElement->find($this->perPage, Locator::SELECTOR_CSS, 'select')->setValue($count);
     }
 
     /**
+     * Get component block.
+     *
      * @param ElementInterface $element
      * @return Item
      */
-    private function getComponentRow($element)
+    private function getComponentRow(ElementInterface $element) : Item
     {
         return $this->blockFactory->create(
             Item::class,

dev/tests/functional/tests/app/Magento/Setup/Test/Block/SelectVersion/OtherComponentsGrid/Item.php

@@ -34,7 +34,7 @@ class Item extends Block
      *
      * @param string $version
      */
-    public function setVersion($version)
+    public function setVersion(string $version)
     {
         $this->_rootElement->find($this->version, Locator::SELECTOR_CSS, 'select')->setValue($version);
     }

dev/tests/functional/tests/app/Magento/Setup/Test/Constraint/AssertVersionAndEditionCheck.php

@@ -21,7 +21,7 @@ class AssertVersionAndEditionCheck extends AbstractConstraint
      * @param array $upgrade
      * @return void
      */
-    public function processAssert(SetupWizard $setupWizard, array $upgrade)
+    public function processAssert(SetupWizard $setupWizard, array $upgrade) :void
     {
         $message = "We're ready to upgrade {$upgrade['package']} to {$upgrade['version']}.";
         if ($upgrade['otherComponents'] === 'Yes' && isset($upgrade['selectedPackages'])) {