Skip to content

Commit b0a2491

Browse files
tomreecetomreece
committed
Merge remote-tracking branch 'mainline/2.4-develop' into community-tests-migration-pr-2.4-develop
2 parents 1022e6e + b0f9505 commit b0a2491

File tree

38 files changed

+543
-61
lines changed

38 files changed

+543
-61
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public function __construct(
6868
}
6969

7070
/**
71-
* {@inheritdoc}
71+
* @inheritdoc
7272
*/
7373
protected function _prepareForm()
7474
{
@@ -114,7 +114,7 @@ protected function _prepareForm()
114114
'name' => 'password',
115115
'label' => __('New Password'),
116116
'title' => __('New Password'),
117-
'class' => 'validate-admin-password admin__control-text'
117+
'class' => 'validate-admin-password'
118118
]
119119
);
120120

@@ -124,7 +124,7 @@ protected function _prepareForm()
124124
[
125125
'name' => 'password_confirmation',
126126
'label' => __('Password Confirmation'),
127-
'class' => 'validate-cpassword admin__control-text'
127+
'class' => 'validate-cpassword'
128128
]
129129
);
130130

@@ -152,7 +152,7 @@ protected function _prepareForm()
152152
'label' => __('Your Password'),
153153
'id' => self::IDENTITY_VERIFICATION_PASSWORD_FIELD,
154154
'title' => __('Your Password'),
155-
'class' => 'validate-current-password required-entry admin__control-text',
155+
'class' => 'validate-current-password required-entry',
156156
'required' => true
157157
]
158158
);

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

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@
1010
use Magento\Framework\Registry;
1111
use Magento\Store\Model\ScopeInterface;
1212

13+
/**
14+
* Data provider for price filter in layered navigation
15+
*/
1316
class Price
1417
{
1518
/**
@@ -103,6 +106,8 @@ public function __construct(
103106
}
104107

105108
/**
109+
* Getter for interval
110+
*
106111
* @return array
107112
*/
108113
public function getInterval()
@@ -111,6 +116,8 @@ public function getInterval()
111116
}
112117

113118
/**
119+
* Setter for interval
120+
*
114121
* @param array $interval
115122
* @return void
116123
*/
@@ -120,6 +127,10 @@ public function setInterval($interval)
120127
}
121128

122129
/**
130+
* Retrieves price layered navigation modes
131+
*
132+
* @see RANGE_CALCULATION_AUTO
133+
*
123134
* @return mixed
124135
*/
125136
public function getRangeCalculationValue()
@@ -131,6 +142,8 @@ public function getRangeCalculationValue()
131142
}
132143

133144
/**
145+
* Retrieves range step
146+
*
134147
* @return mixed
135148
*/
136149
public function getRangeStepValue()
@@ -142,6 +155,8 @@ public function getRangeStepValue()
142155
}
143156

144157
/**
158+
* Retrieves one price interval
159+
*
145160
* @return mixed
146161
*/
147162
public function getOnePriceIntervalValue()
@@ -179,6 +194,8 @@ public function getRangeMaxIntervalsValue()
179194
}
180195

181196
/**
197+
* Retrieves Catalog Layer object
198+
*
182199
* @return Layer
183200
*/
184201
public function getLayer()
@@ -276,6 +293,8 @@ public function getMaxPrice()
276293
}
277294

278295
/**
296+
* Retrieve list of prior filters
297+
*
279298
* @param string $filterParams
280299
* @return array
281300
*/
@@ -310,7 +329,7 @@ public function validateFilter($filter)
310329
return false;
311330
}
312331
foreach ($filter as $v) {
313-
if ($v !== '' && $v !== '0' && (double)$v <= 0 || is_infinite((double)$v)) {
332+
if ($v !== '' && $v !== '0' && (!is_numeric($v) || (double)$v <= 0 || is_infinite((double)$v))) {
314333
return false;
315334
}
316335
}
@@ -339,6 +358,8 @@ public function getResetValue()
339358
}
340359

341360
/**
361+
* Getter for prior intervals
362+
*
342363
* @return array
343364
*/
344365
public function getPriorIntervals()
@@ -347,6 +368,8 @@ public function getPriorIntervals()
347368
}
348369

349370
/**
371+
* Setter for prior intervals
372+
*
350373
* @param array $priorInterval
351374
* @return void
352375
*/
@@ -356,6 +379,8 @@ public function setPriorIntervals($priorInterval)
356379
}
357380

