MTA-2080: Sync qmt repository with mainline - Sprint 11

Author: Dmytro Aponasenko

dev/tests/functional/lib/Magento/Mtf/Client/Element/ConditionsElement.php

@@ -296,6 +296,9 @@ protected function addCondition($type, ElementInterface $context)
      * @param ElementInterface $element
      * @return void
      * @throws \Exception
+     *
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     * @SuppressWarnings(PHPMD.NPathComplexity)
      */
     protected function fillCondition(array $rules, ElementInterface $element)
     {

dev/tests/functional/tests/app/Magento/CurrencySymbol/Test/TestCase/AbstractCurrencySymbolEntityTest.php

@@ -39,13 +39,20 @@ abstract class AbstractCurrencySymbolEntityTest extends Injectable
     protected $fixtureFactory;
 
     /**
-     * Prepare data. Create simple product.
+     * Create simple product and inject pages.
      *
+     * @param SystemCurrencySymbolIndex $currencySymbolIndex
+     * @param SystemCurrencyIndex $currencyIndex
      * @param FixtureFactory $fixtureFactory
      * @return array
      */
-    public function __prepare(FixtureFactory $fixtureFactory)
-    {
+    public function __inject(
+        SystemCurrencySymbolIndex $currencySymbolIndex,
+        SystemCurrencyIndex $currencyIndex,
+        FixtureFactory $fixtureFactory
+    ) {
+        $this->currencySymbolIndex = $currencySymbolIndex;
+        $this->currencyIndex = $currencyIndex;
         $this->fixtureFactory = $fixtureFactory;
         $product = $this->fixtureFactory->createByCode(
             'catalogProductSimple',
@@ -56,21 +63,6 @@ public function __prepare(FixtureFactory $fixtureFactory)
         return ['product' => $product];
     }
 
-    /**
-     * Create simple product and inject pages.
-     *
-     * @param SystemCurrencySymbolIndex $currencySymbolIndex
-     * @param SystemCurrencyIndex $currencyIndex
-     * @return void
-     */
-    public function __inject(
-        SystemCurrencySymbolIndex $currencySymbolIndex,
-        SystemCurrencyIndex $currencyIndex
-    ) {
-        $this->currencySymbolIndex = $currencySymbolIndex;
-        $this->currencyIndex = $currencyIndex;
-    }
-
     /**
      * Import currency rates.
      *