Merge branch '2.3-develop' into MC-19585

Author: nikita-shcherbatykh

app/code/Magento/Braintree/Model/Paypal/Helper/OrderPlace.php

@@ -19,6 +19,7 @@
 /**
  * Class OrderPlace
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  */
 class OrderPlace extends AbstractHelper
 {
@@ -79,9 +80,10 @@ public function __construct(
     public function execute(Quote $quote, array $agreement)
     {
         if (!$this->agreementsValidator->isValid($agreement)) {
-            throw new LocalizedException(__(
+            $errorMsg = __(
                 "The order wasn't placed. First, agree to the terms and conditions, then try placing your order again."
-            ));
+            );
+            throw new LocalizedException($errorMsg);
         }
 
         if ($this->getCheckoutMethod($quote) === Onepage::METHOD_GUEST) {
@@ -91,12 +93,7 @@ public function execute(Quote $quote, array $agreement)
         $this->disabledQuoteAddressValidation($quote);
 
         $quote->collectTotals();
-        try {
-            $this->cartManagement->placeOrder($quote->getId());
-        } catch (\Exception $e) {
-            $this->orderCancellationService->execute($quote->getReservedOrderId());
-            throw $e;
-        }
+        $this->cartManagement->placeOrder($quote->getId());
     }
 
     /**

app/code/Magento/Braintree/Plugin/OrderCancellation.php

@@ -72,7 +72,9 @@ public function aroundPlaceOrder(
             ];
             if (in_array($payment->getMethod(), $paymentCodes)) {
                 $incrementId = $quote->getReservedOrderId();
-                $this->orderCancellationService->execute($incrementId);
+                if ($incrementId) {
+                    $this->orderCancellationService->execute($incrementId);
+                }
             }
 
             throw $e;

app/code/Magento/Catalog/Model/Product/Option.php

@@ -167,6 +167,8 @@ protected function _getResource()
     }
 
     /**
+     * Construct function
+     *
      * @return void
      */
     protected function _construct()
@@ -215,6 +217,8 @@ public function hasValues($type = null)
     }
 
     /**
+     * Get values
+     *
      * @return ProductCustomOptionValuesInterface[]|null
      */
     public function getValues()
@@ -345,7 +349,8 @@ public function groupFactory($type)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
+     *
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
      * @since 101.0.0
      */
@@ -396,6 +401,8 @@ public function beforeSave()
     }
 
     /**
+     * After save
+     *
      * @return \Magento\Framework\Model\AbstractModel
      * @throws \Magento\Framework\Exception\LocalizedException
      */
@@ -424,7 +431,8 @@ public function afterSave()
 
     /**
      * Return price. If $flag is true and price is percent
-     *  return converted percent to price
+     *
+     * Return converted percent to price
      *
      * @param bool $flag
      * @return float
@@ -555,7 +563,7 @@ protected function _clearReferences()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     protected function _getValidationRulesBeforeSave()
     {
@@ -649,6 +657,8 @@ public function getSku()
     }
 
     /**
+     * Get file extension
+     *
      * @return string|null
      */
     public function getFileExtension()
@@ -657,6 +667,8 @@ public function getFileExtension()
     }
 
     /**
+     * Get Max Characters
+     *
      * @return int|null
      */
     public function getMaxCharacters()
@@ -665,6 +677,8 @@ public function getMaxCharacters()
     }
 
     /**
+     * Get image size X
+     *
      * @return int|null
      */
     public function getImageSizeX()
@@ -673,6 +687,8 @@ public function getImageSizeX()
     }
 
     /**
+     * Get image size Y
+     *
      * @return int|null
      */
     public function getImageSizeY()
@@ -780,6 +796,8 @@ public function setSku($sku)
     }
 
     /**
+     * Set File Extension
+     *
      * @param string $fileExtension
      * @return $this
      */
@@ -789,6 +807,8 @@ public function setFileExtension($fileExtension)
     }
 
     /**
+     * Set Max Characters
+     *
      * @param int $maxCharacters
      * @return $this
      */
@@ -798,6 +818,8 @@ public function setMaxCharacters($maxCharacters)
     }
 
     /**
+     * Set Image Size X
+     *
      * @param int $imageSizeX
      * @return $this
      */
@@ -807,6 +829,8 @@ public function setImageSizeX($imageSizeX)
     }
 
     /**
+     * Set Image Size Y
+     *
      * @param int $imageSizeY
      * @return $this
      */
