Skip to content

Commit a5d057a

Browse files
author
Volodymyr klymenko
committed
Merge remote-tracking branch 'nord/develop' into MAGETWO-36918-version-tab
2 parents b39e901 + 5bf96e4 commit a5d057a

34 files changed

+771
-205
lines changed

app/code/Magento/Catalog/Block/Adminhtml/Rss/Grid/Link.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
/**
99
* Class Link
10-
* @package Magento\Review\Block\Adminhtml\Grid\Rss
1110
*/
1211
class Link extends \Magento\Framework\View\Element\Template
1312
{

app/code/Magento/Catalog/Test/Unit/Model/Template/Filter/FactoryTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class FactoryTest extends \PHPUnit_Framework_TestCase
1313
protected $_objectManagerMock;
1414

1515
/**
16-
* @var \Magento\Newsletter\Model\Template\Filter\Factory
16+
* @var \Magento\Catalog\Model\Template\Filter\Factory
1717
*/
1818
protected $_factory;
1919

app/code/Magento/CatalogInventory/Api/Data/StockCollectionInterface.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313

1414
/**
1515
* Interface StockCollectionInterface
16+
* @api
1617
*/
1718
interface StockCollectionInterface extends SearchResultsInterface
1819
{

app/code/Magento/CatalogInventory/Api/Data/StockInterface.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
/**
1111
* Interface Stock
12+
* @api
1213
*/
1314
interface StockInterface extends ExtensibleDataInterface
1415
{

app/code/Magento/CatalogInventory/Api/Data/StockItemCollectionInterface.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
/**
1515
* Interface StockItemCollectionInterface
16-
* @package Magento\CatalogInventory\Api\Data
16+
* @api
1717
*/
1818
interface StockItemCollectionInterface extends SearchResultsInterface
1919
{

app/code/Magento/CatalogInventory/Api/Data/StockItemInterface.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
/**
1111
* Interface StockItem
12+
* @api
1213
*/
1314
interface StockItemInterface extends ExtensibleDataInterface
1415
{

app/code/Magento/CatalogInventory/Api/Data/StockStatusCollectionInterface.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
/**
1111
* Stock Status collection interface
12+
* @api
1213
*/
1314
interface StockStatusCollectionInterface extends SearchResultsInterface
1415
{

app/code/Magento/CatalogInventory/Api/Data/StockStatusInterface.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
/**
1111
* Interface StockStatusInterface
12+
* @api
1213
*/
1314
interface StockStatusInterface extends ExtensibleDataInterface
1415
{

app/code/Magento/CatalogInventory/Api/StockConfigurationInterface.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
/**
99
* Interface StockConfigurationInterface
10+
* @api
1011
*/
1112
interface StockConfigurationInterface
1213
{

app/code/Magento/CatalogInventory/Api/StockCriteriaInterface.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
/**
99
* Interface StockCriteriaInterface
10+
* @api
1011
*/
1112
interface StockCriteriaInterface extends \Magento\Framework\Api\CriteriaInterface
1213
{

0 commit comments

Comments
 (0)