Skip to content

Commit 850b9e5

Browse files
cparticacpartica
authored
Merge pull request #1538 from magento-okapis/MAGETWO-80581
[okapis] MAGETWO-80581: Merge code from 2.2.0 release branches into "2.2-develop" branches
2 parents de4369f + 159cdbf commit 850b9e5

File tree

152 files changed

+692
-703
lines changed

Some content is hidden

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

152 files changed

+692
-703
lines changed

‎app/code/Magento/AdminNotification/composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
"magento/module-store": "100.2.*",
77
"magento/module-backend": "100.2.*",
88
"magento/module-media-storage": "100.2.*",
9-
"magento/framework": "100.2.*",
10-
"magento/module-ui": "100.2.*",
9+
"magento/framework": "101.0.*",
10+
"magento/module-ui": "101.0.*",
1111
"lib-libxml": "*"
1212
},
1313
"type": "magento2-module",

‎app/code/Magento/AdvancedPricingImportExport/composer.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
"description": "N/A",
44
"require": {
55
"php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
6-
"magento/module-catalog": "101.1.*",
6+
"magento/module-catalog": "102.0.*",
77
"magento/module-catalog-inventory": "100.2.*",
8-
"magento/module-eav": "100.2.*",
8+
"magento/module-eav": "101.0.*",
99
"magento/module-import-export": "100.2.*",
1010
"magento/module-catalog-import-export": "100.2.*",
11-
"magento/module-customer": "100.2.*",
11+
"magento/module-customer": "101.0.*",
1212
"magento/module-store": "100.2.*",
13-
"magento/framework": "100.2.*"
13+
"magento/framework": "101.0.*"
1414
},
1515
"type": "magento2-module",
1616
"version": "100.2.0-dev",

‎app/code/Magento/Authorization/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"require": {
55
"php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
66
"magento/module-backend": "100.2.*",
7-
"magento/framework": "100.2.*"
7+
"magento/framework": "101.0.*"
88
},
99
"type": "magento2-module",
1010
"version": "100.2.0-dev",

‎app/code/Magento/Authorizenet/composer.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@
33
"description": "N/A",
44
"require": {
55
"php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
6-
"magento/module-sales": "100.2.*",
6+
"magento/module-sales": "101.0.*",
77
"magento/module-store": "100.2.*",
8-
"magento/module-quote": "100.2.*",
8+
"magento/module-quote": "101.0.*",
99
"magento/module-checkout": "100.2.*",
1010
"magento/module-backend": "100.2.*",
1111
"magento/module-payment": "100.2.*",
12-
"magento/module-catalog": "101.1.*",
13-
"magento/framework": "100.2.*"
12+
"magento/module-catalog": "102.0.*",
13+
"magento/framework": "101.0.*"
1414
},
1515
"suggest": {
16-
"magento/module-config": "100.2.*"
16+
"magento/module-config": "101.0.*"
1717
},
1818
"type": "magento2-module",
1919
"version": "100.2.0-dev",

‎app/code/Magento/Backend/composer.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,19 @@
66
"magento/module-store": "100.2.*",
77
"magento/module-directory": "100.2.*",
88
"magento/module-developer": "100.2.*",
9-
"magento/module-eav": "100.2.*",
9+
"magento/module-eav": "101.0.*",
1010
"magento/module-reports": "100.2.*",
11-
"magento/module-sales": "100.2.*",
12-
"magento/module-quote": "100.2.*",
13-
"magento/module-catalog": "101.1.*",
14-
"magento/module-user": "100.2.*",
11+
"magento/module-sales": "101.0.*",
12+
"magento/module-quote": "101.0.*",
13+
"magento/module-catalog": "102.0.*",
14+
"magento/module-user": "101.0.*",
1515
"magento/module-security": "100.2.*",
1616
"magento/module-backup": "100.2.*",
17-
"magento/module-customer": "100.2.*",
17+
"magento/module-customer": "101.0.*",
1818
"magento/module-translation": "100.2.*",
1919
"magento/module-require-js": "100.2.*",
20-
"magento/module-config": "100.2.*",
21-
"magento/framework": "100.2.*"
20+
"magento/module-config": "101.0.*",
21+
"magento/framework": "101.0.*"
2222
},
2323
"suggest": {
2424
"magento/module-theme": "100.2.*"

‎app/code/Magento/Backup/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"magento/module-store": "100.2.*",
77
"magento/module-backend": "100.2.*",
88
"magento/module-cron": "100.2.*",
9-
"magento/framework": "100.2.*"
9+
"magento/framework": "101.0.*"
1010
},
1111
"type": "magento2-module",
1212
"version": "100.2.0-dev",

