Skip to content

Commit f36b92d

Browse files
author
Magento CICD
authored
merge magento/2.2-develop into magento-panda/PANDA-PR-2.2
2 parents 87c3b15 + 1795f67 commit f36b92d

File tree

765 files changed

+8316
-644
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

765 files changed

+8316
-644
lines changed

‎app/code/Magento/AdminNotification/Test/Unit/Model/System/Message/CacheOutdatedTest.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,9 @@ public function testGetIdentity($expectedSum, $cacheTypes)
6262
$this->assertEquals($expectedSum, $this->_messageModel->getIdentity());
6363
}
6464

65+
/**
66+
* @return array
67+
*/
6568
public function getIdentityDataProvider()
6669
{
6770
$cacheTypeMock1 = $this->createPartialMock(\stdClass::class, ['getCacheType']);
@@ -95,6 +98,9 @@ public function testIsDisplayed($expected, $allowed, $cacheTypes)
9598
$this->assertEquals($expected, $this->_messageModel->isDisplayed());
9699
}
97100

101+
/**
102+
* @return array
103+
*/
98104
public function isDisplayedDataProvider()
99105
{
100106
$cacheTypesMock = $this->createPartialMock(\stdClass::class, ['getCacheType']);

‎app/code/Magento/AdminNotification/Test/Unit/Model/System/Message/Media/Synchronization/ErrorTest.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,9 @@ public function testIsDisplayed($expectedFirstRun, $data)
7272
$this->assertEquals($expectedFirstRun, $model->isDisplayed());
7373
}
7474

75+
/**
76+
* @return array
77+
*/
7578
public function isDisplayedDataProvider()
7679
{
7780
return [

‎app/code/Magento/AdminNotification/Test/Unit/Model/System/Message/SecurityTest.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,9 @@ public function testIsDisplayed($expectedResult, $cached, $response)
7676
$this->assertEquals($expectedResult, $this->_messageModel->isDisplayed());
7777
}
7878

79+
/**
80+
* @return array
81+
*/
7982
public function isDisplayedDataProvider()
8083
{
8184
return [

‎app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Export/AdvancedPricingTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ protected function setUp()
213213
'_getCustomerGroupById',
214214
'correctExportData'
215215
]);
216-
$this->advancedPricing = $this->getMockbuilder(
216+
$this->advancedPricing = $this->getMockBuilder(
217217
\Magento\AdvancedPricingImportExport\Model\Export\AdvancedPricing::class
218218
)
219219
->setMethods($mockMethods)

‎app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricing/Validator/TierPriceTest.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,9 @@ public function testIsValidAddMessagesCall($value, $hasEmptyColumns, $customerGr
181181
$this->tierPrice->isValid($value);
182182
}
183183

184+
/**
185+
* @return array
186+
*/
184187
public function isValidResultFalseDataProvider()
185188
{
186189
return [
@@ -286,6 +289,9 @@ public function isValidResultFalseDataProvider()
286289
];
287290
}
288291

292+
/**
293+
* @return array
294+
*/
289295
public function isValidAddMessagesCallDataProvider()
290296
{
291297
return [

‎app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricing/Validator/WebsiteTest.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,9 @@ public function testGetAllWebsitesValue()
114114
$this->assertEquals($expectedResult, $result);
115115
}
116116

117+
/**
118+
* @return array
119+
*/
117120
public function isValidReturnDataProvider()
118121
{
119122
return [

‎app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricing/ValidatorTest.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,9 @@ public function testInit()
7777
$this->validator->init(null);
7878
}
7979

80+
/**
81+
* @return array
82+
*/
8083
public function isValidDataProvider()
8184
{
8285
return [

‎app/code/Magento/AdvancedPricingImportExport/Test/Unit/Model/Import/AdvancedPricingTest.php

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -768,6 +768,9 @@ public function testSaveProductPrices($priceData, $oldSkus, $priceIn, $callNum)
768768
$this->invokeMethod($this->advancedPricing, 'saveProductPrices', [$priceData, 'table']);
769769
}
770770

771+
/**
772+
* @return array
773+
*/
771774
public function saveProductPricesDataProvider()
772775
{
773776
return [
@@ -839,6 +842,9 @@ public function testDeleteProductTierPrices(
839842
);
840843
}
841844

845+
/**
846+
* @return array
847+
*/
842848
public function deleteProductTierPricesDataProvider()
843849
{
844850
return [
@@ -921,6 +927,9 @@ public function testProcessCountExistingPrices(
921927
$this->invokeMethod($this->advancedPricing, 'processCountExistingPrices', [$prices, 'table']);
922928
}
923929

930+
/**
931+
* @return array
932+
*/
924933
public function processCountExistingPricesDataProvider()
925934
{
926935
return [

‎app/code/Magento/Analytics/Test/Unit/Block/Adminhtml/System/Config/AdditionalCommentTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,11 @@ public function testRender()
6565
->method('getLabel')
6666
->willReturn('Comment label');
6767
$html = $this->additionalComment->render($this->abstractElementMock);
68-
$this->assertRegexp(
68+
$this->assertRegExp(
6969
"/New comment/",
7070
$html
7171
);
72-
$this->assertRegexp(
72+
$this->assertRegExp(
7373
"/Comment label/",
7474
$html
7575
);

‎app/code/Magento/Analytics/Test/Unit/Block/Adminhtml/System/Config/CollectionTimeLabelTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public function testRender()
7373
$this->abstractElementMock->expects($this->any())
7474
->method('getComment')
7575
->willReturn('Eastern Standard Time (America/New_York)');
76-
$this->assertRegexp(
76+
$this->assertRegExp(
7777
"/Eastern Standard Time \(America\/New_York\)/",
7878
$this->collectionTimeLabel->render($this->abstractElementMock)
7979
);

0 commit comments

Comments
 (0)