Skip to content

Commit 65cceab

Browse files
author
Stanislav Idolov
authored
🔃 [EngCom] Public Pull Requests - 2.1-develop
Accepted Public Pull Requests: - #16359: [Backport] array_push(...) calls behaving as '$array[] = ...', $array[] = works faster than invoking functions in PHP (by @lfluvisotto) - #16366: [Backport] PHPDoc (by @lfluvisotto) - #16347: [Backport 2.1] Captcha: Added integration test for checking admin login attempts cleanup (by @rogyar)
2 parents c20946e + a5d68a5 commit 65cceab

File tree

583 files changed

+3056
-39
lines changed

Some content is hidden

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

583 files changed

+3056
-39
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->getMock('stdClass', ['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->getMock('stdClass', ['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
@@ -69,6 +69,9 @@ public function testIsDisplayed($expectedFirstRun, $data)
6969
$this->assertEquals($expectedFirstRun, $model->isDisplayed());
7070
}
7171

72+
/**
73+
* @return array
74+
*/
7275
public function isDisplayedDataProvider()
7376
{
7477
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
@@ -79,6 +79,9 @@ public function testIsDisplayed($expectedResult, $cached, $response)
7979
$this->assertEquals($expectedResult, $this->_messageModel->isDisplayed());
8080
}
8181

82+
/**
83+
* @return array
84+
*/
8285
public function isDisplayedDataProvider()
8386
{
8487
return [

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
@@ -198,6 +198,9 @@ public function testIsValidAddMessagesCall($value, $hasEmptyColumns, $customerGr
198198
$this->tierPrice->isValid($value);
199199
}
200200

201+
/**
202+
* @return array
203+
*/
201204
public function isValidResultFalseDataProvider()
202205
{
203206
return [
@@ -303,6 +306,9 @@ public function isValidResultFalseDataProvider()
303306
];
304307
}
305308

309+
/**
310+
* @return array
311+
*/
306312
public function isValidAddMessagesCallDataProvider()
307313
{
308314
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
@@ -127,6 +127,9 @@ public function testGetAllWebsitesValue()
127127
$this->assertEquals($expectedResult, $result);
128128
}
129129

130+
/**
131+
* @return array
132+
*/
130133
public function isValidReturnDataProvider()
131134
{
132135
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
@@ -76,6 +76,9 @@ public function testInit()
7676
$this->validator->init(null);
7777
}
7878

79+
/**
80+
* @return array
81+
*/
7982
public function isValidDataProvider()
8083
{
8184
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
@@ -751,6 +751,9 @@ public function testSaveProductPrices($priceData, $oldSkus, $priceIn, $callNum)
751751
$this->invokeMethod($this->advancedPricing, 'saveProductPrices', [$priceData, 'table']);
752752
}
753753

754+
/**
755+
* @return array
756+
*/
754757
public function saveProductPricesDataProvider()
755758
{
756759
return [
@@ -822,6 +825,9 @@ public function testDeleteProductTierPrices(
822825
);
823826
}
824827

828+
/**
829+
* @return array
830+
*/
825831
public function deleteProductTierPricesDataProvider()
826832
{
827833
return [
@@ -904,6 +910,9 @@ public function testProcessCountExistingPrices(
904910
$this->invokeMethod($this->advancedPricing, 'processCountExistingPrices', [$prices, 'table']);
905911
}
906912

913+
/**
914+
* @return array
915+
*/
907916
public function processCountExistingPricesDataProvider()
908917
{
909918
return [

app/code/Magento/Authorization/Test/Unit/Model/Acl/AclRetrieverTest.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,9 @@ public function testGetAllowedResourcesByUser()
7575
);
7676
}
7777

78+
/**
79+
* @return AclRetriever
80+
*/
7881
protected function createAclRetriever()
7982
{
8083
$this->roleMock = $this->getMock(

app/code/Magento/Authorizenet/Test/Unit/Model/Directpost/ResponseTest.php

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,9 @@ public function testGenerateHash($merchantMd5, $merchantApiLogin, $amount, $amou
3737
);
3838
}
3939

40+
/**
41+
* @return array
42+
*/
4043
public function generateHashDataProvider()
4144
{
4245
return [
@@ -57,6 +60,13 @@ public function generateHashDataProvider()
5760
];
5861
}
5962

63+
/**
64+
* @param $merchantMd5
65+
* @param $merchantApiLogin
66+
* @param $amount
67+
* @param $transactionId
68+
* @return string
69+
*/
6070
protected function generateHash($merchantMd5, $merchantApiLogin, $amount, $transactionId)
6171
{
6272
return strtoupper(md5($merchantMd5 . $merchantApiLogin . $transactionId . $amount));

app/code/Magento/Backend/Model/Config/SessionLifetime/BackendModel.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@ class BackendModel extends Value
1919
/** Minimum admin session lifetime */
2020
const MIN_LIFETIME = 60;
2121

22+
/**
23+
* @return Value
24+
* @throws LocalizedException
25+
*/
2226
public function beforeSave()
2327
{
2428
$value = (int) $this->getValue();

0 commit comments

Comments
 (0)