Skip to content

Commit 7e7e1e9

Browse files
author
Natalia Momotenko
committed
Merge remote-tracking branch 'origin/develop' into UI
2 parents fa33312 + ba82edc commit 7e7e1e9

File tree

745 files changed

+8166
-11387
lines changed

Some content is hidden

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

745 files changed

+8166
-11387
lines changed

CHANGELOG.md

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,38 @@
1+
0.42.0-beta9
2+
=============
3+
* Framework Improvements:
4+
* Layout Models are moved from Core module to appropriate modules
5+
* View components are moved from Core to Theme module
6+
* Rest of theme related configuration files are refactored
7+
* StoreManagerInterface is moved from Framework to App folder
8+
* ZF1 controller libraries are updated
9+
* Class definitions in multi-tenant mode are removed
10+
* DI configuration became more optimal: OM cached configuration uses the general pattern for all argument types in application
11+
* Varnish 4 configuration is updated
12+
* Layout Processing became more fast
13+
* HTML response minified
14+
* App Components and Specific Helper Components are moved from the Magento_Core Module
15+
* UI improvements:
16+
* Add to cart operation became asynchronous and doesn`t reload page (AJAX call)
17+
* Fixed Defects:
18+
* When Inline Translation is enabled, JQuery buttons for translate were broken
19+
* Base URL has invalid place inside Magento Admin Address on "Web Configuration" step of installation wizard
20+
* Inability of submit Product from keyboard while Product Creation
21+
* Sold products aren't displayed in Bestsellers
22+
* Compiled definitions can cause unexpected errors compared to runtime definitions
23+
* Accessibility improvements:
24+
* WAI-ARIA attributes are added to Frontend Layered Navigation and Customer Dropdown, Frontend Product Page Tabs, Frontend Cart Summary collapsible panels, Frontend forms and notifications, Frontend Checkout pages
25+
* Tests improvements:
26+
* Added mechanism of replacing 3-rd party credentials in functional tests
27+
* Update of end-to-end tests for create product, update product, promoted product, out of stock product, create product with new category, unassign products on category, create backend customer with injectable test
28+
* Various improvements:
29+
* JS template engine became unified on Backend and Frontend
30+
* Increased unit test coverage for Magento/Indexer module
31+
* Version number info became accessible at a public URL
32+
* GitHub requests:
33+
* [#1027](https://github.com/magento/magento2/issues/1027) -- Can't add new subctegory
34+
* [#921](https://github.com/magento/magento2/issues/921) -- Change resource ids from Magento_Adminhtml::* to Magento_Backend
35+
136
0.42.0-beta8
237
=============
338
* Various improvements:

app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/AjaxMarkAsRead.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class AjaxMarkAsRead extends \Magento\AdminNotification\Controller\Adminhtml\Not
1515
*/
1616
public function execute()
1717
{
18-
if (!$this->getRequest()->getPost()) {
18+
if (!$this->getRequest()->getPostValue()) {
1919
return;
2020
}
2121
$notificationId = (int)$this->getRequest()->getPost('id');

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

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -202,8 +202,7 @@ public function dispatch(\Magento\Framework\App\RequestInterface $request)
202202
}
203203

204204
if ($request->isDispatched() && $request->getActionName() !== 'denied' && !$this->_isAllowed()) {
205-
$this->_response->setHeader('HTTP/1.1', '403 Forbidden');
206-
$this->_response->setHttpResponseCode(403);
205+
$this->_response->setStatusHeader(403, '1.1', 'Forbidden');
207206
if (!$this->_auth->isLoggedIn()) {
208207
return $this->_redirect('*/auth/login');
209208
}

app/code/Magento/Backend/App/Action/Plugin/Authentication.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ protected function _performLogin(\Magento\Framework\App\RequestInterface $reques
163163
$postLogin = $request->getPost('login');
164164
$username = isset($postLogin['username']) ? $postLogin['username'] : '';
165165
$password = isset($postLogin['password']) ? $postLogin['password'] : '';
166-
$request->setPost('login', null);
166+
$request->setPostValue('login', null);
167167

168168
try {
169169
$this->_auth->login($username, $password);

app/code/Magento/Backend/App/Action/Plugin/MassactionKey.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public function aroundDispatch(
2828
if ($key) {
2929
$postData = $request->getPost($key);
3030
$value = is_array($postData) ? $postData : explode(',', $postData);
31-
$request->setPost($key, $value ? $value : null);
31+
$request->setPostValue($key, $value ? $value : null);
3232
}
3333
return $proceed($request);
3434
}

app/code/Magento/Backend/Controller/Adminhtml/Denied.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,12 @@ public function execute()
4141
if (!$this->_auth->isLoggedIn()) {
4242
/** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
4343
$resultRedirect = $this->resultRedirectFactory->create();
44-
$resultRedirect->setHeader('HTTP/1.1', '403 Forbidden');
44+
$resultRedirect->setStatusHeader(403, '1.1', 'Forbidden');
4545
return $resultRedirect->setPath('*/auth/login');
4646
}
4747
/** @var \Magento\Backend\Model\View\Result\Page $resultPage */
4848
$resultPage = $this->resultPageFactory->create();
49-
$resultPage->setHeader('HTTP/1.1', '403 Forbidden');
49+
$resultPage->setStatusHeader(403, '1.1', 'Forbidden');
5050
$resultPage->addHandle('adminhtml_denied');
5151
return $resultPage;
5252
}

app/code/Magento/Backend/Controller/Adminhtml/Noroute/Index.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public function execute()
3434
{
3535
/** @var \Magento\Backend\Model\View\Result\Page $resultPage */
3636
$resultPage = $this->resultPageFactory->create();
37-
$resultPage->setHeader('HTTP/1.1', '404 Not Found');
37+
$resultPage->setStatusHeader(404, '1.1', 'Forbidden');
3838
$resultPage->setHeader('Status', '404 File not found');
3939
$resultPage->addHandle('adminhtml_noroute');
4040
return $resultPage;

app/code/Magento/Backend/Controller/Adminhtml/System/Design/Save.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ protected function _filterPostData($data)
3030
*/
3131
public function execute()
3232
{
33-
$data = $this->getRequest()->getPost();
33+
$data = $this->getRequest()->getPostValue();
3434
/** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
3535
$resultRedirect = $this->resultRedirectFactory->create();
3636

0 commit comments

Comments
 (0)