Skip to content

Commit abbfa03

Browse files
🔃 [Magento Community Engineering] Community Contributions - 2.3-develop latest changes
Accepted Community Pull Requests: - #25024: Quality Assurance > Missing PHPDoc comment (by @lfluvisotto) - #25034: Resolve "New Accounts Report" should disable the sort ability of "New Account" columns (because it can not run) #25033 (by @edenduong) - #24959: Fix for #23577. Check if db tables for config data exists before fetch (by @ivan-koliadynskyy) - #24899: Static Content Deploy - Add command line argument to disable JS Bundles (by @andrey-legayev) - #24898: DI Compile - Sort DI metadata output to make diff between builds easier (by @andrey-legayev) - #24345: Sales - fix displaying available allowed countries while editing order address in Admin panel (by @oleksii-lisovyi) - #24981: Fixed required class is missing in load template (by @gauravagarwal1001) - #25064: Updated strings and XML comments. (by @sanganinamrata) Fixed GitHub Issues: - #25033: "New Accounts Report" should disable the sort ability of "New Account" columns (because it can not run) (reported by @edenduong) has been fixed in #25034 by @edenduong in 2.3-develop branch Related commits: 1. f68dd1c - #23577: Since 2.3.2, we can no longer switch maintenance modes with an empty database (reported by @hostep) has been fixed in #24959 by @ivan-koliadynskyy in 2.3-develop branch Related commits: 1. 813f1d7 2. c252363 3. 9e88279 4. ee6e8a6 5. 20e46ff 6. 55a5748 7. 0a083be 8. c579195 - #12560: Back-End issue for multi-store website: when editing Order shipping/billing address - allowed countries are selected from wrong Store View (reported by @svejegres) has been fixed in #24345 by @oleksii-lisovyi in 2.3-develop branch Related commits: 1. d617c3c 2. 883d9f5
2 parents b169e62 + 4f91401 commit abbfa03

File tree

40 files changed

+668
-70
lines changed

40 files changed

+668
-70
lines changed

app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/ConfigTest.php

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,9 @@ public function testGetSolutionIdSandbox($environment, $expectedSolution)
8181
$this->assertEquals($expectedSolution, $this->model->getSolutionId(123));
8282
}
8383

84+
/**
85+
* @return array
86+
*/
8487
public function configMapProvider()
8588
{
8689
return [
@@ -97,6 +100,10 @@ public function configMapProvider()
97100
['getTransactionInfoSyncKeys', 'transactionSyncKeys', 'a,b,c', ['a', 'b', 'c']],
98101
];
99102
}
103+
104+
/**
105+
* @return array
106+
*/
100107
public function environmentUrlProvider()
101108
{
102109
return [
@@ -105,6 +112,9 @@ public function environmentUrlProvider()
105112
];
106113
}
107114

