Skip to content

Commit c3c84dd

Browse files
Merge branch 'develop' of github.com:magento/magento2ce into PR-7
2 parents 5c18f72 + 45dce69 commit c3c84dd

File tree

104 files changed

+893
-143
lines changed

Some content is hidden

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

104 files changed

+893
-143
lines changed

app/code/Magento/Catalog/Model/Category.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@ class Category extends \Magento\Catalog\Model\AbstractModel implements
116116
* URL rewrite model
117117
*
118118
* @var \Magento\UrlRewrite\Model\UrlRewrite
119+
* @deprecated since 2.2.0
119120
*/
120121
protected $_urlRewrite;
121122

app/code/Magento/CatalogUrlRewrite/Model/Map/DatabaseMapInterface.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
*/
66
namespace Magento\CatalogUrlRewrite\Model\Map;
77

8-
use Magento\Framework\DB\Select;
9-
108
/**
119
* Interface for a mysql data type of a map
1210
*

app/code/Magento/Contact/Helper/Data.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@
1414

1515
/**
1616
* Contact base helper
17+
*
18+
* @deprecated
19+
* @see \Magento\Contact\Model\ConfigInterface
1720
*/
1821
class Data extends \Magento\Framework\App\Helper\AbstractHelper
1922
{

app/code/Magento/Customer/CustomerData/JsLayoutDataProviderInterface.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88

99
/**
1010
* Js layout data provider interface
11+
*
12+
* @api
1113
*/
1214
interface JsLayoutDataProviderInterface
1315
{

app/code/Magento/Customer/CustomerData/JsLayoutDataProviderPool.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88

99
/**
1010
* Js layout data provider pool
11+
*
12+
* @api
1113
*/
1214
class JsLayoutDataProviderPool implements JsLayoutDataProviderPoolInterface
1315
{

app/code/Magento/Customer/CustomerData/SectionPool.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010

1111
/**
1212
* Section pool
13+
*
14+
* @api
1315
*/
1416
class SectionPool implements SectionPoolInterface
1517
{

app/code/Magento/Customer/CustomerData/SectionSourceInterface.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77

88
/**
99
* Section source interface
10+
*
11+
* @api Use to define data sections in customer data which are transported from backend to frontend local storage
1012
*/
1113
interface SectionSourceInterface
1214
{

app/code/Magento/Customer/Model/Address/AbstractAddress.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@
3030
* @method string getPostcode()
3131
* @method bool getShouldIgnoreValidation()
3232
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
33+
*
34+
* @api
3335
*/
3436
class AbstractAddress extends AbstractExtensibleModel implements AddressModelInterface
3537
{

app/code/Magento/Customer/Model/Address/AddressModelInterface.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88

99
/**
1010
* Interface AddressInterface
11+
*
12+
* @api
1113
*/
1214
interface AddressModelInterface
1315
{

app/code/Magento/Customer/Model/Address/CustomAttributeListInterface.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
*/
66
namespace Magento\Customer\Model\Address;
77

8+
/**
9+
* @api
10+
*/
811
interface CustomAttributeListInterface
912
{
1013
/**

0 commit comments

Comments
 (0)