Skip to content

Commit c0530db

Browse files
author
Sergey Semenov
committed
Merge remote-tracking branch 'mainline/develop' into MAGETWO-32690
Conflicts: app/code/Magento/Checkout/Controller/Onepage.php app/code/Magento/Cms/Controller/Index/DefaultNoRoute.php app/code/Magento/Cms/Controller/Noroute/Index.php dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php dev/tests/unit/testsuite/Magento/Cms/Controller/NorouteTest.php
2 parents efa0ccb + baadf05 commit c0530db

File tree

2,504 files changed

+39518
-24639
lines changed

Some content is hidden

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

2,504 files changed

+39518
-24639
lines changed

.travis.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
language: php
22
php:
3-
- 5.4
43
- 5.5
54
- 5.6
65
env:
@@ -11,10 +10,6 @@ env:
1110
- TEST_SUITE=static_annotation
1211
matrix:
1312
exclude:
14-
- php: 5.4
15-
env: TEST_SUITE=static_phpcs
16-
- php: 5.4
17-
env: TEST_SUITE=static_annotation
1813
- php: 5.6
1914
env: TEST_SUITE=static_phpcs
2015
- php: 5.6

CHANGELOG.md

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,50 @@
1+
0.42.0-beta7
2+
=============
3+
* Various improvements:
4+
* Added Varnish 4 support
5+
* Added CSS minification
6+
* Improved the performance toolkit
7+
* Fixed bugs:
8+
* Fixed an issue where the compiler for the single tenant mode did not resolve Repositories
9+
* Fixed an issue where the "Select all" mass action on the Customers page did not select all customers
10+
* Fixed an issue where values for a customer attribute of multiple-select type were not saved
11+
* Fixed an issue where the parental wakeup() method was not called in interceptors
12+
* Fixed an issue where bundle products with the same configurations added from different pages were displayed in the wishlist as separate items
13+
* Fixed an issue where the number of items added to the wishlist was not displayed on certain pages
14+
* Fixed an issue where logging was broken
15+
* Fixed an issue where it was impossible to use \Magento\Customer\Model\Resource\AddressRepository::getList with predefined direction(sortOrder)
16+
* Fixed an issue where editing a product from wishlist led caused a fatal error
17+
* Fixed an issue where the redirect link to continue shopping was absent in the success message after adding product to a wishlist
18+
* Fixed an issue where HTML tags where displayed in product prices on the Customer's Wishlist page in Admin
19+
* Fixed an issue where the Name and Email fields were not automatically when creating an email using the Email to Friend functionality
20+
* Fixed an issue with the redirect after searching product in a customer wishlist in Admin
21+
* Fixed an issue where a configurable product did not go out of stock when last subitem of some option was sold
22+
* Fixed an issue with varnish config generation for multiple IPs in access list field
23+
* Fixed the wrong di.xml in the Magento_Developer module
24+
* Fixed an issue where changes were not saved when default billing/shipping address was not selected in customer addresses
25+
* Fixed the issue where the Update Qty button looked disabled during a partial invoice creation
26+
* Fixed an issue where the creation date was not displayed in invoices and credit memo grids
27+
* Fixed an issue where it was impossible to install Magento_Quote on PHP 5.6
28+
* Fixed an issue that changes are not saved when default billing/shipping address is unchecked in customer addresses
29+
* Fixed an issue where "Update Qty" button looks disabled while creating partial invoice
30+
* Fixed an issue where date created column is not populated in invoices and credit memo grid
31+
* Fixed an issue with installation of Magento_Quote module on PHP 5.6
32+
* Fixed an issue with wrong link "File Permission Help"
33+
* Fixed an issue where dev/tools are broken when DI compiler is used due to skipped by the compiler dev/tools/Magento folder
34+
* Framework improvements:
35+
* JavaScript testsuites divided into frontend, backend and lib suites
36+
* Implemented image compression on server side upload
37+
* Implemented frontend page resources sorting
38+
* Removed the Magic __call method usage in templates
39+
* Introduced Jasmine + PhantomJS JavaScript testing infrastructure
40+
* Removed support of PHP 5.4
41+
* Setup Tool improvements:
42+
* Added tools for enabling/disabling modules: "module-enable --modules=Module_One,Module_Two, module-disable --modules=Module_One,Module_Two"
43+
* Added help option for displaying list of available modules: "help module-list"
44+
* GitHub requests :
45+
* [#593](https://github.com/magento/magento2/issues/593) -- Allow to use "0" as customer group
46+
* [#804](https://github.com/magento/magento2/issues/804) -- Comment about VAT number displayed under different field in Customer Configuration
47+
148
0.42.0-beta6
249
=============
350
* Various improvements:

Gruntfile.js

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@ module.exports = function (grunt) {
99

1010
// Required plugins
1111
// _____________________________________________
12-
var specRunner = require('./dev/tests/js/framework/spec_runner')(grunt);
12+
13+
var specRunner = require('./dev/tests/js/framework/spec_runner')(grunt),
14+
svgo = require('imagemin-svgo');
1315

1416
require('./dev/tools/grunt/tasks/mage-minify')(grunt);
1517

@@ -21,8 +23,6 @@ module.exports = function (grunt) {
2123
pattern: ['grunt-*', '!grunt-template-jasmine-requirejs']
2224
});
2325

24-
var svgo = require('imagemin-svgo');
25-
2626
// Configuration
2727
// _____________________________________________
2828

@@ -318,7 +318,8 @@ module.exports = function (grunt) {
318318

319319
cssmin: {
320320
options: {
321-
report: 'gzip'
321+
report: 'gzip',
322+
keepSpecialComments: 0
322323
},
323324
setup: {
324325
files: {
@@ -342,6 +343,20 @@ module.exports = function (grunt) {
342343
}
343344
},
344345

346+
// Concatenation
347+
// ---------------------------------------------
348+
349+
concat: {
350+
options: {
351+
stripBanners: true,
352+
banner: '/**\n * Copyright © <%= grunt.template.today("yyyy") %> Magento. All rights reserved.\n * See COPYING.txt for license details.\n */\n'
353+
},
354+
setup: {
355+
src: '<%= path.css.setup %>/setup.css',
356+
dest: '<%= path.css.setup %>/setup.css'
357+
}
358+
},
359+
345360

346361
// Watches files for changes and runs tasks based on the changed files
347362
// ---------------------------------------------
@@ -545,7 +560,8 @@ module.exports = function (grunt) {
545560
grunt.task.run([
546561
'less:' + component,
547562
'autoprefixer:' + component,
548-
'cssmin:' + component
563+
'cssmin:' + component,
564+
'concat:' + component
549565
]);
550566
}
551567
if (component == undefined) {

app/bootstrap.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@
1212
umask(0);
1313

1414
/* PHP version validation */
15-
if (version_compare(phpversion(), '5.4.11', '<') === true) {
15+
if (version_compare(phpversion(), '5.5.0', '<') === true) {
1616
if (PHP_SAPI == 'cli') {
17-
echo 'Magento supports PHP 5.4.11 or later. ' .
17+
echo 'Magento supports PHP 5.5.0 or later. ' .
1818
'Please read http://devdocs.magento.com/guides/v1.0/install-gde/system-requirements.html';
1919
} else {
2020
echo <<<HTML
2121
<div style="font:12px/1.35em arial, helvetica, sans-serif;">
22-
<p>Magento supports PHP 5.4.11 or later. Please read
22+
<p>Magento supports PHP 5.5.0 or later. Please read
2323
<a target="_blank" href="http://devdocs.magento.com/guides/v1.0/install-gde/system-requirements.html">
2424
Magento System Requirements</a>.
2525
</div>

app/code/Magento/AdminNotification/Block/System/Messages/UnreadMessagePopup.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public function getUnreadMessages()
6666
/**
6767
* Retrieve popup title
6868
*
69-
* @return string
69+
* @return \Magento\Framework\Phrase
7070
*/
7171
public function getPopupTitle()
7272
{

app/code/Magento/AdminNotification/Model/System/Message/Baseurl.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class Baseurl implements \Magento\Framework\Notification\MessageInterface
2121
protected $_config;
2222

2323
/**
24-
* @var \Magento\Framework\Store\StoreManagerInterface
24+
* @var \Magento\Store\Model\StoreManagerInterface
2525
*/
2626
protected $_storeManager;
2727

@@ -32,13 +32,13 @@ class Baseurl implements \Magento\Framework\Notification\MessageInterface
3232

3333
/**
3434
* @param \Magento\Framework\App\Config\ScopeConfigInterface $config
35-
* @param \Magento\Framework\Store\StoreManagerInterface $storeManager
35+
* @param \Magento\Store\Model\StoreManagerInterface $storeManager
3636
* @param \Magento\Framework\UrlInterface $urlBuilder
3737
* @param \Magento\Framework\App\Config\ValueFactory $configValueFactory
3838
*/
3939
public function __construct(
4040
\Magento\Framework\App\Config\ScopeConfigInterface $config,
41-
\Magento\Framework\Store\StoreManagerInterface $storeManager,
41+
\Magento\Store\Model\StoreManagerInterface $storeManager,
4242
\Magento\Framework\UrlInterface $urlBuilder,
4343
\Magento\Framework\App\Config\ValueFactory $configValueFactory
4444
) {
@@ -114,7 +114,7 @@ public function isDisplayed()
114114
/**
115115
* Retrieve message text
116116
*
117-
* @return string
117+
* @return \Magento\Framework\Phrase
118118
*/
119119
public function getText()
120120
{

app/code/Magento/AdminNotification/Model/System/Message/CacheOutdated.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public function getIdentity()
6969
public function isDisplayed()
7070
{
7171
return $this->_authorization->isAllowed(
72-
'Magento_Adminhtml::cache'
72+
'Magento_Backend::cache'
7373
) && count(
7474
$this->_getCacheTypesForRefresh()
7575
) > 0;

app/code/Magento/AdminNotification/Model/System/Message/Media/Synchronization/Error.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ protected function _shouldBeDisplayed()
3131
/**
3232
* Retrieve message text
3333
*
34-
* @return string
34+
* @return \Magento\Framework\Phrase
3535
*/
3636
public function getText()
3737
{

app/code/Magento/AdminNotification/Model/System/Message/Media/Synchronization/Success.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ protected function _shouldBeDisplayed()
3030
/**
3131
* Retrieve message text
3232
*
33-
* @return string
33+
* @return \Magento\Framework\Phrase
3434
*/
3535
public function getText()
3636
{

app/code/Magento/AdminNotification/Model/System/Message/Security.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ public function isDisplayed()
129129
/**
130130
* Retrieve message text
131131
*
132-
* @return string
132+
* @return \Magento\Framework\Phrase
133133
*/
134134
public function getText()
135135
{

0 commit comments

Comments
 (0)