358381
/**
382+
* Get Resource model for price filter
383+
*
359384
* @return \Magento\Catalog\Model\ResourceModel\Layer\Filter\Price
360385
*/
361386
public function getResource()
@@ -364,6 +389,8 @@ public function getResource()
364389
}
365390

366391
/**
392+
* Retrieves additional request data
393+
*
367394
* @return string
368395
*/
369396
public function getAdditionalRequestData()

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@
2828
<createData entity="SimpleSubCategory" stepKey="categoryEntity"/>
2929
</before>
3030
<after>
31+
<actionGroup ref="deleteProductBySku" stepKey="deleteDefaultVirtualProduct">
32+
<argument name="sku" value="{{updateVirtualProductRegularPrice5OutOfStock.sku}}"/>
33+
</actionGroup>
3134
<deleteData stepKey="deleteSimpleSubCategory" createDataKey="initialCategoryEntity"/>
3235
<deleteData stepKey="deleteSimpleSubCategory2" createDataKey="categoryEntity"/>
3336
<actionGroup ref="logout" stepKey="logout"/>

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@
2828
<createData entity="SimpleSubCategory" stepKey="categoryEntity"/>
2929
</before>
3030
<after>
31+
<actionGroup ref="deleteProductBySku" stepKey="deleteDefaultVirtualProduct">
32+
<argument name="sku" value="{{updateVirtualProductRegularPrice5OutOfStock.sku}}"/>
33+
</actionGroup>
3134
<deleteData stepKey="deleteSimpleSubCategory" createDataKey="initialCategoryEntity"/>
3235
<deleteData stepKey="deleteSimpleSubCategory2" createDataKey="categoryEntity"/>
3336
<actionGroup ref="logout" stepKey="logout"/>

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@
2727
</createData>
2828
</before>
2929
<after>
30+
<actionGroup ref="deleteProductBySku" stepKey="deleteDefaultVirtualProduct">
31+
<argument name="sku" value="{{updateVirtualProductRegularPrice99OutOfStock.sku}}"/>
32+
</actionGroup>
3033
<deleteData stepKey="deleteSimpleSubCategory" createDataKey="initialCategoryEntity"/>
3134
<actionGroup ref="logout" stepKey="logout"/>
3235
</after>

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@
2828
<createData entity="SimpleSubCategory" stepKey="categoryEntity"/>
2929
</before>
3030
<after>
31+
<actionGroup ref="deleteProductBySku" stepKey="deleteDefaultVirtualProduct">
32+
<argument name="sku" value="{{updateVirtualProductSpecialPrice.sku}}"/>
33+
</actionGroup>
3134
<deleteData stepKey="deleteSimpleSubCategory" createDataKey="initialCategoryEntity"/>
3235
<deleteData stepKey="deleteSimpleSubCategory2" createDataKey="categoryEntity"/>
3336
<actionGroup ref="logout" stepKey="logout"/>

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@
2828
<createData entity="SimpleSubCategory" stepKey="categoryEntity"/>
2929
</before>
3030
<after>
31+
<actionGroup ref="deleteProductBySku" stepKey="deleteDefaultVirtualProduct">
32+
<argument name="sku" value="{{updateVirtualProductSpecialPriceOutOfStock.sku}}"/>
33+
</actionGroup>
3134
<deleteData stepKey="deleteSimpleSubCategory" createDataKey="initialCategoryEntity"/>
3235
<deleteData stepKey="deleteSimpleSubCategory2" createDataKey="categoryEntity"/>
3336
<actionGroup ref="logout" stepKey="logout"/>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,7 @@ public function validateFilterDataProvider()
178178
['filter' => '0', 'result' => false],
179179
['filter' => 0, 'result' => false],
180180
['filter' => '100500INF', 'result' => false],
181+
['filter' => '-10\'[0]', 'result' => false],
181182
];
182183
}
183184

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

Lines changed: 0 additions & 15 deletions
This file was deleted.

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@
1717
<testCaseId value="MC-22625"/>
1818
<useCaseId value="MC-21926"/>
1919
<group value="Checkout"/>
20+
<skip>
21+
<issueId value="MC-29597"/>
22+
</skip>
2023
</annotations>
2124

2225
<before>

0 commit comments

Comments
 (0)