@@ -816,6 +840,8 @@ public function setImageSizeY($imageSizeY)
     }
 
     /**
+     * Set value
+     *
      * @param ProductCustomOptionValuesInterface[] $values
      * @return $this
      */
@@ -826,7 +852,7 @@ public function setValues(array $values = null)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      *
      * @return \Magento\Catalog\Api\Data\ProductCustomOptionExtensionInterface|null
      */
@@ -852,6 +878,8 @@ public function getRegularPrice()
     }
 
     /**
+     * Get Product Option Collection
+     *
      * @param Product $product
      * @return \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
      */
@@ -882,7 +910,7 @@ public function getProductOptionCollection(Product $product)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      *
      * @param \Magento\Catalog\Api\Data\ProductCustomOptionExtensionInterface $extensionAttributes
      * @return $this
@@ -894,6 +922,8 @@ public function setExtensionAttributes(
     }
 
     /**
+     * Get option repository
+     *
      * @return Option\Repository
      */
     private function getOptionRepository()
@@ -906,6 +936,8 @@ private function getOptionRepository()
     }
 
     /**
+     * Get metadata pool
+     *
      * @return \Magento\Framework\EntityManager\MetadataPool
      */
     private function getMetadataPool()
@@ -931,7 +963,7 @@ private function cleanFileExtensions()
         preg_match_all('/(?<extensions>[a-z0-9]+)/i', strtolower($rawExtensions), $matches);
         if (!empty($matches)) {
             $extensions = implode(', ', array_unique($matches['extensions']));
+            $this->setFileExtension($extensions);
         }
-        $this->setFileExtension($extensions);
     }
 }

app/code/Magento/Catalog/Test/Mftf/ActionGroup/AdminProductGridActionGroup.xml

@@ -13,7 +13,7 @@
         <annotations>
             <description>Sets the Admin Products grid view to the 'Default View'.</description>
         </annotations>
-        
+
         <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFilters"/>
         <click selector="{{AdminProductGridFilterSection.viewDropdown}}" stepKey="openViewBookmarksTab"/>
         <click selector="{{AdminProductGridFilterSection.viewBookmark('Default View')}}" stepKey="resetToDefaultGridView"/>
@@ -120,7 +120,7 @@
         <annotations>
             <description>Filters the Admin Products grid by the 'Enabled' Status. PLEASE NOTE: The Filter is Hardcoded.</description>
         </annotations>
-        
+
         <conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFiltersInitial"/>
         <click selector="{{AdminProductGridFilterSection.filters}}" stepKey="openProductFilters"/>
         <selectOption selector="{{AdminProductGridFilterSection.statusFilter}}" userInput="Enabled" stepKey="selectEnabledStatusFilter"/>
@@ -286,6 +286,27 @@
         <see selector="{{AdminProductGridSection.productGridCell('1', 'Name')}}" userInput="{{name}}"  stepKey="seeProductNameInGrid" after="clickApplyFilters"/>
     </actionGroup>
 
+    <actionGroup name="deleteProductsByKeyword">
+        <annotations>
+            <description>Delete products by keyword</description>
+        </annotations>
+        <arguments>
+            <argument name="keyword" type="string"/>
+        </arguments>
+
+        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="visitAdminProductPage"/>
+        <conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="clickClearFilters"/>
+        <fillField selector="{{AdminProductGridFilterSection.keywordSearch}}" userInput="{{keyword}}" stepKey="fillKeywordField"/>
+        <click selector="{{AdminProductGridFilterSection.keywordSearchButton}}" stepKey="keywordSearchButton"/>
+        <click selector="{{AdminProductGridSection.multicheckDropdown}}" stepKey="openMulticheckDropdown"/>
+        <click selector="{{AdminProductGridSection.multicheckOption('Select All')}}" stepKey="selectAllProductInFilteredGrid"/>
+        <click selector="{{AdminProductGridSection.bulkActionDropdown}}" stepKey="clickActionDropdown"/>
+        <click selector="{{AdminProductGridSection.bulkActionOption('Delete')}}" stepKey="clickDeleteAction"/>
+        <waitForElementVisible selector="{{AdminConfirmationModalSection.ok}}" stepKey="waitForConfirmModal"/>
+        <click selector="{{AdminConfirmationModalSection.ok}}" stepKey="confirmProductDelete"/>
+        <see selector="{{AdminMessagesSection.success}}" userInput="record(s) have been deleted." stepKey="seeSuccessMessage"/>
+    </actionGroup>
+
     <!--Open product for edit by clicking row X and column Y in product grid-->
     <actionGroup name="openProducForEditByClickingRowXColumnYInProductGrid">
         <annotations>