115+
/**
116+
* @return array
117+
*/
108118
public function environmentSolutionProvider()
109119
{
110120
return [

app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Request/AddressDataBuilderTest.php

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,13 +108,22 @@ public function testBuildWithBothAddresses()
108108
$this->assertEquals('abc', $result['transactionRequest']['customerIP']);
109109
}
110110

111+
/**
112+
* @param $responseData
113+
* @param $addressPrefix
114+
*/
111115
private function validateAddressData($responseData, $addressPrefix)
112116
{
113117
foreach ($this->mockAddressData as $fieldValue => $field) {
114118
$this->assertEquals($addressPrefix . $field['sampleData'], $responseData[$fieldValue]);
115119
}
116120
}
117121

122+
/**
123+
* @param $prefix
124+
*
125+
* @return \PHPUnit\Framework\MockObject\MockObject
126+
*/
118127
private function createAddressMock($prefix)
119128
{
120129
$addressAdapterMock = $this->createMock(AddressAdapterInterface::class);

app/code/Magento/AuthorizenetAcceptjs/Test/Unit/Gateway/Response/PaymentReviewStatusHandlerTest.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,9 @@ public function testDoesNothingWhenPending(string $status)
112112
$this->handler->handle($subject, $response);
113113
}
114114

115+
/**
116+
* @return array
117+
*/
115118
public function pendingTransactionStatusesProvider()
116119
{
117120
return [
@@ -120,6 +123,9 @@ public function pendingTransactionStatusesProvider()
120123
];
121124
}
122125

126+
/**
127+
* @return array
128+
*/
123129
public function declinedTransactionStatusesProvider()
124130
{
125131
return [

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,7 @@
389389
<waitForPageLoad stepKey="waitForGridLoad"/>
390390
</actionGroup>
391391

392-
<!--Filter and select the the product -->
392+
<!--Filter and select the product -->
393393
<actionGroup name="filterAndSelectProduct">
394394
<annotations>
395395
<description>Goes to the Admin Products grid. Filters the Product grid by the provided Product SKU.</description>

app/code/Magento/Catalog/Test/Unit/Model/Category/FileInfoTest.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,9 @@ public function testIsExist($fileName, $fileMediaPath)
191191
$this->assertTrue($this->model->isExist($fileName));
192192
}
193193

194+
/**
195+
* @return array
196+
*/
194197
public function isExistProvider()
195198
{
196199
return [
@@ -213,6 +216,9 @@ public function testIsBeginsWithMediaDirectoryPath($fileName, $expected)
213216
$this->assertEquals($expected, $this->model->isBeginsWithMediaDirectoryPath($fileName));
214217
}
215218

219+
/**
220+
* @return array
221+
*/
216222
public function isBeginsWithMediaDirectoryPathProvider()
217223
{
218224
return [

app/code/Magento/Catalog/Test/Unit/Model/ProductTest.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -486,6 +486,9 @@ public function testGetStoreSingleSiteModelIds(
486486
$this->assertEquals($websiteIDs, $this->model->getStoreIds());
487487
}
488488

489+
/**
490+
* @return array
491+
*/
489492
public function getSingleStoreIds()
490493
{
491494
return [

app/code/Magento/Checkout/Test/Mftf/ActionGroup/CheckoutActionGroup.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@
222222
<!-- Check product in checkout cart items -->
223223
<actionGroup name="CheckProductInCheckoutCartItemsActionGroup">
224224
<annotations>
225-
<description>Validates the the provided Product appears in the Storefront Checkout 'Order Summary' section.</description>
225+
<description>Validates the provided Product appears in the Storefront Checkout 'Order Summary' section.</description>
226226
</annotations>
227227
<arguments>
228228
<argument name="productVar"/>

app/code/Magento/Checkout/Test/Unit/Model/Cart/RequestQuantityProcessorTest.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,9 @@ public function testProcess($cartData, $expected)
4848
$this->assertEquals($this->requestProcessor->process($cartData), $expected);
4949
}
5050

51+
/**
52+
* @return array
53+
*/
5154
public function cartDataProvider()
5255
{
5356
return [

app/code/Magento/Config/Test/Mftf/ActionGroup/AdminConfigCreateNewAccountActionGroup.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
1111
<actionGroup name="SetGroupForValidVATIdIntraUnionActionGroup">
1212
<annotations>
13-
<description>Goes to the 'Configuration' page for 'Customer Configuration'. Sets the 'Group For Valid VAT ID Intra Union' option. Clicks on the Save button. Validates the the Save message is present.</description>
13+
<description>Goes to the 'Configuration' page for 'Customer Configuration'. Sets the 'Group For Valid VAT ID Intra Union' option. Clicks on the Save button. Validates the Save message is present.</description>
1414
</annotations>
1515
<arguments>
1616
<argument name="value" type="string"/>

app/code/Magento/Deploy/Console/DeployStaticOptions.php

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,11 @@ class DeployStaticOptions
7878
*/
7979
const NO_JAVASCRIPT = 'no-javascript';
8080

81+
/**
82+
* Key for js-bundle option
83+
*/
84+
const NO_JS_BUNDLE = 'no-js-bundle';
85+
8186
/**
8287
* Key for css option
8388
*/
@@ -122,9 +127,6 @@ class DeployStaticOptions
122127
*/
123128
const NO_LESS = 'no-less';
124129

125-
/**
126-
* Default jobs amount
127-
*/
128130
const DEFAULT_JOBS_AMOUNT = 0;
129131

130132
/**
@@ -275,6 +277,12 @@ private function getSkipOptions()
275277
InputOption::VALUE_NONE,
276278
'Do not deploy JavaScript files.'
277279
),
280+
new InputOption(
281+
self::NO_JS_BUNDLE,
282+
null,
283+
InputOption::VALUE_NONE,
284+
'Do not deploy JavaScript bundle files.'
285+
),
278286
new InputOption(
279287
self::NO_CSS,
280288
null,

0 commit comments

Comments
 (0)