Merge remote-tracking branch 'mainline/2.4-develop' into community-tests-migration-pr-2.4-develop

Author: tomreece

app/code/Magento/Backend/Block/System/Account/Edit/Form.php

@@ -68,7 +68,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     protected function _prepareForm()
     {
@@ -114,7 +114,7 @@ protected function _prepareForm()
                 'name' => 'password',
                 'label' => __('New Password'),
                 'title' => __('New Password'),
-                'class' => 'validate-admin-password admin__control-text'
+                'class' => 'validate-admin-password'
             ]
         );
 
@@ -124,7 +124,7 @@ protected function _prepareForm()
             [
                 'name' => 'password_confirmation',
                 'label' => __('Password Confirmation'),
-                'class' => 'validate-cpassword admin__control-text'
+                'class' => 'validate-cpassword'
             ]
         );
 
@@ -152,7 +152,7 @@ protected function _prepareForm()
                 'label' => __('Your Password'),
                 'id' => self::IDENTITY_VERIFICATION_PASSWORD_FIELD,
                 'title' => __('Your Password'),
-                'class' => 'validate-current-password required-entry admin__control-text',
+                'class' => 'validate-current-password required-entry',
                 'required' => true
             ]
         );

app/code/Magento/Catalog/Model/Layer/Filter/DataProvider/Price.php

@@ -10,6 +10,9 @@
 use Magento\Framework\Registry;
 use Magento\Store\Model\ScopeInterface;
 
+/**
+ * Data provider for price filter in layered navigation
+ */
 class Price
 {
     /**
@@ -103,6 +106,8 @@ public function __construct(
     }
 
     /**
+     * Getter  for interval
+     *
      * @return array
      */
     public function getInterval()
@@ -111,6 +116,8 @@ public function getInterval()
     }
 
     /**
+     * Setter for interval
+     *
      * @param array $interval
      * @return void
      */
@@ -120,6 +127,10 @@ public function setInterval($interval)
     }
 
     /**
+     * Retrieves price layered navigation modes
+     *
+     * @see RANGE_CALCULATION_AUTO
+     *
      * @return mixed
      */
     public function getRangeCalculationValue()
@@ -131,6 +142,8 @@ public function getRangeCalculationValue()
     }
 
     /**
+     * Retrieves range step
+     *
      * @return mixed
      */
     public function getRangeStepValue()
@@ -142,6 +155,8 @@ public function getRangeStepValue()
     }
 
     /**
+     * Retrieves one price interval
+     *
      * @return mixed
      */
     public function getOnePriceIntervalValue()
@@ -179,6 +194,8 @@ public function getRangeMaxIntervalsValue()
     }
 
     /**
+     * Retrieves Catalog Layer object
+     *
      * @return Layer
      */
     public function getLayer()
@@ -276,6 +293,8 @@ public function getMaxPrice()
     }
 
     /**
+     * Retrieve list of prior filters
+     *
      * @param string $filterParams
      * @return array
      */
@@ -310,7 +329,7 @@ public function validateFilter($filter)
             return false;
         }
         foreach ($filter as $v) {
-            if ($v !== '' && $v !== '0' && (double)$v <= 0 || is_infinite((double)$v)) {
+            if ($v !== '' && $v !== '0' && (!is_numeric($v) || (double)$v <= 0 || is_infinite((double)$v))) {
                 return false;
             }
         }
@@ -339,6 +358,8 @@ public function getResetValue()
     }
 
     /**
+     * Getter for prior intervals
+     *
      * @return array
      */
     public function getPriorIntervals()
@@ -347,6 +368,8 @@ public function getPriorIntervals()
     }
 
     /**
+     * Setter for prior intervals
+     *
      * @param array $priorInterval
      * @return void
      */
@@ -356,6 +379,8 @@ public function setPriorIntervals($priorInterval)
     }
 
     /**
+     * Get Resource model for price filter
+     *
      * @return \Magento\Catalog\Model\ResourceModel\Layer\Filter\Price
      */
     public function getResource()
@@ -364,6 +389,8 @@ public function getResource()
     }
 
     /**
+     * Retrieves additional request data
+     *
      * @return string
      */
     public function getAdditionalRequestData()

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

@@ -28,6 +28,9 @@
             <createData entity="SimpleSubCategory" stepKey="categoryEntity"/>
         </before>
         <after>