@@ -314,7 +335,7 @@
         <annotations>
             <description>Filters the ID column in Ascending Order.</description>
         </annotations>
-        
+
         <conditionalClick selector="{{AdminProductGridTableHeaderSection.id('descend')}}" dependentSelector="{{AdminProductGridTableHeaderSection.id('ascend')}}" visible="false" stepKey="sortById"/>
         <waitForPageLoad stepKey="waitForPageLoad"/>
     </actionGroup>

app/code/Magento/Catalog/Test/Mftf/ActionGroup/StorefrontCheckProductPriceInCategoryActionGroup.xml

@@ -17,4 +17,14 @@
         <remove keyForRemoval="AssertProductPrice"/>
         <see userInput="{{product.price}}" selector="{{StorefrontCategoryProductSection.ProductPriceByName(product.name)}}" stepKey="AssertProductPrice"/>
     </actionGroup>
+    <actionGroup name="StorefrontAssertProductPriceOnCategoryPageActionGroup" extends="StorefrontAssertProductPriceOnProductPageActionGroup">
+        <annotations>
+            <description>Validate that the provided Product Price is correct on category page.</description>
+        </annotations>
+        <arguments>
+            <argument name="productName" type="string"/>
+        </arguments>
+
+        <see userInput="{{productPrice}}" selector="{{StorefrontCategoryProductSection.ProductPriceByName(productName)}}" stepKey="seeProductPrice"/>
+    </actionGroup>
 </actionGroups>

app/code/Magento/Catalog/Test/Mftf/Data/ProductAttributeData.xml

@@ -368,4 +368,12 @@
         <data key="frontend_input">swatch_visual</data>
         <data key="attribute_code" unique="suffix">visual_swatch</data>
     </entity>
+    <entity name="ProductColorAttribute" type="ProductAttribute">
+        <data key="frontend_label">Color</data>
+        <data key="attribute_code" unique="suffix">color_attr</data>
+    </entity>
+    <entity name="ProductSizeAttribute" type="ProductAttribute">
+        <data key="frontend_label">Size</data>
+        <data key="attribute_code" unique="suffix">size_attr</data>
+    </entity>
 </entities>

app/code/Magento/Checkout/etc/adminhtml/system.xml

@@ -27,19 +27,22 @@
                 </field>
                 <field id="max_items_display_count" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Maximum Number of Items to Display in Order Summary</label>
+                    <validate>validate-zero-or-greater validate-digits</validate>
                 </field>
             </group>
             <group id="cart" translate="label" sortOrder="2" showInDefault="1" showInWebsite="1" showInStore="1">
                 <label>Shopping Cart</label>
                 <field id="delete_quote_after" translate="label" type="text" sortOrder="1" showInDefault="1" showInWebsite="1" showInStore="0" canRestore="1">
                     <label>Quote Lifetime (days)</label>
+                    <validate>validate-zero-or-greater validate-digits</validate>
                 </field>
                 <field id="redirect_to_cart" translate="label" type="select" sortOrder="2" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>After Adding a Product Redirect to Shopping Cart</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                 </field>
                 <field id="number_items_to_display_pager" translate="label" type="text" sortOrder="2" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Number of Items to Display Pager</label>
+                    <validate>validate-zero-or-greater validate-digits</validate>
                 </field>
                 <field id="crosssell_enabled" translate="label" type="select" sortOrder="3" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Show Cross-sell Items in the Shopping Cart</label>
@@ -61,9 +64,11 @@
                 </field>
                 <field id="count" translate="label" type="text" sortOrder="2" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Number of Items to Display Scrollbar</label>
+                    <validate>validate-zero-or-greater validate-digits</validate>
                 </field>
                 <field id="max_items_display_count" translate="label" type="text" sortOrder="3" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Maximum Number of Items to Display</label>
+                    <validate>validate-zero-or-greater validate-digits</validate>
                 </field>
             </group>
             <group id="payment_failed" translate="label" type="text" sortOrder="100" showInDefault="1" showInWebsite="1" showInStore="1">
@@ -83,6 +88,7 @@
                 </field>
                 <field id="copy_to" translate="label comment" type="text" sortOrder="4" showInDefault="1" showInWebsite="1" showInStore="1">
                     <label>Send Payment Failed Email Copy To</label>
+                    <validate>validate-emails</validate>
                     <comment>Separate by ",".</comment>
                 </field>
                 <field id="copy_method" translate="label" type="select" sortOrder="5" showInDefault="1" showInWebsite="1" showInStore="1">