Skip to content

Commit 586ac3b

Browse files
arkadiycharkadiych
committed
Merge remote-tracking branch 'mainline/develop' into MAGETWO-33618-Redirect-To-Config-Dashboard
2 parents 2105fe3 + 986ab1c commit 586ac3b

File tree

1,054 files changed

+15779
-9061
lines changed

Some content is hidden

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

1,054 files changed

+15779
-9061
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ atlassian*
1010
/.gitattributes
1111
/app/config_sandbox
1212
/app/etc/config.php
13+
/app/etc/env.php
1314
/app/code/Magento/TestModule*
1415
/lib/internal/flex/uploader/.actionScriptProperties
1516
/lib/internal/flex/uploader/.flexProperties

‎.htaccess

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,4 +188,4 @@
188188
## If running in cluster environment, uncomment this
189189
## http://developer.yahoo.com/performance/rules.html#etags
190190

191-
#FileETag none
191+
#FileETag none

‎CHANGELOG.md

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,38 @@
1+
0.74.0-beta9
2+
=============
3+
* Framework improvements
4+
* Magento became compatible with MySQL Cluster
5+
* Zend Framework 2 is upgraded up to version 2.4.0
6+
* Various
7+
* Updated payments infrastructure so it can use transparent redirects
8+
* Defined public API for Tax/Pricing components
9+
* Refactored controller actions in the Product area
10+
* Moved commands cache.php, indexer.php, log.php, test.php, compiler.php, singletenant\_compiler.php, generator.php, pack.php, deploy.php and file\_assembler.php to the new bin/magento CLI framework
11+
* Data Migration Tool
12+
* The Data Migraiton Tool is published in the separate [repository](https://github.com/magento/data-migration-tool-ce, "Data Migration Tool repository")
13+
* Fixed bugs
14+
* Fixed an issue where error appeared during placing order with virtual product
15+
* Fixed an issue where billing and shipping sections didn't contain address information on order print
16+
* Fixed an issue where fatal error appeared on Catalog page on backend for user with custom role scope
17+
* Fixed an issue where product could not be found in search results when the website was assigned after product creation
18+
* Fixed an issue where shopping cart was empty after attempt to update it
19+
* Fixed an issue where there was no redirect to shopping cart after edit/updating cart product with custom options
20+
* Fixed an issue where environment variables were messed up for different entry points
21+
* Fixed an issue where tax class name was corrupted if containing '<' char
22+
* Fixed an issue where there was no ability to place an order with custom option "file"
23+
* Fixed an issue where sensitive cookies were persistent
24+
* Fixed possible XSS in payment methods
25+
* Fixed an issue with integration test failure when run in default mode
26+
* Fixed an issue with integration tests failure when xdebug is enabled
27+
* Fixed an issue where there was impossible to delete any entity which calls confirmation alert
28+
* GitHub issues and pull requests
29+
* [#904](https://github.com/magento/magento2/issues/904) -- Installation Incomplete with XDebug enabled
30+
* [#1083](https://github.com/magento/magento2/pull/1083) -- Move Topmenu CategoryData creation to a public method to enable plugin
31+
* [#1125](https://github.com/magento/magento2/pull/1125) -- Saving category reset its changes in category tree
32+
* [#1144](https://github.com/magento/magento2/pull/1144) -- Refactor bindRemoveButtons for improved performance
33+
* [#1214](https://github.com/magento/magento2/pull/1214) -- Avoid following error
34+
* [#1216](https://github.com/magento/magento2/issues/1216) -- Can't install sample data
35+
136
0.74.0-beta8
237
=============
338
* Performance Toolkit improvements

‎app/code/Magento/AdminNotification/Model/Feed.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*/
66
namespace Magento\AdminNotification\Model;
77

8-
use Magento\Framework\Config\ConfigOptionsList;
8+
use Magento\Framework\Config\ConfigOptionsListConstants;
99

1010
/**
1111
* AdminNotification Feed model
@@ -137,7 +137,7 @@ public function checkUpdate()
137137

138138
$feedXml = $this->getFeedData();
139139

140-
$installDate = strtotime($this->_deploymentConfig->get(ConfigOptionsList::CONFIG_PATH_INSTALL_DATE));
140+
$installDate = strtotime($this->_deploymentConfig->get(ConfigOptionsListConstants::CONFIG_PATH_INSTALL_DATE));
141141

142142
if ($feedXml && $feedXml->channel && $feedXml->channel->item) {
143143
foreach ($feedXml->channel->item as $item) {

‎app/code/Magento/AdminNotification/Test/Unit/Model/FeedTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
namespace Magento\AdminNotification\Test\Unit\Model;
88

99
use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
10-
use Magento\Framework\Config\ConfigOptionsList;
10+
use Magento\Framework\Config\ConfigOptionsListConstants;
1111

1212
/**
1313
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -141,7 +141,7 @@ public function testCheckUpdate($callInbox, $curlRequest)
141141
$this->backendConfig->expects($this->at(1))->method('getValue')
142142
->will($this->returnValue('http://feed.magento.com'));
143143
$this->deploymentConfig->expects($this->once())->method('get')
144-
->with(ConfigOptionsList::CONFIG_PATH_INSTALL_DATE)
144+
->with(ConfigOptionsListConstants::CONFIG_PATH_INSTALL_DATE)
145145
->will($this->returnValue('Sat, 6 Sep 2014 16:46:11 UTC'));
146146
if ($callInbox) {
147147
$this->inboxFactory->expects($this->once())->method('create')

‎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.5.0|~5.6.0",
6-
"magento/module-store": "0.74.0-beta8",
7-
"magento/module-backend": "0.74.0-beta8",
8-
"magento/module-media-storage": "0.74.0-beta8",
9-
"magento/framework": "0.74.0-beta8",
6+
"magento/module-store": "0.74.0-beta9",
7+
"magento/module-backend": "0.74.0-beta9",
8+
"magento/module-media-storage": "0.74.0-beta9",
9+
"magento/framework": "0.74.0-beta9",
1010
"lib-libxml": "*",
1111
"magento/magento-composer-installer": "*"
1212
},
1313
"type": "magento2-module",
14-
"version": "0.74.0-beta8",
14+
"version": "0.74.0-beta9",
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.5.0|~5.6.0",
6-
"magento/module-backend": "0.74.0-beta8",
7-
"magento/framework": "0.74.0-beta8",
6+
"magento/module-backend": "0.74.0-beta9",
7+
"magento/framework": "0.74.0-beta9",
88
"magento/magento-composer-installer": "*"
99
},
1010
"type": "magento2-module",
11-
"version": "0.74.0-beta8",
11+
"version": "0.74.0-beta9",
1212
"license": [
1313
"OSL-3.0",
1414
"AFL-3.0"

‎app/code/Magento/Backend/App/AbstractAction.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@ public function _processUrlKeys()
285285
protected function _processLocaleSettings()
286286
{
287287
$forceLocale = $this->getRequest()->getParam('locale', null);
288-
if ($this->_objectManager->get('Magento\Framework\Locale\Validator')->isValid($forceLocale)) {
288+
if ($this->_objectManager->get('Magento\Framework\Validator\Locale')->isValid($forceLocale)) {
289289
$this->_getSession()->setSessionLocale($forceLocale);
290290
}
291291

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public function execute()
3333
->setLastname($this->getRequest()->getParam('lastname', false))
3434
->setEmail(strtolower($this->getRequest()->getParam('email', false)));
3535

36-
if ($this->_objectManager->get('Magento\Framework\Locale\Validator')->isValid($interfaceLocale)) {
36+
if ($this->_objectManager->get('Magento\Framework\Validator\Locale')->isValid($interfaceLocale)) {
3737
$user->setInterfaceLocale($interfaceLocale);
3838
/** @var \Magento\Backend\Model\Locale\Manager $localeManager */
3939
$localeManager = $this->_objectManager->get('Magento\Backend\Model\Locale\Manager');

‎app/code/Magento/Backend/Helper/Dashboard/Data.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
namespace Magento\Backend\Helper\Dashboard;
77

88
use Magento\Framework\App\DeploymentConfig;
9-
use Magento\Framework\Config\ConfigOptionsList;
9+
use Magento\Framework\Config\ConfigOptionsListConstants;
1010

1111
/**
1212
* Data helper for dashboard
@@ -41,7 +41,7 @@ public function __construct(
4141
parent::__construct(
4242
$context
4343
);
44-
$this->_installDate = $deploymentConfig->get(ConfigOptionsList::CONFIG_PATH_INSTALL_DATE);
44+
$this->_installDate = $deploymentConfig->get(ConfigOptionsListConstants::CONFIG_PATH_INSTALL_DATE);
4545
$this->_storeManager = $storeManager;
4646
}
4747

0 commit comments

Comments
 (0)