Skip to content

Commit

Permalink
Merge remote-tracking branch 'mainline/2.2-develop' into MAGETWO-7152…
Browse files Browse the repository at this point in the history 
…0-grid-filter-broken
  • Loading branch information
@cpartica
cpartica committed Oct 4, 2017
2 parents 2933325 + 850b9e5 commit ad9b645
Show file tree
Hide file tree
Showing 195 changed files with 1,502 additions and 827 deletions.
4 changes: 2 additions & 2 deletions app/code/Magento/AdminNotification/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
"magento/module-store": "100.2.*",
"magento/module-backend": "100.2.*",
"magento/module-media-storage": "100.2.*",
"magento/framework": "100.2.*",
"magento/module-ui": "100.2.*",
"magento/framework": "101.0.*",
"magento/module-ui": "101.0.*",
"lib-libxml": "*"
},
"type": "magento2-module",
Expand Down
8 changes: 4 additions & 4 deletions app/code/Magento/AdvancedPricingImportExport/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
"description": "N/A",
"require": {
"php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
"magento/module-catalog": "101.1.*",
"magento/module-catalog": "102.0.*",
"magento/module-catalog-inventory": "100.2.*",
"magento/module-eav": "100.2.*",
"magento/module-eav": "101.0.*",
"magento/module-import-export": "100.2.*",
"magento/module-catalog-import-export": "100.2.*",
"magento/module-customer": "100.2.*",
"magento/module-customer": "101.0.*",
"magento/module-store": "100.2.*",
"magento/framework": "100.2.*"
"magento/framework": "101.0.*"
},
"type": "magento2-module",
"version": "100.2.0-dev",
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Authorization/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"require": {
"php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
"magento/module-backend": "100.2.*",
"magento/framework": "100.2.*"
"magento/framework": "101.0.*"
},
"type": "magento2-module",
"version": "100.2.0-dev",
Expand Down
10 changes: 5 additions & 5 deletions app/code/Magento/Authorizenet/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@
"description": "N/A",
"require": {
"php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
"magento/module-sales": "100.2.*",
"magento/module-sales": "101.0.*",
"magento/module-store": "100.2.*",
"magento/module-quote": "100.2.*",
"magento/module-quote": "101.0.*",
"magento/module-checkout": "100.2.*",
"magento/module-backend": "100.2.*",
"magento/module-payment": "100.2.*",
"magento/module-catalog": "101.1.*",
"magento/framework": "100.2.*"
"magento/module-catalog": "102.0.*",
"magento/framework": "101.0.*"
},
"suggest": {
"magento/module-config": "100.2.*"
"magento/module-config": "101.0.*"
},
"type": "magento2-module",
"version": "100.2.0-dev",
Expand Down
16 changes: 8 additions & 8 deletions app/code/Magento/Backend/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,19 @@
"magento/module-store": "100.2.*",
"magento/module-directory": "100.2.*",
"magento/module-developer": "100.2.*",
"magento/module-eav": "100.2.*",
"magento/module-eav": "101.0.*",
"magento/module-reports": "100.2.*",
"magento/module-sales": "100.2.*",
"magento/module-quote": "100.2.*",
"magento/module-catalog": "101.1.*",
"magento/module-user": "100.2.*",
"magento/module-sales": "101.0.*",
"magento/module-quote": "101.0.*",
"magento/module-catalog": "102.0.*",
"magento/module-user": "101.0.*",
"magento/module-security": "100.2.*",
"magento/module-backup": "100.2.*",
"magento/module-customer": "100.2.*",
"magento/module-customer": "101.0.*",
"magento/module-translation": "100.2.*",
"magento/module-require-js": "100.2.*",
"magento/module-config": "100.2.*",
"magento/framework": "100.2.*"
"magento/module-config": "101.0.*",
"magento/framework": "101.0.*"
},
"suggest": {
"magento/module-theme": "100.2.*"
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/Backup/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"magento/module-store": "100.2.*",
"magento/module-backend": "100.2.*",
"magento/module-cron": "100.2.*",
"magento/framework": "100.2.*"
"magento/framework": "101.0.*"
},
"type": "magento2-module",
"version": "100.2.0-dev",
Expand Down
16 changes: 8 additions & 8 deletions app/code/Magento/Braintree/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,20 @@
"description": "N/A",
"require": {
"php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
"magento/framework": "100.2.*",
"magento/framework": "101.0.*",
"magento/magento-composer-installer": "*",
"magento/module-config": "100.2.*",
"magento/module-config": "101.0.*",
"magento/module-directory": "100.2.*",
"magento/module-payment": "100.2.*",
"magento/module-checkout": "100.2.*",
"magento/module-sales": "100.2.*",
"magento/module-sales": "101.0.*",
"magento/module-backend": "100.2.*",
"magento/module-vault": "100.2.*",
"magento/module-customer": "100.2.*",
"magento/module-catalog": "101.1.*",
"magento/module-quote": "100.2.*",
"magento/module-vault": "101.0.*",
"magento/module-customer": "101.0.*",
"magento/module-catalog": "102.0.*",
"magento/module-quote": "101.0.*",
"magento/module-paypal": "100.2.*",
"magento/module-ui": "100.2.*",
"magento/module-ui": "101.0.*",
"braintree/braintree_php": "3.22.0"
},
"suggest": {
Expand Down
1 change: 1 addition & 0 deletions app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,7 @@ protected function _getSelectedOptions()
* @param \Magento\Bundle\Model\Option $option
* @param mixed $selectionId
* @return void
* @since 100.2.0
*/
protected function assignSelection(\Magento\Bundle\Model\Option $option, $selectionId)
{
Expand Down
1 change: 1 addition & 0 deletions app/code/Magento/Bundle/Block/Catalog/Product/View/Type/Bundle/Option/Multi.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ class Multi extends \Magento\Bundle\Block\Catalog\Product\View\Type\Bundle\Optio

/**
* @inheritdoc
* @since 100.2.0
*/
protected function assignSelection(\Magento\Bundle\Model\Option $option, $selectionId)
{
Expand Down
18 changes: 9 additions & 9 deletions app/code/Magento/Bundle/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,21 @@
"require": {
"php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
"magento/module-store": "100.2.*",
"magento/module-catalog": "101.1.*",
"magento/module-catalog": "102.0.*",
"magento/module-tax": "100.2.*",
"magento/module-backend": "100.2.*",
"magento/module-sales": "100.2.*",
"magento/module-sales": "101.0.*",
"magento/module-checkout": "100.2.*",
"magento/module-catalog-inventory": "100.2.*",
"magento/module-customer": "100.2.*",
"magento/module-catalog-rule": "100.2.*",
"magento/module-eav": "100.2.*",
"magento/module-config": "100.2.*",
"magento/module-customer": "101.0.*",
"magento/module-catalog-rule": "101.0.*",
"magento/module-eav": "101.0.*",
"magento/module-config": "101.0.*",
"magento/module-gift-message": "100.2.*",
"magento/framework": "100.2.*",
"magento/module-quote": "100.2.*",
"magento/framework": "101.0.*",
"magento/module-quote": "101.0.*",
"magento/module-media-storage": "100.2.*",
"magento/module-ui": "100.2.*"
"magento/module-ui": "101.0.*"
},
"suggest": {
"magento/module-webapi": "100.2.*",
Expand Down
6 changes: 3 additions & 3 deletions app/code/Magento/BundleImportExport/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
"description": "N/A",
"require": {
"php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
"magento/module-catalog": "101.1.*",
"magento/module-catalog": "102.0.*",
"magento/module-import-export": "100.2.*",
"magento/module-catalog-import-export": "100.2.*",
"magento/module-bundle": "100.2.*",
"magento/module-eav": "100.2.*",
"magento/framework": "100.2.*"
"magento/module-eav": "101.0.*",
"magento/framework": "101.0.*"
},
"type": "magento2-module",
"version": "100.2.0-dev",
Expand Down
2 changes: 1 addition & 1 deletion app/code/Magento/CacheInvalidate/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"require": {
"php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
"magento/module-page-cache": "100.2.*",
"magento/framework": "100.2.*"
"magento/framework": "101.0.*"
},
"type": "magento2-module",
"version": "100.2.0-dev",
Expand Down
4 changes: 2 additions & 2 deletions app/code/Magento/Captcha/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
"require": {
"php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
"magento/module-store": "100.2.*",
"magento/module-customer": "100.2.*",
"magento/module-customer": "101.0.*",
"magento/module-checkout": "100.2.*",
"magento/module-backend": "100.2.*",
"magento/framework": "100.2.*",
"magento/framework": "101.0.*",
"zendframework/zend-db": "^2.8.2",
"zendframework/zend-captcha": "^2.7.1",
"zendframework/zend-session": "^2.7.3"
Expand Down
2 changes: 2 additions & 0 deletions app/code/Magento/Catalog/Model/Indexer/Product/Price/UpdateIndexInterface.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
* Defines strategy for updating price index
*
* @api
* @since 101.1.0
*/
interface UpdateIndexInterface
{
Expand All @@ -20,6 +21,7 @@ interface UpdateIndexInterface
* @param GroupInterface $group
* @param bool $isGroupNew
* @return void
* @since 101.1.0
*/
public function update(GroupInterface $group, $isGroupNew);
}
2 changes: 0 additions & 2 deletions app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/BatchSizeCalculator.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ class BatchSizeCalculator

/**
* @var \Magento\Catalog\Model\ResourceModel\Product\Indexer\Price\CompositeProductBatchSizeAdjusterInterface[]
* @since 2.2.0
*/
private $batchSizeAdjusters;

Expand All @@ -32,7 +31,6 @@ class BatchSizeCalculator
* @param array $batchRowsCount
* @param array $estimators
* @param array $batchSizeAdjusters
* @since 2.2.0
*/
public function __construct(array $batchRowsCount, array $estimators, array $batchSizeAdjusters)
{
Expand Down
2 changes: 2 additions & 0 deletions .../Model/ResourceModel/Product/Indexer/Price/CompositeProductBatchSizeAdjusterInterface.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
/**
* Correct batch size according to number of composite related items.
* @api
* @since 101.1.0
*/
interface CompositeProductBatchSizeAdjusterInterface
{
Expand All @@ -17,6 +18,7 @@ interface CompositeProductBatchSizeAdjusterInterface
*
* @param int $batchSize
* @return int
* @since 101.1.0
*/
public function adjust($batchSize);
}
2 changes: 0 additions & 2 deletions ...to/Catalog/Model/ResourceModel/Product/Indexer/Price/CompositeProductRowSizeEstimator.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,13 @@ class CompositeProductRowSizeEstimator implements IndexTableRowSizeEstimatorInte

/**
* @var CompositeProductRelationsCalculator
* @since 2.2.0
*/
private $compositeProductRelationsCalculator;

/**
* @param WebsiteManagementInterface $websiteManagement
* @param CollectionFactory $collectionFactory
* @param CompositeProductRelationsCalculator $compositeProductRelationsCalculator
* @since 2.2.0
*/
public function __construct(
WebsiteManagementInterface $websiteManagement,
Expand Down
4 changes: 2 additions & 2 deletions app/code/Magento/Catalog/Pricing/Price/TierPrice.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class TierPrice extends AbstractPrice implements TierPriceInterface, BasePricePr

/**
* @var Session
* @deprecated
* @deprecated 101.1.0
*/
protected $customerSession;

Expand Down Expand Up @@ -82,7 +82,7 @@ public function __construct(
GroupManagementInterface $groupManagement,
CustomerGroupRetrieverInterface $customerGroupRetriever = null
) {
$quantity = $quantity ?: 1;
$quantity = floatval($quantity) ? $quantity : 1;
parent::__construct($saleableItem, $quantity, $calculator, $priceCurrency);
$this->customerSession = $customerSession;
$this->groupManagement = $groupManagement;
Expand Down
34 changes: 34 additions & 0 deletions app/code/Magento/Catalog/Test/Unit/Pricing/Price/TierPriceTest.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -390,4 +390,38 @@ public function dataProviderGetSavePercent()
['basePrice' => '20.80', 'tierPrice' => '18.72', 'savedPercent' => '10']
];
}

/**
* @param null|string|float $quantity
* @param float $expectedValue
* @dataProvider getQuantityDataProvider
*/
public function testGetQuantity($quantity, $expectedValue)
{
$tierPrice = new TierPrice(
$this->product,
$quantity,
$this->calculator,
$this->priceCurrencyMock,
$this->session,
$this->groupManagement,
$this->customerGroupRetriever
);

$this->assertEquals($expectedValue, $tierPrice->getQuantity());
}

public function getQuantityDataProvider()
{
return [
[null, 1],
['one', 1],
['', 1],
[4, 4],
[4.5, 4.5],
['0.7', 0.7],
['0.0000000', 1]
];

}
}
26 changes: 13 additions & 13 deletions app/code/Magento/Catalog/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,37 +4,37 @@
"require": {
"php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
"magento/module-store": "100.2.*",
"magento/module-eav": "100.2.*",
"magento/module-cms": "101.1.*",
"magento/module-eav": "101.0.*",
"magento/module-cms": "102.0.*",
"magento/module-indexer": "100.2.*",
"magento/module-customer": "100.2.*",
"magento/module-customer": "101.0.*",
"magento/module-theme": "100.2.*",
"magento/module-checkout": "100.2.*",
"magento/module-backend": "100.2.*",
"magento/module-widget": "100.2.*",
"magento/module-wishlist": "100.2.*",
"magento/module-widget": "101.0.*",
"magento/module-wishlist": "101.0.*",
"magento/module-tax": "100.2.*",
"magento/module-msrp": "100.2.*",
"magento/module-catalog-inventory": "100.2.*",
"magento/module-directory": "100.2.*",
"magento/module-catalog-rule": "100.2.*",
"magento/module-catalog-rule": "101.0.*",
"magento/module-product-alert": "100.2.*",
"magento/module-url-rewrite": "100.2.*",
"magento/module-url-rewrite": "101.0.*",
"magento/module-catalog-url-rewrite": "100.2.*",
"magento/module-page-cache": "100.2.*",
"magento/module-quote": "100.2.*",
"magento/module-config": "100.2.*",
"magento/module-quote": "101.0.*",
"magento/module-config": "101.0.*",
"magento/module-media-storage": "100.2.*",
"magento/framework": "100.2.*",
"magento/module-ui": "100.2.*"
"magento/framework": "101.0.*",
"magento/module-ui": "101.0.*"
},
"suggest": {
"magento/module-cookie": "100.2.*",
"magento/module-sales": "100.2.*",
"magento/module-sales": "101.0.*",
"magento/module-catalog-sample-data": "Sample Data version:100.2.*"
},
"type": "magento2-module",
"version": "101.1.0-dev",
"version": "102.0.0-dev",
"license": [
"OSL-3.0",
"AFL-3.0"
Expand Down
Loading

0 comments on commit ad9b645

Please sign in to comment.