Merge remote-tracking branch 'mainline/develop' into MAGETWO-66727

Author: mslabko

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

@@ -116,6 +116,7 @@ class Category extends \Magento\Catalog\Model\AbstractModel implements
      * URL rewrite model
      *
      * @var \Magento\UrlRewrite\Model\UrlRewrite
+     * @deprecated since 2.2.0
      */
     protected $_urlRewrite;
 

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

@@ -5,8 +5,6 @@
  */
 namespace Magento\CatalogUrlRewrite\Model\Map;
 
-use Magento\Framework\DB\Select;
-
 /**
  * Interface for a mysql data type of a map
  *

app/code/Magento/Checkout/Block/Checkout/LayoutProcessorInterface.php

@@ -5,6 +5,15 @@
  */
 namespace Magento\Checkout\Block\Checkout;
 
+/**
+ * Layout processor interface.
+ *
+ * Can be used to provide a custom logic for checkout JS layout preparation.
+ *
+ * @see \Magento\Checkout\Block\Onepage
+ *
+ * @api
+ */
 interface LayoutProcessorInterface
 {
     /**

app/code/Magento/Checkout/CustomerData/AbstractItem.php

@@ -10,6 +10,8 @@
 
 /**
  * Abstract item
+ *
+ * @api
  */
 abstract class AbstractItem implements ItemInterface
 {

app/code/Magento/Checkout/CustomerData/ItemInterface.php

@@ -10,6 +10,8 @@
 
 /**
  * Item interface
+ *
+ * @api
  */
 interface ItemInterface
 {

app/code/Magento/Checkout/Model/Cart/ImageProvider.php

@@ -7,6 +7,7 @@
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ * @api
  */
 class ImageProvider
 {

app/code/Magento/Checkout/Model/Cart/RequestInfoFilterComposite.php

@@ -8,6 +8,7 @@
 
 /**
  * Class RequestInfoFilterComposite
+ * @api
  */
 class RequestInfoFilterComposite implements RequestInfoFilterInterface
 {

app/code/Magento/Checkout/Model/Cart/RequestInfoFilterInterface.php

@@ -8,6 +8,7 @@
 
 /**
  * Interface RequestInfoFilterInterface used by composite and leafs to implement filtering
+ * @api
  */
 interface RequestInfoFilterInterface
 {

app/code/Magento/Checkout/Model/CompositeConfigProvider.php

@@ -5,6 +5,12 @@
  */
 namespace Magento\Checkout\Model;
 
+/**
+ * Composite checkout configuration provider.
+ *
+ * @see \Magento\Checkout\Model\ConfigProviderInterface
+ * @api
+ */
 class CompositeConfigProvider implements ConfigProviderInterface
 {
     /**

app/code/Magento/Checkout/Model/Layout/AbstractTotalsProcessor.php

@@ -7,6 +7,14 @@
 
 use Magento\Framework\App\Config\ScopeConfigInterface;
 
+/**
+ * Abstract totals processor.
+ *
+ * Can be used to process totals information that will be rendered during checkout.
+ * Abstract class provides sorting routing to sort total information based on configuration settings.
+ *
+ * @api
+ */
 abstract class AbstractTotalsProcessor
 {
     /**