Skip to content

Commit cae7e4f

Browse files
committed
Fixed unit and static tests
1 parent 0b0e952 commit cae7e4f

File tree

4 files changed

+17
-8
lines changed

4 files changed

+17
-8
lines changed

app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/CollectionTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,7 @@ public function testAddTierPriceDataByGroupId()
323323
[ '(customer_group_id=? AND all_groups=0) OR all_groups=1', $customerGroupId]
324324
)
325325
->willReturnSelf();
326-
$select->expects($this->once())->method('order')->with('entity_id')->willReturnSelf();
326+
$select->expects($this->once())->method('order')->with('qty')->willReturnSelf();
327327
$this->connectionMock->expects($this->once())
328328
->method('fetchAll')
329329
->with($select)
@@ -375,7 +375,7 @@ public function testAddTierPriceData()
375375
$select->expects($this->exactly(1))->method('where')
376376
->with('entity_id IN(?)', [1])
377377
->willReturnSelf();
378-
$select->expects($this->once())->method('order')->with('entity_id')->willReturnSelf();
378+
$select->expects($this->once())->method('order')->with('qty')->willReturnSelf();
379379
$this->connectionMock->expects($this->once())
380380
->method('fetchAll')
381381
->with($select)

app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Composite/Fieldset/Downloadable.php

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,11 @@
44
* See COPYING.txt for license details.
55
*/
66

7-
/**
8-
* Adminhtml block for fieldset of downloadable product
9-
*
10-
* @author Magento Core Team <core@magentocommerce.com>
11-
*/
127
namespace Magento\Downloadable\Block\Adminhtml\Catalog\Product\Composite\Fieldset;
138

149
/**
10+
* Adminhtml block for fieldset of downloadable product
11+
*
1512
* @api
1613
* @since 100.0.2
1714
* @deprecated

app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,8 @@ public function isHidden()
136136
}
137137

138138
/**
139+
* Get group code
140+
*
139141
* @return string
140142
*/
141143
public function getGroupCode()
@@ -154,6 +156,8 @@ public function getContentTabId()
154156
}
155157

156158
/**
159+
* Is downloadable
160+
*
157161
* @return bool
158162
*/
159163
public function isDownloadable()
@@ -162,7 +166,7 @@ public function isDownloadable()
162166
}
163167

164168
/**
165-
* @return $this
169+
* @inheritdoc
166170
*/
167171
protected function _prepareLayout()
168172
{

app/code/Magento/Downloadable/Block/Adminhtml/Catalog/Product/Edit/Tab/Downloadable/Links.php

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -437,6 +437,8 @@ public function getConfig()
437437
}
438438

439439
/**
440+
* Is single store mode
441+
*
440442
* @return bool
441443
*/
442444
public function isSingleStoreMode()
@@ -445,17 +447,23 @@ public function isSingleStoreMode()
445447
}
446448

447449
/**
450+
* Get base currency code
451+
*
448452
* @param null|string|bool|int|\Magento\Store\Model\Store $storeId $storeId
449453
* @return string
454+
* @throws \Magento\Framework\Exception\NoSuchEntityException
450455
*/
451456
public function getBaseCurrencyCode($storeId)
452457
{
453458
return $this->_storeManager->getStore($storeId)->getBaseCurrencyCode();
454459
}
455460

456461
/**
462+
* Get base currency symbol
463+
*
457464
* @param null|string|bool|int|\Magento\Store\Model\Store $storeId $storeId
458465
* @return string
466+
* @throws \Magento\Framework\Exception\NoSuchEntityException
459467
*/
460468
public function getBaseCurrencySymbol($storeId)
461469
{

0 commit comments

Comments
 (0)