Skip to content

Commit 73ed076

Browse files
🔃 [EngCom] Public Pull Requests - 2.1-develop
Accepted Public Pull Requests: - #16825: [Backport] Fixed type hints and docs for Downloadable Samples block (by @ronak2ram) - #16836: [Backport] Fixed typo in SynonymGroupRepositoryInterface (by @mage2pratik) - #16755: [backport] #16716 fix _utilities.less font-size issue (by @Karlasa)
2 parents 7d62c64 + 50980b1 commit 73ed076

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

app/code/Magento/Downloadable/Block/Catalog/Product/Samples.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88

99
namespace Magento\Downloadable\Block\Catalog\Product;
1010

11-
use Magento\Downloadable\Model\ResourceModel\Sample;
11+
use Magento\Downloadable\Model\ResourceModel\Sample\Collection as SampleCollection;
12+
use Magento\Downloadable\Api\Data\SampleInterface;
1213

1314
/**
1415
* Downloadable Product Samples part block
@@ -30,15 +31,15 @@ public function hasSamples()
3031
/**
3132
* Get downloadable product samples
3233
*
33-
* @return array
34+
* @return SampleCollection
3435
*/
3536
public function getSamples()
3637
{
3738
return $this->getProduct()->getTypeInstance()->getSamples($this->getProduct());
3839
}
3940

4041
/**
41-
* @param Sample $sample
42+
* @param SampleInterface $sample
4243
* @return string
4344
*/
4445
public function getSampleUrl($sample)

app/code/Magento/Search/Api/SynonymGroupRepositoryInterface.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public function save(\Magento\Search\Api\Data\SynonymGroupInterface $synonymGrou
2828
public function delete(\Magento\Search\Api\Data\SynonymGroupInterface $synonymGroup);
2929

3030
/**
31-
* Return a paritcular synonym group interface instance based on passed in synonym group id
31+
* Return a particular synonym group interface instance based on passed in synonym group id
3232
*
3333
* @param int $synonymGroupId
3434
* @return \Magento\Search\Api\Data\SynonymGroupInterface

lib/web/css/source/lib/_utilities.less

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -260,9 +260,8 @@
260260
@_line-height: normal
261261
) {
262262
.lib-font-size(@_font-size);
263-
font-size: @_font-size;
263+
.lib-line-height(@_line-height);
264264
letter-spacing: normal;
265-
line-height: @_line-height;
266265
}
267266

268267
//

0 commit comments

Comments
 (0)