+            <actionGroup ref="deleteProductBySku" stepKey="deleteDefaultVirtualProduct">
+                <argument name="sku" value="{{updateVirtualProductRegularPrice5OutOfStock.sku}}"/>
+            </actionGroup>
             <deleteData stepKey="deleteSimpleSubCategory" createDataKey="initialCategoryEntity"/>
             <deleteData stepKey="deleteSimpleSubCategory2" createDataKey="categoryEntity"/>
             <actionGroup ref="logout" stepKey="logout"/>

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

@@ -28,6 +28,9 @@
             <createData entity="SimpleSubCategory" stepKey="categoryEntity"/>
         </before>
         <after>
+            <actionGroup ref="deleteProductBySku" stepKey="deleteDefaultVirtualProduct">
+                <argument name="sku" value="{{updateVirtualProductRegularPrice5OutOfStock.sku}}"/>
+            </actionGroup>
             <deleteData stepKey="deleteSimpleSubCategory" createDataKey="initialCategoryEntity"/>
             <deleteData stepKey="deleteSimpleSubCategory2" createDataKey="categoryEntity"/>
             <actionGroup ref="logout" stepKey="logout"/>

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

@@ -27,6 +27,9 @@
             </createData>
         </before>
         <after>
+            <actionGroup ref="deleteProductBySku" stepKey="deleteDefaultVirtualProduct">
+                <argument name="sku" value="{{updateVirtualProductRegularPrice99OutOfStock.sku}}"/>
+            </actionGroup>
             <deleteData stepKey="deleteSimpleSubCategory" createDataKey="initialCategoryEntity"/>
             <actionGroup ref="logout" stepKey="logout"/>
         </after>

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

@@ -28,6 +28,9 @@
             <createData entity="SimpleSubCategory" stepKey="categoryEntity"/>
         </before>
         <after>
+            <actionGroup ref="deleteProductBySku" stepKey="deleteDefaultVirtualProduct">
+                <argument name="sku" value="{{updateVirtualProductSpecialPrice.sku}}"/>
+            </actionGroup>
             <deleteData stepKey="deleteSimpleSubCategory" createDataKey="initialCategoryEntity"/>
             <deleteData stepKey="deleteSimpleSubCategory2" createDataKey="categoryEntity"/>
             <actionGroup ref="logout" stepKey="logout"/>

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

@@ -28,6 +28,9 @@
             <createData entity="SimpleSubCategory" stepKey="categoryEntity"/>
         </before>
         <after>
+            <actionGroup ref="deleteProductBySku" stepKey="deleteDefaultVirtualProduct">
+                <argument name="sku" value="{{updateVirtualProductSpecialPriceOutOfStock.sku}}"/>
+            </actionGroup>
             <deleteData stepKey="deleteSimpleSubCategory" createDataKey="initialCategoryEntity"/>
             <deleteData stepKey="deleteSimpleSubCategory2" createDataKey="categoryEntity"/>
             <actionGroup ref="logout" stepKey="logout"/>

app/code/Magento/Catalog/Test/Unit/Model/Layer/Filter/DataProvider/PriceTest.php

@@ -178,6 +178,7 @@ public function validateFilterDataProvider()
             ['filter' => '0', 'result' => false],
             ['filter' => 0, 'result' => false],
             ['filter' => '100500INF', 'result' => false],
+            ['filter' => '-10\'[0]', 'result' => false],
         ];
     }
 

app/code/Magento/CatalogRule/Test/Mftf/Section/AdminCatalogPriceRuleStagingSection.xml

@@ -17,6 +17,9 @@
             <testCaseId value="MC-22625"/>
             <useCaseId value="MC-21926"/>
             <group value="Checkout"/>
+            <skip>
+                <issueId value="MC-29597"/>
+            </skip>
         </annotations>
 
         <before>

app/code/Magento/Checkout/Test/Mftf/Test/StorefrontNotApplicableShippingMethodInReviewAndPaymentStepTest.xml

@@ -179,7 +179,7 @@ protected function _addGeneralFieldset($form, $integrationData)
                 'label' => __('Your Password'),
                 'id' => self::DATA_CONSUMER_PASSWORD,
                 'title' => __('Your Password'),
-                'class' => 'input-text validate-current-password required-entry',
+                'class' => 'validate-current-password required-entry',
                 'required' => true
             ]
         );