Merge pull request #4612 from magento-engcom/2.3-develop-fast-lane-prs

[Magento Community Engineering] Community Contributions - 2.3-develop expedited

Author: VladimirZaets

app/code/Magento/Backend/Test/Unit/Model/Config/SessionLifetime/BackendModelTest.php

@@ -1153,7 +1153,7 @@ protected function getProductOptionTypes()
 
             if (count($group['optgroup'])) {
                 $options[] = $group;
-                $groupIndex += 1;
+                $groupIndex++;
             }
         }
 

app/code/Magento/Bundle/Test/Mftf/ActionGroup/AdminClearFiltersActionGroup.xml

@@ -3,13 +3,14 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
 namespace Magento\Catalog\Ui\DataProvider\Product\Form\Modifier;
 
 use Magento\Catalog\Api\Data\ProductAttributeInterface;
 use Magento\Catalog\Model\Locator\LocatorInterface;
 use Magento\Eav\Api\AttributeRepositoryInterface;
-use Magento\Ui\Component\Form;
 use Magento\Framework\Stdlib\ArrayManager;
+use Magento\Ui\Component\Form;
 
 /**
  * Data provider for main panel of product page
@@ -60,10 +61,10 @@ public function __construct(
     /**
      * Customize number fields for advanced price and weight fields.
      *
-     * @since 101.0.0
      * @param array $data
      * @return array
      * @throws \Magento\Framework\Exception\NoSuchEntityException
+     * @since 101.0.0
      */
     public function modifyData(array $data)
     {
@@ -125,7 +126,7 @@ protected function customizeAdvancedPriceFormat(array $data)
                 $value[ProductAttributeInterface::CODE_TIER_PRICE_FIELD_PRICE] =
                     $this->formatPrice($value[ProductAttributeInterface::CODE_TIER_PRICE_FIELD_PRICE]);
                 $value[ProductAttributeInterface::CODE_TIER_PRICE_FIELD_PRICE_QTY] =
-                    (float) $value[ProductAttributeInterface::CODE_TIER_PRICE_FIELD_PRICE_QTY];
+                    (float)$value[ProductAttributeInterface::CODE_TIER_PRICE_FIELD_PRICE_QTY];
             }
         }
 
@@ -135,9 +136,9 @@ protected function customizeAdvancedPriceFormat(array $data)
     /**
      * Customize product form fields.
      *
-     * @since 101.0.0
      * @param array $meta
      * @return array
+     * @since 101.0.0
      */
     public function modifyMeta(array $meta)
     {
@@ -234,9 +235,13 @@ protected function customizeWeightField(array $meta)
                 null,
                 'children'
             );
-            $meta = $this->arrayManager->merge($containerPath . static::META_CONFIG_PATH, $meta, [
-                'component' => 'Magento_Ui/js/form/components/group',
-            ]);
+            $meta = $this->arrayManager->merge(
+                $containerPath . static::META_CONFIG_PATH,
+                $meta,
+                [
+                    'component' => 'Magento_Ui/js/form/components/group',
+                ]
+            );
 
             $hasWeightPath = $this->arrayManager->slicePath($weightPath, 0, -1) . '/'
                 . ProductAttributeInterface::CODE_HAS_WEIGHT;
@@ -438,8 +443,13 @@ protected function formatNumber($value)
         $precision = strlen(substr(strrchr($value, "."), 1));
         $store = $this->locator->getStore();
         $currency = $this->getLocaleCurrency()->getCurrency($store->getBaseCurrencyCode());
-        $value = $currency->toCurrency($value, ['display' => \Magento\Framework\Currency::NO_SYMBOL,
-                                                'precision' => $precision]);
+        $value = $currency->toCurrency(
+            $value,
+            [
+                'display' => \Magento\Framework\Currency::NO_SYMBOL,
+                'precision' => $precision
+            ]
+        );
 
         return $value;
     }

app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateAndSwitchProductType.xml

@@ -812,3 +812,4 @@ Details,Details
 "Edit Product Design","Edit Product Design"
 "Edit Category Design","Edit Category Design"
 "A total of %1 record(s) haven't been deleted. Please see server logs for more details.","A total of %1 record(s) haven't been deleted. Please see server logs for more details."
+"Are you sure you want to delete this category?","Are you sure you want to delete this category?"