Skip to content

Commit 25764b8

Browse files
author
Natalia Momotenko
committed
Merge remote-tracking branch 'magento2ce/develop' into develop
2 parents dacb7db + 5dde4a3 commit 25764b8

File tree

390 files changed

+3512
-2229
lines changed

Some content is hidden

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

390 files changed

+3512
-2229
lines changed

‎.travis.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ language: php
22
php:
33
- 5.4
44
- 5.5
5+
- 5.6
56
env:
67
- TEST_SUITE=unit
78
- TEST_SUITE=integration
@@ -14,6 +15,10 @@ matrix:
1415
env: TEST_SUITE=static_phpcs
1516
- php: 5.4
1617
env: TEST_SUITE=static_annotation
18+
- php: 5.6
19+
env: TEST_SUITE=static_phpcs
20+
- php: 5.6
21+
env: TEST_SUITE=static_annotation
1722
before_install:
1823
- sudo apt-get update -qq
1924
- sudo apt-get install -y -qq postfix

‎app/bootstrap.php

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,14 @@
1414
/* PHP version validation */
1515
if (version_compare(phpversion(), '5.4.11', '<') === true) {
1616
if (PHP_SAPI == 'cli') {
17-
echo 'Magento supports PHP 5.4.11 or newer. Please read http://www.magento.com/install.';
17+
echo 'Magento supports PHP 5.4.11 or later. ' .
18+
'Please read http://devdocs.magento.com/guides/v1.0/install-gde/system-requirements.html';
1819
} else {
1920
echo <<<HTML
2021
<div style="font:12px/1.35em arial, helvetica, sans-serif;">
21-
<div style="margin:0 0 25px 0; border-bottom:1px solid #ccc;">
22-
<h3 style="margin:0;font-size:1.7em;font-weight:normal;text-transform:none;text-align:left;color:#2f2f2f;">
23-
Whoops, it looks like you have an invalid PHP version.</h3>
24-
</div>
25-
<p>Magento supports PHP 5.4.11 or newer.
22+
<p>Magento supports PHP 5.4.11 or later. Please read
23+
<a target="_blank" href="http://devdocs.magento.com/guides/v1.0/install-gde/system-requirements.html">
24+
Magento System Requirements</a>.
2625
</div>
2726
HTML;
2827
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "magento/module-admin-notification",
33
"description": "N/A",
44
"require": {
5-
"php": "~5.4.11|~5.5.0",
5+
"php": "~5.4.11|~5.5.0|~5.6.0",
66
"magento/module-store": "0.42.0-beta3",
77
"magento/module-core": "0.42.0-beta3",
88
"magento/module-backend": "0.42.0-beta3",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "magento/module-authorization",
33
"description": "Authorization module provides access to Magento ACL functionality.",
44
"require": {
5-
"php": "~5.4.11|~5.5.0",
5+
"php": "~5.4.11|~5.5.0|~5.6.0",
66
"magento/module-backend": "0.42.0-beta3",
77
"magento/framework": "0.42.0-beta3",
88
"magento/magento-composer-installer": "*"

‎app/code/Magento/Authorization/sql/authorization_setup/install-2.0.0.php

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,7 @@
99

1010
$installer->startSetup();
1111

12-
if ($installer->getConnection()->isTableExists($installer->getTable('admin_role'))) {
13-
/**
14-
* Rename existing 'admin_role' table into 'authorization_role' (to avoid forcing Magento re-installation)
15-
* TODO: This conditional logic can be removed some time after pull request is delivered to the mainline
16-
*/
17-
$installer->getConnection()->renameTable(
18-
$installer->getTable('admin_role'),
19-
$installer->getTable('authorization_role')
20-
);
21-
} elseif (!$installer->getConnection()->isTableExists($installer->getTable('authorization_role'))) {
12+
if (!$installer->getConnection()->isTableExists($installer->getTable('authorization_role'))) {
2213
/**
2314
* Create table 'authorization_role'
2415
*/
@@ -84,16 +75,7 @@
8475
$installer->getConnection()->createTable($table);
8576
}
8677

87-
if ($installer->getConnection()->isTableExists($installer->getTable('admin_rule'))) {
88-
/**
89-
* Rename existing 'admin_rule' table into 'authorization_rule' (to avoid forcing Magento re-installation)
90-
* TODO: This conditional logic can be removed some time after pull request is delivered to the mainline
91-
*/
92-
$installer->getConnection()->renameTable(
93-
$installer->getTable('admin_rule'),
94-
$installer->getTable('authorization_rule')
95-
);
96-
} elseif (!$installer->getConnection()->isTableExists($installer->getTable('authorization_rule'))) {
78+
if (!$installer->getConnection()->isTableExists($installer->getTable('authorization_rule'))) {
9779
/**
9880
* Create table 'authorization_rule'
9981
*/

‎app/code/Magento/Backend/Controller/Adminhtml/System/Account/Save.php

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,9 @@ public function execute()
5454

5555
if ($this->_objectManager->get('Magento\Framework\Locale\Validator')->isValid($interfaceLocale)) {
5656
$user->setInterfaceLocale($interfaceLocale);
57-
$this->_objectManager->get(
58-
'Magento\Backend\Model\Locale\Manager'
59-
)->switchBackendInterfaceLocale(
60-
$interfaceLocale
61-
);
57+
/** @var \Magento\Backend\Model\Locale\Manager $localeManager */
58+
$localeManager = $this->_objectManager->get('Magento\Backend\Model\Locale\Manager');
59+
$localeManager->switchBackendInterfaceLocale($interfaceLocale);
6260
}
6361
/** Before updating admin user data, ensure that password of current admin user is entered and is correct */
6462
$currentUserPasswordField = \Magento\User\Block\User\Edit\Tab\Main::CURRENT_USER_PASSWORD_FIELD;
@@ -75,7 +73,10 @@ public function execute()
7573
$user->setPasswordConfirmation($passwordConfirmation);
7674
}
7775
$user->save();
78-
$user->sendPasswordResetNotificationEmail();
76+
/** Send password reset email notification only when password was changed */
77+
if ($password !== '') {
78+
$user->sendPasswordResetNotificationEmail();
79+
}
7980
$this->messageManager->addSuccess(__('The account has been saved.'));
8081
} catch (\Magento\Framework\Model\Exception $e) {
8182
$this->messageManager->addMessages($e->getMessages());

‎app/code/Magento/Backend/Controller/Adminhtml/System/Config/Save.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,10 @@ public function execute()
186186
$resultRedirect = $this->resultRedirectFactory->create();
187187
return $resultRedirect->setPath(
188188
'adminhtml/system_config/edit',
189-
['_current' => ['section', 'website', 'store']]
189+
[
190+
'_current' => ['section', 'website', 'store'],
191+
'_nosid' => true
192+
]
190193
);
191194
}
192195
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "magento/module-backend",
33
"description": "N/A",
44
"require": {
5-
"php": "~5.4.11|~5.5.0",
5+
"php": "~5.4.11|~5.5.0|~5.6.0",
66
"magento/module-store": "0.42.0-beta3",
77
"magento/module-directory": "0.42.0-beta3",
88
"magento/module-core": "0.42.0-beta3",

‎app/code/Magento/Backend/view/adminhtml/requirejs-config.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
var config = {
77
map: {
88
'*': {
9+
editTrigger: 'mage/edit-trigger',
910
translateInline: 'mage/translate-inline',
1011
form: 'mage/backend/form',
1112
button: 'mage/backend/button',
@@ -37,4 +38,4 @@ var config = {
3738
paths: {
3839
"jquery/ui": "jquery/jquery-ui-1.9.2"
3940
}
40-
};
41+
};

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "magento/module-backup",
33
"description": "N/A",
44
"require": {
5-
"php": "~5.4.11|~5.5.0",
5+
"php": "~5.4.11|~5.5.0|~5.6.0",
66
"magento/module-store": "0.42.0-beta3",
77
"magento/module-core": "0.42.0-beta3",
88
"magento/module-backend": "0.42.0-beta3",

0 commit comments

Comments
 (0)