‎app/code/Magento/Braintree/composer.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,20 @@
33
"description": "N/A",
44
"require": {
55
"php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
6-
"magento/framework": "100.2.*",
6+
"magento/framework": "101.0.*",
77
"magento/magento-composer-installer": "*",
8-
"magento/module-config": "100.2.*",
8+
"magento/module-config": "101.0.*",
99
"magento/module-directory": "100.2.*",
1010
"magento/module-payment": "100.2.*",
1111
"magento/module-checkout": "100.2.*",
12-
"magento/module-sales": "100.2.*",
12+
"magento/module-sales": "101.0.*",
1313
"magento/module-backend": "100.2.*",
14-
"magento/module-vault": "100.2.*",
15-
"magento/module-customer": "100.2.*",
16-
"magento/module-catalog": "101.1.*",
17-
"magento/module-quote": "100.2.*",
14+
"magento/module-vault": "101.0.*",
15+
"magento/module-customer": "101.0.*",
16+
"magento/module-catalog": "102.0.*",
17+
"magento/module-quote": "101.0.*",
1818
"magento/module-paypal": "100.2.*",
19-
"magento/module-ui": "100.2.*",
19+
"magento/module-ui": "101.0.*",
2020
"braintree/braintree_php": "3.22.0"
2121
},
2222
"suggest": {

‎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
@@ -165,6 +165,7 @@ protected function _getSelectedOptions()
165165
* @param \Magento\Bundle\Model\Option $option
166166
* @param mixed $selectionId
167167
* @return void
168+
* @since 100.2.0
168169
*/
169170
protected function assignSelection(\Magento\Bundle\Model\Option $option, $selectionId)
170171
{

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ class Multi extends \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Optio
2020

2121
/**
2222
* @inheritdoc
23+
* @since 100.2.0
2324
*/
2425
protected function assignSelection(\Magento\Bundle\Model\Option $option, $selectionId)
2526
{

‎app/code/Magento/Bundle/composer.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,21 @@
44
"require": {
55
"php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
66
"magento/module-store": "100.2.*",
7-
"magento/module-catalog": "101.1.*",
7+
"magento/module-catalog": "102.0.*",
88
"magento/module-tax": "100.2.*",
99
"magento/module-backend": "100.2.*",
10-
"magento/module-sales": "100.2.*",
10+
"magento/module-sales": "101.0.*",
1111
"magento/module-checkout": "100.2.*",
1212
"magento/module-catalog-inventory": "100.2.*",
13-
"magento/module-customer": "100.2.*",
14-
"magento/module-catalog-rule": "100.2.*",
15-
"magento/module-eav": "100.2.*",
16-
"magento/module-config": "100.2.*",
13+
"magento/module-customer": "101.0.*",
14+
"magento/module-catalog-rule": "101.0.*",
15+
"magento/module-eav": "101.0.*",
16+
"magento/module-config": "101.0.*",
1717
"magento/module-gift-message": "100.2.*",
18-
"magento/framework": "100.2.*",
19-
"magento/module-quote": "100.2.*",
18+
"magento/framework": "101.0.*",
19+
"magento/module-quote": "101.0.*",
2020
"magento/module-media-storage": "100.2.*",
21-
"magento/module-ui": "100.2.*"
21+
"magento/module-ui": "101.0.*"
2222
},
2323
"suggest": {
2424
"magento/module-webapi": "100.2.*",

‎app/code/Magento/BundleImportExport/composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
"description": "N/A",
44
"require": {
55
"php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
6-
"magento/module-catalog": "101.1.*",
6+
"magento/module-catalog": "102.0.*",
77
"magento/module-import-export": "100.2.*",
88
"magento/module-catalog-import-export": "100.2.*",
99
"magento/module-bundle": "100.2.*",
10-
"magento/module-eav": "100.2.*",
11-
"magento/framework": "100.2.*"
10+
"magento/module-eav": "101.0.*",
11+
"magento/framework": "101.0.*"
1212
},
1313
"type": "magento2-module",
1414
"version": "100.2.0-dev",

‎app/code/Magento/CacheInvalidate/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"require": {
55
"php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
66
"magento/module-page-cache": "100.2.*",
7-
"magento/framework": "100.2.*"
7+
"magento/framework": "101.0.*"
88
},
99
"type": "magento2-module",
1010
"version": "100.2.0-dev",

‎app/code/Magento/Captcha/composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
"require": {
55
"php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
66
"magento/module-store": "100.2.*",
7-
"magento/module-customer": "100.2.*",
7+
"magento/module-customer": "101.0.*",
88
"magento/module-checkout": "100.2.*",
99
"magento/module-backend": "100.2.*",
10-
"magento/framework": "100.2.*",
10+
"magento/framework": "101.0.*",
1111
"zendframework/zend-db": "^2.8.2",
1212
"zendframework/zend-captcha": "^2.7.1",
1313
"zendframework/zend-session": "^2.7.3"

‎app/code/Magento/Catalog/Model/Indexer/Product/Price/UpdateIndexInterface.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
* Defines strategy for updating price index
1212
*
1313
* @api
14+
* @since 101.1.0
1415
*/
1516
interface UpdateIndexInterface
1617
{
@@ -20,6 +21,7 @@ interface UpdateIndexInterface
2021
* @param GroupInterface $group
2122
* @param bool $isGroupNew
2223
* @return void
24+
* @since 101.1.0
2325
*/
2426
public function update(GroupInterface $group, $isGroupNew);
2527
}

‎app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/BatchSizeCalculator.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ class BatchSizeCalculator
2323

2424
/**
2525
* @var \Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\CompositeProductBatchSizeAdjusterInterface[]
26-
* @since 2.2.0
2726
*/
2827
private $batchSizeAdjusters;
2928

@@ -32,7 +31,6 @@ class BatchSizeCalculator
3231
* @param array $batchRowsCount
3332
* @param array $estimators
3433
* @param array $batchSizeAdjusters
35-
* @since 2.2.0
3634
*/
3735
public function __construct(array $batchRowsCount, array $estimators, array $batchSizeAdjusters)
3836
{

‎app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/CompositeProductBatchSizeAdjusterInterface.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
/**
1010
* Correct batch size according to number of composite related items.
1111
* @api
12+
* @since 101.1.0
1213
*/
1314
interface CompositeProductBatchSizeAdjusterInterface
1415
{
@@ -17,6 +18,7 @@ interface CompositeProductBatchSizeAdjusterInterface
1718
*
1819
* @param int $batchSize
1920
* @return int
21+
* @since 101.1.0
2022
*/
2123
public function adjust($batchSize);
2224
}

‎app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/CompositeProductRowSizeEstimator.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,13 @@ class CompositeProductRowSizeEstimator implements IndexTableRowSizeEstimatorInte
3232

3333
/**
3434
* @var CompositeProductRelationsCalculator
35-
* @since 2.2.0
3635
*/
3736
private $compositeProductRelationsCalculator;
3837

3938
/**
4039
* @param WebsiteManagementInterface $websiteManagement
4140
* @param CollectionFactory $collectionFactory
4241
* @param CompositeProductRelationsCalculator $compositeProductRelationsCalculator
43-
* @since 2.2.0
4442
*/
4543
public function __construct(
4644
WebsiteManagementInterface $websiteManagement,

‎app/code/Magento/Catalog/Pricing/Price/TierPrice.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class TierPrice extends AbstractPrice implements TierPriceInterface, BasePricePr
3131

3232
/**
3333
* @var Session
34-
* @deprecated
34+
* @deprecated 101.1.0
3535
*/
3636
protected $customerSession;
3737

‎app/code/Magento/Catalog/composer.json

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,37 +4,37 @@
44
"require": {
55
"php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
66
"magento/module-store": "100.2.*",
7-
"magento/module-eav": "100.2.*",
8-
"magento/module-cms": "101.1.*",
7+
"magento/module-eav": "101.0.*",
8+
"magento/module-cms": "102.0.*",
99
"magento/module-indexer": "100.2.*",
10-
"magento/module-customer": "100.2.*",
10+
"magento/module-customer": "101.0.*",
1111
"magento/module-theme": "100.2.*",
1212
"magento/module-checkout": "100.2.*",
1313
"magento/module-backend": "100.2.*",
14-
"magento/module-widget": "100.2.*",
15-
"magento/module-wishlist": "100.2.*",
14+
"magento/module-widget": "101.0.*",
15+
"magento/module-wishlist": "101.0.*",
1616
"magento/module-tax": "100.2.*",
1717
"magento/module-msrp": "100.2.*",
1818
"magento/module-catalog-inventory": "100.2.*",
1919
"magento/module-directory": "100.2.*",
20-
"magento/module-catalog-rule": "100.2.*",
20+
"magento/module-catalog-rule": "101.0.*",
2121
"magento/module-product-alert": "100.2.*",
22-
"magento/module-url-rewrite": "100.2.*",
22+
"magento/module-url-rewrite": "101.0.*",
2323
"magento/module-catalog-url-rewrite": "100.2.*",
2424
"magento/module-page-cache": "100.2.*",
25-
"magento/module-quote": "100.2.*",
26-
"magento/module-config": "100.2.*",
25+
"magento/module-quote": "101.0.*",
26+
"magento/module-config": "101.0.*",
2727
"magento/module-media-storage": "100.2.*",
28-
"magento/framework": "100.2.*",
29-
"magento/module-ui": "100.2.*"
28+
"magento/framework": "101.0.*",
29+
"magento/module-ui": "101.0.*"
3030
},
3131
"suggest": {
3232
"magento/module-cookie": "100.2.*",
33-
"magento/module-sales": "100.2.*",
33+
"magento/module-sales": "101.0.*",
3434
"magento/module-catalog-sample-data": "Sample Data version:100.2.*"
3535
},
3636
"type": "magento2-module",
37-
"version": "101.1.0-dev",
37+
"version": "102.0.0-dev",
3838
"license": [
3939
"OSL-3.0",
4040
"AFL-3.0"

‎app/code/Magento/CatalogImportExport/Model/Export/Product.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ class Product extends \Magento\ImportExport\Model\Export\Entity\AbstractEntity
161161
* Header columns for export file
162162
*
163163
* @var array
164-
* @deprecated
164+
* @deprecated 100.2.0
165165
*/
166166
protected $_headerColumns = [];
167167

@@ -699,7 +699,7 @@ public function _getHeaderColumns()
699699
* @param array $customOptionsData
700700
* @param array $stockItemRows
701701
* @return void
702-
* @deprecated Logic will be moved to _getHeaderColumns in future release
702+
* @deprecated 100.2.0 Logic will be moved to _getHeaderColumns in future release
703703
*
704704
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
705705
*/

‎app/code/Magento/CatalogImportExport/composer.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@
33
"description": "N/A",
44
"require": {
55
"php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
6-
"magento/module-catalog": "101.1.*",
6+
"magento/module-catalog": "102.0.*",
77
"magento/module-catalog-url-rewrite": "100.2.*",
8-
"magento/module-eav": "100.2.*",
8+
"magento/module-eav": "101.0.*",
99
"magento/module-import-export": "100.2.*",
1010
"magento/module-store": "100.2.*",
1111
"magento/module-tax": "100.2.*",
1212
"magento/module-catalog-inventory": "100.2.*",
1313
"magento/module-media-storage": "100.2.*",
14-
"magento/module-customer": "100.2.*",
15-
"magento/framework": "100.2.*",
14+
"magento/module-customer": "101.0.*",
15+
"magento/framework": "101.0.*",
1616
"ext-ctype": "*"
1717
},
1818
"type": "magento2-module",

‎app/code/Magento/CatalogInventory/Model/Stock/StockItemRepository.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ class StockItemRepository implements StockItemRepositoryInterface
7777

7878
/**
7979
* @var Processor
80-
* @deprecated
80+
* @deprecated 100.2.0
8181
*/
8282
protected $indexProcessor;
8383

0 commit comments

Comments
 (0)