Skip to content

Commit 0fb28e1

Browse files
author
Dmytro Poperechnyy
committed
Merge branch 'develop' of https://github.corp.ebay.com/magento2/magento2ce into MAGETWO-33060
2 parents d9f5593 + f905eba commit 0fb28e1

File tree

172 files changed

+10414
-3939
lines changed

Some content is hidden

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

172 files changed

+10414
-3939
lines changed

‎CHANGELOG.md

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,53 @@
1+
0.42.0-beta6
2+
=============
3+
* Various improvements:
4+
* Implemented caching for WebAPI configuration
5+
* Improved tests coverage of the CurrencySymbol module
6+
* Table catalogsearch_fulltext is setting up with ENGINE=InnoDB
7+
* Improved unit test coverage of the Catalog related functionality
8+
* Optimized JS dependencies
9+
* Refactored controller actions in the Sales module
10+
* Refactored controller actions in the Customer module
11+
* Removed the assertion for the exact number of attributes in API-functional tests for customer metadata.
12+
* Refactored API code for the CheckoutAgreements module
13+
* Refactored API code for the GiftMessage module
14+
* Refactored API for the Checkout module
15+
* Fixed bugs:
16+
* Fixed an where issue were WebAPI generated the wrong WSDL
17+
* Fixed an issue where Catalog, Checkout, Customer API ACLs did not support AJAX use case(s)
18+
* Fixed an issue where SOAP tests failed after upgrading to ZF 1.12.9
19+
* Fixed an issue where the 'There is no data for export' message was displayed permanently after invalid search
20+
* Fixed an issue where there was no ability to set category position during creation it
21+
* Fixed a CSS issue where certain images were absent on banners ()
22+
* Fixed an issue where the 'Date Of Birth' value was i reset to current date on the customer form)
23+
* Fixed an issue where the behavior of the "Terms and Conditions" validation on multiple address checkout was different from the one for the onepage checkout
24+
* Fixed an issue where it was impossible to checkout with multiple addresses
25+
* Fixed an issue where the 'This is a required field ' message was not displayed for "Terms and Conditions" if the latter was not selected
26+
* GitHub Requests:
27+
* [#963](https://github.com/magento/magento2/pull/963) -- Default Accept header
28+
* [#995](https://github.com/magento/magento2/pull/995) -- Prevent a warning in activated developer mode when 'plugins' is no array
29+
* [#866](https://github.com/magento/magento2/issues/866) -- Configurable product attribute scope
30+
* [#965](https://github.com/magento/magento2/pull/965) -- extra tests for current interception behavior
31+
* Service Contracts:
32+
* The Downloadable module basic implementation
33+
* Framework improvements:
34+
* Refactored and covered with tests the classes with high CRAP value (>50)
35+
* Moved Theme Management changes, Design changes, Design\Backend modules, and Observer components from the Core module to the Theme module
36+
* Moved Debug Hints models from the Core module to the newly added Developer module
37+
* Moved URL components, Factory, and EntityFactory from the Core module to the Magento Framework
38+
* UI improvements:
39+
* Compressed and resized images
40+
* Added new base styles for the Admin re-design
41+
* Added the WAI-ARIA attributes are to the Search Autocomplete on the storefront
42+
* Added visual style for the 'skip to content' attribute on the storefront
43+
* Fixed the style of persistent login messages on the storefront for all themes
44+
* Fixed the style of scrolling for Categories with long names in the Admin
45+
* Fixed the "css/print.css" file path on the storefront pages for all themes
46+
* Tests improvements:
47+
* Converted all fixtures/repositories for functional tests to .xml files
48+
* Improved interaction between webdriver and the new Magento JS forms
49+
* Increased unit and integration tests coverage
50+
151
0.42.0-beta5
252
=============
353
* UI improvements:

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ Use the following table to verify you have the correct prerequisites to install
3232
<td><a href="http://devdocs.magento.com/guides/v1.0/install-gde/prereq/apache.html">Apache</a></td>
3333
</tr>
3434
<tr>
35-
<td>PHP 5.4.x (where x = 11 or later) or 5.5.x</td>
35+
<td>PHP 5.5.x or 5.6.x</td>
3636
<td><code>php -v</code></td>
3737
<td><a href="http://devdocs.magento.com/guides/v1.0/install-gde/prereq/php-ubuntu.html">PHP Ubuntu</a><br><a href="http://devdocs.magento.com/guides/v1.0/install-gde/prereq/php-centos.html">PHP CentOS</a></td>
3838
</tr>

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.4.11|~5.5.0|~5.6.0",
6-
"magento/module-store": "0.42.0-beta5",
7-
"magento/module-core": "0.42.0-beta5",
8-
"magento/module-backend": "0.42.0-beta5",
9-
"magento/framework": "0.42.0-beta5",
6+
"magento/module-store": "0.42.0-beta6",
7+
"magento/module-core": "0.42.0-beta6",
8+
"magento/module-backend": "0.42.0-beta6",
9+
"magento/framework": "0.42.0-beta6",
1010
"lib-libxml": "*",
1111
"magento/magento-composer-installer": "*"
1212
},
1313
"type": "magento2-module",
14-
"version": "0.42.0-beta5",
14+
"version": "0.42.0-beta6",
1515
"license": [
1616
"OSL-3.0",
1717
"AFL-3.0"

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
"description": "Authorization module provides access to Magento ACL functionality.",
44
"require": {
55
"php": "~5.4.11|~5.5.0|~5.6.0",
6-
"magento/module-backend": "0.42.0-beta5",
7-
"magento/framework": "0.42.0-beta5",
6+
"magento/module-backend": "0.42.0-beta6",
7+
"magento/framework": "0.42.0-beta6",
88
"magento/magento-composer-installer": "*"
99
},
1010
"type": "magento2-module",
11-
"version": "0.42.0-beta5",
11+
"version": "0.42.0-beta6",
1212
"license": [
1313
"OSL-3.0",
1414
"AFL-3.0"

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

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,27 +3,27 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.4.11|~5.5.0|~5.6.0",
6-
"magento/module-store": "0.42.0-beta5",
7-
"magento/module-directory": "0.42.0-beta5",
8-
"magento/module-core": "0.42.0-beta5",
9-
"magento/module-eav": "0.42.0-beta5",
10-
"magento/module-cron": "0.42.0-beta5",
11-
"magento/module-theme": "0.42.0-beta5",
12-
"magento/module-reports": "0.42.0-beta5",
13-
"magento/module-sales": "0.42.0-beta5",
14-
"magento/module-quote": "0.42.0-beta5",
15-
"magento/module-catalog": "0.42.0-beta5",
16-
"magento/module-user": "0.42.0-beta5",
17-
"magento/module-backup": "0.42.0-beta5",
18-
"magento/module-email": "0.42.0-beta5",
19-
"magento/module-customer": "0.42.0-beta5",
20-
"magento/module-translation": "0.42.0-beta5",
21-
"magento/module-require-js": "0.42.0-beta5",
22-
"magento/framework": "0.42.0-beta5",
6+
"magento/module-store": "0.42.0-beta6",
7+
"magento/module-directory": "0.42.0-beta6",
8+
"magento/module-core": "0.42.0-beta6",
9+
"magento/module-eav": "0.42.0-beta6",
10+
"magento/module-cron": "0.42.0-beta6",
11+
"magento/module-theme": "0.42.0-beta6",
12+
"magento/module-reports": "0.42.0-beta6",
13+
"magento/module-sales": "0.42.0-beta6",
14+
"magento/module-quote": "0.42.0-beta6",
15+
"magento/module-catalog": "0.42.0-beta6",
16+
"magento/module-user": "0.42.0-beta6",
17+
"magento/module-backup": "0.42.0-beta6",
18+
"magento/module-email": "0.42.0-beta6",
19+
"magento/module-customer": "0.42.0-beta6",
20+
"magento/module-translation": "0.42.0-beta6",
21+
"magento/module-require-js": "0.42.0-beta6",
22+
"magento/framework": "0.42.0-beta6",
2323
"magento/magento-composer-installer": "*"
2424
},
2525
"type": "magento2-module",
26-
"version": "0.42.0-beta5",
26+
"version": "0.42.0-beta6",
2727
"license": [
2828
"OSL-3.0",
2929
"AFL-3.0"

‎app/code/Magento/Backend/etc/adminhtml/system.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,10 @@
211211
<label>Merge CSS Files</label>
212212
<source_model>Magento\Backend\Model\Config\Source\Yesno</source_model>
213213
</field>
214+
<field id="minify_files" translate="label" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
215+
<label>Minify CSS Files</label>
216+
<source_model>Magento\Backend\Model\Config\Source\Yesno</source_model>
217+
</field>
214218
</group>
215219
<group id="image" translate="label" type="text" sortOrder="120" showInDefault="1" showInWebsite="0" showInStore="0">
216220
<label>Image Processing Settings</label>

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.4.11|~5.5.0|~5.6.0",
6-
"magento/module-backend": "0.42.0-beta5",
7-
"magento/module-cron": "0.42.0-beta5",
8-
"magento/framework": "0.42.0-beta5",
6+
"magento/module-backend": "0.42.0-beta6",
7+
"magento/module-cron": "0.42.0-beta6",
8+
"magento/framework": "0.42.0-beta6",
99
"magento/magento-composer-installer": "*"
1010
},
1111
"type": "magento2-module",
12-
"version": "0.42.0-beta5",
12+
"version": "0.42.0-beta6",
1313
"license": [
1414
"OSL-3.0",
1515
"AFL-3.0"

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

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,25 +3,25 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.4.11|~5.5.0|~5.6.0",
6-
"magento/module-store": "0.42.0-beta5",
7-
"magento/module-catalog": "0.42.0-beta5",
8-
"magento/module-tax": "0.42.0-beta5",
9-
"magento/module-core": "0.42.0-beta5",
10-
"magento/module-backend": "0.42.0-beta5",
11-
"magento/module-sales": "0.42.0-beta5",
12-
"magento/module-checkout": "0.42.0-beta5",
13-
"magento/module-catalog-inventory": "0.42.0-beta5",
14-
"magento/module-customer": "0.42.0-beta5",
15-
"magento/module-catalog-rule": "0.42.0-beta5",
16-
"magento/module-eav": "0.42.0-beta5",
17-
"magento/module-gift-message": "0.42.0-beta5",
18-
"magento/framework": "0.42.0-beta5",
19-
"magento/module-webapi": "0.42.0-beta5",
20-
"magento/module-quote": "0.42.0-beta5",
6+
"magento/module-store": "0.42.0-beta6",
7+
"magento/module-catalog": "0.42.0-beta6",
8+
"magento/module-tax": "0.42.0-beta6",
9+
"magento/module-core": "0.42.0-beta6",
10+
"magento/module-backend": "0.42.0-beta6",
11+
"magento/module-sales": "0.42.0-beta6",
12+
"magento/module-checkout": "0.42.0-beta6",
13+
"magento/module-catalog-inventory": "0.42.0-beta6",
14+
"magento/module-customer": "0.42.0-beta6",
15+
"magento/module-catalog-rule": "0.42.0-beta6",
16+
"magento/module-eav": "0.42.0-beta6",
17+
"magento/module-gift-message": "0.42.0-beta6",
18+
"magento/framework": "0.42.0-beta6",
19+
"magento/module-webapi": "0.42.0-beta6",
20+
"magento/module-quote": "0.42.0-beta6",
2121
"magento/magento-composer-installer": "*"
2222
},
2323
"type": "magento2-module",
24-
"version": "0.42.0-beta5",
24+
"version": "0.42.0-beta6",
2525
"license": [
2626
"OSL-3.0",
2727
"AFL-3.0"

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.4.11|~5.5.0|~5.6.0",
6-
"magento/module-store": "0.42.0-beta5",
7-
"magento/module-customer": "0.42.0-beta5",
8-
"magento/module-checkout": "0.42.0-beta5",
9-
"magento/module-core": "0.42.0-beta5",
10-
"magento/module-backend": "0.42.0-beta5",
11-
"magento/framework": "0.42.0-beta5",
6+
"magento/module-store": "0.42.0-beta6",
7+
"magento/module-customer": "0.42.0-beta6",
8+
"magento/module-checkout": "0.42.0-beta6",
9+
"magento/module-core": "0.42.0-beta6",
10+
"magento/module-backend": "0.42.0-beta6",
11+
"magento/framework": "0.42.0-beta6",
1212
"magento/magento-composer-installer": "*"
1313
},
1414
"type": "magento2-module",
15-
"version": "0.42.0-beta5",
15+
"version": "0.42.0-beta6",
1616
"license": [
1717
"OSL-3.0",
1818
"AFL-3.0"

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

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,13 @@ class Product extends \Magento\Core\Helper\Url
8181
*/
8282
protected $_catalogSession;
8383

84+
/**
85+
* Invalidate product category indexer params
86+
*
87+
* @var array
88+
*/
89+
protected $_reindexProductCategoryIndexerData;
90+
8491
/**
8592
* Invalidate price indexer params
8693
*
@@ -109,6 +116,7 @@ class Product extends \Magento\Core\Helper\Url
109116
* @param \Magento\Framework\App\Config\ScopeConfigInterface $coreConfig
110117
* @param string $typeSwitcherLabel
111118
* @param array $reindexPriceIndexerData
119+
* @param array $reindexProductCategoryIndexerData
112120
* @param ProductRepositoryInterface $productRepository
113121
* @param CategoryRepositoryInterface $categoryRepository
114122
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
@@ -124,6 +132,7 @@ public function __construct(
124132
\Magento\Framework\App\Config\ScopeConfigInterface $coreConfig,
125133
$typeSwitcherLabel,
126134
$reindexPriceIndexerData,
135+
$reindexProductCategoryIndexerData,
127136
ProductRepositoryInterface $productRepository,
128137
CategoryRepositoryInterface $categoryRepository
129138
) {
@@ -137,6 +146,7 @@ public function __construct(
137146
$this->_reindexPriceIndexerData = $reindexPriceIndexerData;
138147
$this->productRepository = $productRepository;
139148
$this->categoryRepository = $categoryRepository;
149+
$this->_reindexProductCategoryIndexerData = $reindexProductCategoryIndexerData;
140150
parent::__construct($context, $storeManager);
141151
}
142152

@@ -169,6 +179,22 @@ public function isDataForPriceIndexerWasChanged($data)
169179
return false;
170180
}
171181

182+
/**
183+
* Retrieve data for product category indexer update
184+
*
185+
* @param \Magento\Catalog\Model\Product $data
186+
* @return boolean
187+
*/
188+
public function isDataForProductCategoryIndexerWasChanged(\Magento\Catalog\Model\Product $data)
189+
{
190+
foreach ($this->_reindexProductCategoryIndexerData['byDataChange'] as $param) {
191+
if ($data->dataHasChangedFor($param)) {
192+
return true;
193+
}
194+
}
195+
return false;
196+
}
197+
172198
/**
173199
* Retrieve product view page url
174200
*

0 commit comments

Comments
 (0)