Merge branch 'develop' of github.com:magento/magento2ce into MAGETWO-…

…65470
magento · Apr 21, 2017 · 8c82105 · 8c82105
2 parents 3a4ba13 + c2af247
commit 8c82105
Show file tree

Hide file tree

Showing 345 changed files with 1,289 additions and 357 deletions.
diff --git a/app/code/Magento/Authorization/Model/CompositeUserContext.php b/app/code/Magento/Authorization/Model/CompositeUserContext.php
@@ -9,7 +9,12 @@
 use Magento\Framework\ObjectManager\Helper\Composite as CompositeHelper;
 
 /**
- * Composite user context (implements composite pattern).
+ * User context.
+ *
+ * This class is not implementing standard composite pattern and will not invoke all of its children.
+ * Instead, it will try to find the first suitable child and return its result.
+ *
+ * @api
  */
 class CompositeUserContext implements \Magento\Authorization\Model\UserContextInterface
 {

diff --git a/app/code/Magento/Authorization/Model/ResourceModel/Permissions/Collection.php b/app/code/Magento/Authorization/Model/ResourceModel/Permissions/Collection.php
@@ -8,20 +8,9 @@
 /**
  * Admin permissions collection
  *
- * @author      Magento Core Team <core@magentocommerce.com>
+ * @deprecated
+ * @see \Magento\Authorization\Model\ResourceModel\Rules\Collection
  */
-class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
+class Collection extends \Magento\Authorization\Model\ResourceModel\Rules\Collection
 {
-    /**
-     * Initialize resource
-     *
-     * @return void
-     */
-    protected function _construct()
-    {
-        $this->_init(
-            \Magento\Authorization\Model\Rules::class,
-            \Magento\Authorization\Model\ResourceModel\Rules::class
-        );
-    }
 }
diff --git a/app/code/Magento/Authorization/Model/ResourceModel/Role/Collection.php b/app/code/Magento/Authorization/Model/ResourceModel/Role/Collection.php
@@ -9,6 +9,8 @@
 
 /**
  * Admin role collection
+ *
+ * @api
  */
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
 {

diff --git a/app/code/Magento/Authorization/Model/ResourceModel/Rules/Collection.php b/app/code/Magento/Authorization/Model/ResourceModel/Rules/Collection.php
@@ -8,7 +8,7 @@
 /**
  * Rules collection
  *
- * @author      Magento Core Team <core@magentocommerce.com>
+ * @api
  */
 class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
 {

diff --git a/app/code/Magento/Authorization/Model/Role.php b/app/code/Magento/Authorization/Model/Role.php
@@ -24,6 +24,7 @@
  * @method \Magento\Authorization\Model\Role setUserType(string $value)
  * @method string getRoleName()
  * @method \Magento\Authorization\Model\Role setRoleName(string $value)
+ * @api
  */
 class Role extends \Magento\Framework\Model\AbstractModel
 {

diff --git a/app/code/Magento/Authorization/Model/Rules.php b/app/code/Magento/Authorization/Model/Rules.php
@@ -21,6 +21,7 @@
  * @method \Magento\Authorization\Model\Rules setAssertId(int $value)
  * @method string getPermission()
  * @method \Magento\Authorization\Model\Rules setPermission(string $value)
+ * @api
  */
 class Rules extends \Magento\Framework\Model\AbstractModel
 {
@@ -30,14 +31,14 @@ class Rules extends \Magento\Framework\Model\AbstractModel
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Registry $registry
      * @param \Magento\Authorization\Model\ResourceModel\Rules $resource
-     * @param \Magento\Authorization\Model\ResourceModel\Permissions\Collection $resourceCollection
+     * @param \Magento\Authorization\Model\ResourceModel\Rules\Collection $resourceCollection
      * @param array $data
      */
     public function __construct(
         \Magento\Framework\Model\Context $context,
         \Magento\Framework\Registry $registry,
         \Magento\Authorization\Model\ResourceModel\Rules $resource,
-        \Magento\Authorization\Model\ResourceModel\Permissions\Collection $resourceCollection,
+        \Magento\Authorization\Model\ResourceModel\Rules\Collection $resourceCollection,
         array $data = []
     ) {
         parent::__construct($context, $registry, $resource, $resourceCollection, $data);

diff --git a/app/code/Magento/Authorization/Model/UserContextInterface.php b/app/code/Magento/Authorization/Model/UserContextInterface.php
@@ -8,6 +8,8 @@
 
 /**
  * Interface for current user identification.
+ *
+ * @api
  */
 interface UserContextInterface
 {

diff --git a/app/code/Magento/Captcha/Block/Adminhtml/Captcha/DefaultCaptcha.php b/app/code/Magento/Captcha/Block/Adminhtml/Captcha/DefaultCaptcha.php
@@ -4,13 +4,11 @@
  * See COPYING.txt for license details.
  */
 
+namespace Magento\Captcha\Block\Adminhtml\Captcha;
+
 /**
  * Captcha block for adminhtml area
- *
- * @author     Magento Core Team <core@magentocommerce.com>
  */
-namespace Magento\Captcha\Block\Adminhtml\Captcha;
-
 class DefaultCaptcha extends \Magento\Captcha\Block\Captcha\DefaultCaptcha
 {
     /**

diff --git a/app/code/Magento/Captcha/Block/Captcha/DefaultCaptcha.php b/app/code/Magento/Captcha/Block/Captcha/DefaultCaptcha.php
@@ -7,8 +7,6 @@
 
 /**
  * Captcha block
- *
- * @author     Magento Core Team <core@magentocommerce.com>
  */
 class DefaultCaptcha extends \Magento\Framework\View\Element\Template
 {

diff --git a/app/code/Magento/Captcha/Helper/Data.php b/app/code/Magento/Captcha/Helper/Data.php
@@ -11,6 +11,8 @@
 
 /**
  * Captcha image model
+ *
+ * @api
  */
 class Data extends \Magento\Framework\App\Helper\AbstractHelper
 {

diff --git a/app/code/Magento/Captcha/Model/DefaultModel.php b/app/code/Magento/Captcha/Model/DefaultModel.php
@@ -8,7 +8,7 @@
 /**
  * Implementation of \Zend\Captcha\Image
  *
- * @author     Magento Core Team <core@magentocommerce.com>
+ * @api
  */
 class DefaultModel extends \Zend\Captcha\Image implements \Magento\Captcha\Model\CaptchaInterface
 {

diff --git a/app/code/Magento/Captcha/view/frontend/web/captcha.js b/app/code/Magento/Captcha/view/frontend/web/captcha.js
@@ -9,6 +9,9 @@ define([
 ], function ($) {
     'use strict';
 
+    /**
+     * @api
+     */
     $.widget('mage.captcha', {
         options: {
             refreshClass: 'refreshing',
@@ -26,7 +29,7 @@ define([
         },
 
         /**
-         * Method triggeres an AJAX request to refresh the CAPTCHA image
+         * Method triggers an AJAX request to refresh the CAPTCHA image
          */
         refresh: function () {
             var imageLoader = this.options.imageLoader;

diff --git a/app/code/Magento/Catalog/Block/ShortcutButtons.php b/app/code/Magento/Catalog/Block/ShortcutButtons.php
@@ -7,6 +7,13 @@
 
 use Magento\Framework\View\Element\Template;
 
+/**
+ * Shortcuts container
+ *
+ * Accepts shortcuts on shortcut_buttons_container event and render shortcuts using custom order
+ *
+ * @api
+ */
 class ShortcutButtons extends Template
 {
     /**#@+

diff --git a/app/code/Magento/Catalog/Block/ShortcutInterface.php b/app/code/Magento/Catalog/Block/ShortcutInterface.php
@@ -5,6 +5,11 @@
  */
 namespace Magento\Catalog\Block;
 
+/**
+ * Shortcut block interface
+ *
+ * @api
+ */
 interface ShortcutInterface
 {
     /**

diff --git a/app/code/Magento/Catalog/Helper/Data.php b/app/code/Magento/Catalog/Helper/Data.php
@@ -15,6 +15,9 @@
 
 /**
  * Catalog data helper
+ *
+ * @api
+ *
  * @SuppressWarnings(PHPMD.TooManyFields)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */

diff --git a/app/code/Magento/Catalog/Helper/Image.php b/app/code/Magento/Catalog/Helper/Image.php
@@ -9,6 +9,8 @@
 
 /**
  * Catalog image helper
+ *
+ * @api
  * @SuppressWarnings(PHPMD.TooManyFields)
  */
 class Image extends AbstractHelper

diff --git a/app/code/Magento/Catalog/Helper/Product/Compare.php b/app/code/Magento/Catalog/Helper/Product/Compare.php
@@ -11,6 +11,8 @@
 /**
  * Catalog Product Compare Helper
  *
+ * @api
+ *
  * @SuppressWarnings(PHPMD.LongVariable)
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */

diff --git a/app/code/Magento/Catalog/Helper/Product/Composite.php b/app/code/Magento/Catalog/Helper/Product/Composite.php
@@ -17,6 +17,8 @@
 /**
  * Adminhtml catalog product composite helper
  *
+ * @api
+ *
  * @author     Magento Core Team <core@magentocommerce.com>
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */

diff --git a/app/code/Magento/Catalog/Helper/Product/Configuration/ConfigurationInterface.php b/app/code/Magento/Catalog/Helper/Product/Configuration/ConfigurationInterface.php
@@ -8,6 +8,8 @@
 
 /**
  * Interface for product configuration helpers
+ *
+ * @api
  */
 interface ConfigurationInterface
 {

diff --git a/app/code/Magento/Catalog/Helper/Product/ConfigurationPool.php b/app/code/Magento/Catalog/Helper/Product/ConfigurationPool.php
@@ -5,6 +5,9 @@
  */
 namespace Magento\Catalog\Helper\Product;
 
+/**
+ * @api
+ */
 class ConfigurationPool
 {
     /**

diff --git a/app/code/Magento/Catalog/Helper/Product/ProductList.php b/app/code/Magento/Catalog/Helper/Product/ProductList.php
@@ -10,6 +10,8 @@
 
 /**
  * Class ProductList
+ *
+ * @api
  */
 class ProductList
 {

diff --git a/app/code/Magento/Catalog/Model/Attribute/Backend/Customlayoutupdate.php b/app/code/Magento/Catalog/Model/Attribute/Backend/Customlayoutupdate.php
@@ -9,7 +9,9 @@
 use Magento\Eav\Model\Entity\Attribute\Exception;
 
 /**
- * Product url key attribute backend
+ * Layout update attribute backend
+ *
+ * @api
  *
  * @SuppressWarnings(PHPMD.LongVariable)
  */

diff --git a/app/code/Magento/Catalog/Model/Attribute/Backend/Startdate.php b/app/code/Magento/Catalog/Model/Attribute/Backend/Startdate.php
@@ -9,6 +9,8 @@
  *
  * Speical Start Date attribute backend
  *
+ * @api
+ *
  * @author      Magento Core Team <core@magentocommerce.com>
  */
 class Startdate extends \Magento\Eav\Model\Entity\Attribute\Backend\Datetime

diff --git a/app/code/Magento/Catalog/Model/Category/Attribute/Backend/Image.php b/app/code/Magento/Catalog/Model/Category/Attribute/Backend/Image.php
@@ -7,6 +7,8 @@
 /**
  * Catalog category image attribute backend model
  *
+ * @api
+ *
  * @author      Magento Core Team <core@magentocommerce.com>
  */
 namespace Magento\Catalog\Model\Category\Attribute\Backend;

diff --git a/app/code/Magento/Catalog/Model/Category/Attribute/Backend/Sortby.php b/app/code/Magento/Catalog/Model/Category/Attribute/Backend/Sortby.php
@@ -8,6 +8,8 @@
 /**
  * Catalog Category Attribute Default and Available Sort By Backend Model
  *
+ * @api
+ *
  * @author     Magento Core Team <core@magentocommerce.com>
  */
 class Sortby extends \Magento\Eav\Model\Entity\Attribute\Backend\AbstractBackend

diff --git a/app/code/Magento/Catalog/Model/Category/DataProvider.php b/app/code/Magento/Catalog/Model/Category/DataProvider.php
@@ -28,6 +28,8 @@
 /**
  * Class DataProvider
  *
+ * @api
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class DataProvider extends \Magento\Ui\DataProvider\AbstractDataProvider

diff --git a/app/code/Magento/Catalog/Model/Design.php b/app/code/Magento/Catalog/Model/Design.php
@@ -8,6 +8,8 @@
 /**
  * Catalog Custom Category design Model
  *
+ * @api
+ *
  * @author     Magento Core Team <core@magentocommerce.com>
  */
 class Design extends \Magento\Framework\Model\AbstractModel

diff --git a/app/code/Magento/Catalog/Model/Indexer/AbstractFlatState.php b/app/code/Magento/Catalog/Model/Indexer/AbstractFlatState.php
@@ -7,6 +7,9 @@
 
 use Magento\Store\Model\ScopeInterface;
 
+/**
+ * @api
+ */
 abstract class AbstractFlatState
 {
     /**

diff --git a/app/code/Magento/Catalog/Model/Indexer/Category/Flat.php b/app/code/Magento/Catalog/Model/Indexer/Category/Flat.php
@@ -7,6 +7,11 @@
 
 use Magento\Framework\Indexer\CacheContext;
 
+/**
+ * Category flat indexer
+ *
+ * @api
+ */
 class Flat implements \Magento\Framework\Indexer\ActionInterface, \Magento\Framework\Mview\ActionInterface
 {
     /**

diff --git a/app/code/Magento/Catalog/Model/Indexer/Category/Flat/SkipStaticColumnsProvider.php b/app/code/Magento/Catalog/Model/Indexer/Category/Flat/SkipStaticColumnsProvider.php
@@ -6,6 +6,11 @@
 
 namespace Magento\Catalog\Model\Indexer\Category\Flat;
 
+/**
+ * Static columns provider
+ *
+ * @api
+ */
 class SkipStaticColumnsProvider
 {
     /**

diff --git a/app/code/Magento/Catalog/Model/Indexer/Category/Flat/State.php b/app/code/Magento/Catalog/Model/Indexer/Category/Flat/State.php
@@ -5,6 +5,9 @@
  */
 namespace Magento\Catalog\Model\Indexer\Category\Flat;
 
+/**
+ * @api
+ */
 class State extends \Magento\Catalog\Model\Indexer\AbstractFlatState
 {
     /**

diff --git a/app/code/Magento/Catalog/Model/Indexer/Category/Product.php b/app/code/Magento/Catalog/Model/Indexer/Category/Product.php
@@ -7,6 +7,11 @@
 
 use Magento\Framework\Indexer\CacheContext;
 
+/**
+ * Category product indexer
+ *
+ * @api
+ */
 class Product implements \Magento\Framework\Indexer\ActionInterface, \Magento\Framework\Mview\ActionInterface
 {
     /**

diff --git a/app/code/Magento/Catalog/Model/Indexer/Category/Product/AbstractAction.php b/app/code/Magento/Catalog/Model/Indexer/Category/Product/AbstractAction.php
@@ -15,6 +15,9 @@
 
 /**
  * Class AbstractAction
+ *
+ * @api
+ *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 abstract class AbstractAction

diff --git a/app/code/Magento/Catalog/Model/Indexer/Category/Product/Processor.php b/app/code/Magento/Catalog/Model/Indexer/Category/Product/Processor.php
@@ -5,6 +5,11 @@
  */
 namespace Magento\Catalog\Model\Indexer\Category\Product;
 
+/**
+ * Category product link indexer
+ *
+ * @api
+ */
 class Processor extends \Magento\Framework\Indexer\AbstractProcessor
 {
     /**

diff --git a/app/code/Magento/Catalog/Model/Indexer/Product/Category.php b/app/code/Magento/Catalog/Model/Indexer/Product/Category.php
@@ -5,6 +5,9 @@
  */
 namespace Magento\Catalog\Model\Indexer\Product;
 
+/**
+ * @api
+ */
 class Category extends \Magento\Catalog\Model\Indexer\Category\Product
 {
     /**