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

Author: balex13

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
 {

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
-        );
-    }
 }

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
 {

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
 {

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
 {

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);

app/code/Magento/Authorization/Model/UserContextInterface.php

@@ -8,6 +8,8 @@
 
 /**
  * Interface for current user identification.
+ *
+ * @api
  */
 interface UserContextInterface
 {

app/code/Magento/Bundle/Block/Adminhtml/Sales/Order/Items/Renderer.php

@@ -10,6 +10,7 @@
 
 /**
  * Adminhtml sales order item renderer
+ * @api
  */
 class Renderer extends \Magento\Sales\Block\Adminhtml\Items\Renderer\DefaultRenderer
 {

app/code/Magento/Bundle/Block/Adminhtml/Sales/Order/View/Items/Renderer.php

@@ -10,6 +10,7 @@
 
 /**
  * Adminhtml sales order item renderer
+ * @api
  */
 class Renderer extends \Magento\Sales\Block\Adminhtml\Order\View\Items\Renderer\DefaultRenderer
 {

app/code/Magento/Bundle/Block/Catalog/Product/Price.php

@@ -7,7 +7,7 @@
 
 /**
  * Bundle product price block
- *
+ * @api
  */
 class Price extends \Magento\Catalog\Block\Product\Price
 {