Skip to content

Commit b290cfd

Browse files
author
olysenko
committed
Merge remote-tracking branch 'mainline/develop' into MAGETWO-67477
2 parents f135146 + c3040d3 commit b290cfd

File tree

317 files changed

+1425
-522
lines changed

Some content is hidden

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

317 files changed

+1425
-522
lines changed

‎app/code/Magento/Authorization/Model/CompositeUserContext.php

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,12 @@
99
use Magento\Framework\ObjectManager\Helper\Composite as CompositeHelper;
1010

1111
/**
12-
* Composite user context (implements composite pattern).
12+
* User context.
13+
*
14+
* This class is not implementing standard composite pattern and will not invoke all of its children.
15+
* Instead, it will try to find the first suitable child and return its result.
16+
*
17+
* @api
1318
*/
1419
class CompositeUserContext implements \Magento\Authorization\Model\UserContextInterface
1520
{

‎app/code/Magento/Authorization/Model/ResourceModel/Permissions/Collection.php

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,9 @@
88
/**
99
* Admin permissions collection
1010
*
11-
* @author Magento Core Team <[email protected]>
11+
* @deprecated
12+
* @see \Magento\Authorization\Model\ResourceModel\Rules\Collection
1213
*/
13-
class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
14+
class Collection extends \Magento\Authorization\Model\ResourceModel\Rules\Collection
1415
{
15-
/**
16-
* Initialize resource
17-
*
18-
* @return void
19-
*/
20-
protected function _construct()
21-
{
22-
$this->_init(
23-
\Magento\Authorization\Model\Rules::class,
24-
\Magento\Authorization\Model\ResourceModel\Rules::class
25-
);
26-
}
2716
}

‎app/code/Magento/Authorization/Model/ResourceModel/Role/Collection.php

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

1010
/**
1111
* Admin role collection
12+
*
13+
* @api
1214
*/
1315
class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
1416
{

‎app/code/Magento/Authorization/Model/ResourceModel/Rules/Collection.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
/**
99
* Rules collection
1010
*
11-
* @author Magento Core Team <[email protected]>
11+
* @api
1212
*/
1313
class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
1414
{

‎app/code/Magento/Authorization/Model/Role.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
* @method \Magento\Authorization\Model\Role setUserType(string $value)
2525
* @method string getRoleName()
2626
* @method \Magento\Authorization\Model\Role setRoleName(string $value)
27+
* @api
2728
*/
2829
class Role extends \Magento\Framework\Model\AbstractModel
2930
{

‎app/code/Magento/Authorization/Model/Rules.php

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
* @method \Magento\Authorization\Model\Rules setAssertId(int $value)
2222
* @method string getPermission()
2323
* @method \Magento\Authorization\Model\Rules setPermission(string $value)
24+
* @api
2425
*/
2526
class Rules extends \Magento\Framework\Model\AbstractModel
2627
{
@@ -30,14 +31,14 @@ class Rules extends \Magento\Framework\Model\AbstractModel
3031
* @param \Magento\Framework\Model\Context $context
3132
* @param \Magento\Framework\Registry $registry
3233
* @param \Magento\Authorization\Model\ResourceModel\Rules $resource
33-
* @param \Magento\Authorization\Model\ResourceModel\Permissions\Collection $resourceCollection
34+
* @param \Magento\Authorization\Model\ResourceModel\Rules\Collection $resourceCollection
3435
* @param array $data
3536
*/
3637
public function __construct(
3738
\Magento\Framework\Model\Context $context,
3839
\Magento\Framework\Registry $registry,
3940
\Magento\Authorization\Model\ResourceModel\Rules $resource,
40-
\Magento\Authorization\Model\ResourceModel\Permissions\Collection $resourceCollection,
41+
\Magento\Authorization\Model\ResourceModel\Rules\Collection $resourceCollection,
4142
array $data = []
4243
) {
4344
parent::__construct($context, $registry, $resource, $resourceCollection, $data);

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

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

99
/**
1010
* Interface for current user identification.
11+
*
12+
* @api
1113
*/
1214
interface UserContextInterface
1315
{

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

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

1111
/**
1212
* Adminhtml sales order item renderer
13+
* @api
1314
*/
1415
class Renderer extends \Magento\Sales\Block\Adminhtml\Items\Renderer\DefaultRenderer
1516
{

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

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

1111
/**
1212
* Adminhtml sales order item renderer
13+
* @api
1314
*/
1415
class Renderer extends \Magento\Sales\Block\Adminhtml\Order\View\Items\Renderer\DefaultRenderer
1516
{

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

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

88
/**
99
* Bundle product price block
10-
*
10+
* @api
1111
*/
1212
class Price extends \Magento\Catalog\Block\Product\Price
1313
{

‎app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
* Catalog bundle product info block
1313
*
1414
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
15+
* @api
1516
*/
1617
class Bundle extends \Magento\Catalog\Block\Product\View\AbstractView
1718
{

‎app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php

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

1111
/**
1212
* Bundle option renderer
13+
* @api
1314
*/
1415
class Option extends \Magento\Bundle\Block\Catalog\Product\Price
1516
{

‎app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Checkbox.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
/**
99
* Bundle option checkbox type renderer
1010
*
11-
* @author Magento Core Team <[email protected]>
11+
* @api
1212
*/
1313
class Checkbox extends \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option
1414
{

‎app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Multi.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
/**
99
* Bundle option multi select type renderer
1010
*
11-
* @author Magento Core Team <[email protected]>
11+
* @api
1212
*/
1313
class Multi extends \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option
1414
{

‎app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Radio.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
/**
99
* Bundle option radiobox type renderer
1010
*
11-
* @author Magento Core Team <[email protected]>
11+
* @api
1212
*/
1313
class Radio extends \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option
1414
{

‎app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Select.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
/**
99
* Bundle option dropdown type renderer
1010
*
11-
* @author Magento Core Team <[email protected]>
11+
* @api
1212
*/
1313
class Select extends \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Option
1414
{

‎app/code/Magento/Bundle/Block/Checkout/Cart/Item/Renderer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
/**
1313
* Shopping cart item render block
1414
*
15-
* @author Magento Core Team <[email protected]>
15+
* @api
1616
*/
1717
class Renderer extends \Magento\Checkout\Block\Cart\Item\Renderer
1818
{

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@
1010

1111
/**
1212
* Order item render block
13-
*
14-
* @author Magento Core Team <[email protected]>
13+
* @api
1514
*/
1615
class Renderer extends \Magento\Sales\Block\Order\Item\Renderer\DefaultRenderer
1716
{

‎app/code/Magento/Bundle/Helper/Catalog/Product/Configuration.php

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

1212
/**
1313
* Helper for fetching properties by product configuration item
14+
* @api
1415
*/
1516
class Configuration extends AbstractHelper implements ConfigurationInterface
1617
{

‎app/code/Magento/Bundle/Model/Product/Attribute/Source/Price/View.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
/**
1212
* Bundle Price View Attribute Renderer
1313
*
14-
* @author Magento Core Team <[email protected]>
14+
* @api
1515
*/
1616
class View extends \Magento\Eav\Model\Entity\Attribute\Source\AbstractSource
1717
{

‎app/code/Magento/Bundle/Model/Product/Attribute/Source/Shipment/Type.php

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

88
/**
99
* Bundle Shipment Type Attribute Renderer
10+
* @api
1011
*/
1112
class Type extends \Magento\Eav\Model\Entity\Attribute\Source\AbstractSource
1213
{

‎app/code/Magento/Bundle/Model/Product/Price.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
/**
1313
* Bundle Price Model
1414
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
15+
* @api
1516
*/
1617
class Price extends \Magento\Catalog\Model\Product\Type\Price
1718
{

‎app/code/Magento/Bundle/Model/Product/Type.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
* @SuppressWarnings(PHPMD.TooManyFields)
1818
* @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
1919
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
20+
* @api
2021
*/
2122
class Type extends \Magento\Catalog\Model\Product\Type\AbstractType
2223
{

‎app/code/Magento/Bundle/Model/ResourceModel/Bundle.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
/**
99
* Bundle Resource Model
1010
*
11-
* @author Magento Core Team <[email protected]>
11+
* @api
1212
*/
1313
class Bundle extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
1414
{

‎app/code/Magento/Bundle/Model/ResourceModel/Option.php

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

1212
/**
1313
* Bundle Option Resource Model
14-
*
15-
* @author Magento Core Team <[email protected]>
1614
*/
1715
class Option extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
1816
{

‎app/code/Magento/Bundle/Model/ResourceModel/Option/Collection.php

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

88
/**
99
* Bundle Options Resource Collection
10+
* @api
1011
*/
1112
class Collection extends \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection
1213
{

‎app/code/Magento/Bundle/Model/ResourceModel/Selection.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
/**
1313
* Bundle Selection Resource Model
1414
*
15-
* @author Magento Core Team <[email protected]>
15+
* @api
1616
*/
1717
class Selection extends \Magento\Framework\Model\ResourceModel\Db\AbstractDb
1818
{

‎app/code/Magento/Bundle/Model/Selection.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
* @method \Magento\Bundle\Model\Selection setSelectionQty(float $value)
2929
* @method int getSelectionCanChangeQty()
3030
* @method \Magento\Bundle\Model\Selection setSelectionCanChangeQty(int $value)
31+
* @api
3132
*/
3233
class Selection extends \Magento\Framework\Model\AbstractModel
3334
{

‎app/code/Magento/Bundle/Model/Source/Option/Selection/Price/Type.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
/**
1111
* Extended Attributes Source Model
1212
*
13-
* @author Magento Core Team <[email protected]>
13+
* @api
1414
*/
1515
class Type implements \Magento\Framework\Option\ArrayInterface
1616
{

‎app/code/Magento/Bundle/Pricing/Adjustment/SelectionPriceListProviderInterface.php

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

1111
/**
1212
* Provide list of bundle selection prices
13+
* @api
1314
*/
1415
interface SelectionPriceListProviderInterface
1516
{

‎app/code/Magento/Bundle/Pricing/Price/BundleSelectionFactory.php

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

1111
/**
1212
* Bundle selection price factory
13+
* @api
1314
*/
1415
class BundleSelectionFactory
1516
{

‎app/code/Magento/Bundle/Pricing/Price/BundleSelectionPrice.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
/**
1818
* Bundle option price
1919
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
20+
* @api
2021
*/
2122
class BundleSelectionPrice extends AbstractPrice
2223
{

‎app/code/Magento/Bundle/Pricing/Price/ConfiguredPrice.php

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

1515
/**
1616
* Configured price model
17+
* @api
1718
*/
1819
class ConfiguredPrice extends CatalogPrice\FinalPrice implements ConfiguredPriceInterface
1920
{

‎app/code/Magento/Bundle/view/adminhtml/web/js/bundle-product.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66
/*global FORM_KEY*/
77
/*global bSelection*/
88
/*global $H*/
9+
/**
10+
* @api
11+
*/
912
define([
1013
'jquery',
1114
'Magento_Catalog/js/product/weight-handler',

‎app/code/Magento/Bundle/view/base/web/js/price-bundle.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
* See COPYING.txt for license details.
44
*/
55

6+
/**
7+
* @api
8+
*/
69
define([
710
'jquery',
811
'underscore',

‎app/code/Magento/Bundle/view/frontend/web/js/float.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
* See COPYING.txt for license details.
44
*/
55

6+
/**
7+
* @api
8+
*/
69
define([
710
'jquery',
811
'jquery/ui'

‎app/code/Magento/Bundle/view/frontend/web/js/product-summary.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
* See COPYING.txt for license details.
44
*/
55

6+
/**
7+
* @api
8+
*/
69
define([
710
'jquery',
811
'mage/template',

‎app/code/Magento/Bundle/view/frontend/web/js/slide.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
* See COPYING.txt for license details.
44
*/
55

6+
/**
7+
* @api
8+
*/
69
define([
710
'jquery',
811
'jquery/ui'

‎app/code/Magento/Captcha/Block/Adminhtml/Captcha/DefaultCaptcha.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,11 @@
44
* See COPYING.txt for license details.
55
*/
66

7+
namespace Magento\Captcha\Block\Adminhtml\Captcha;
8+
79
/**
810
* Captcha block for adminhtml area
9-
*
10-
* @author Magento Core Team <[email protected]>
1111
*/
12-
namespace Magento\Captcha\Block\Adminhtml\Captcha;
13-
1412
class DefaultCaptcha extends \Magento\Captcha\Block\Captcha\DefaultCaptcha
1513
{
1614
/**

‎app/code/Magento/Captcha/Block/Captcha/DefaultCaptcha.php

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

88
/**
99
* Captcha block
10-
*
11-
* @author Magento Core Team <[email protected]>
1210
*/
1311
class DefaultCaptcha extends \Magento\Framework\View\Element\Template
1412
{

0 commit comments

Comments
 (0)