Skip to content

Commit 184873d

Browse files
author
Sergey Semenov
committed
Merge remote-tracking branch 'origin/MAGETWO-33073' into MAGETWO-32690
Conflicts: app/code/Magento/Review/Controller/Adminhtml/Product/Post.php app/etc/di.xml dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_classes.php dev/tests/unit/testsuite/Magento/Checkout/Model/Type/OnepageTest.php
2 parents 5ae9776 + c91207a commit 184873d

File tree

170 files changed

+1607
-1035
lines changed

Some content is hidden

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

170 files changed

+1607
-1035
lines changed

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/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/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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public function execute()
1717
{
1818
/** @var \Magento\Backend\Model\View\Result\Redirect $redirectResult */
1919
$redirectResult = $this->resultRedirectFactory->create();
20-
if ($this->getRequest()->isPost() && ($postData = $this->getRequest()->getPost())) {
20+
if ($this->getRequest()->isPost() && ($postData = $this->getRequest()->getPostValue())) {
2121
if (empty($postData['store_type']) || empty($postData['store_action'])) {
2222
$redirectResult->setPath('adminhtml/*/');
2323
return $redirectResult;

app/code/Magento/Captcha/Model/Observer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ public function checkUserCreate($observer)
204204
if (!$captchaModel->isCorrect($this->_getCaptchaString($controller->getRequest(), $formId))) {
205205
$this->messageManager->addError(__('Incorrect CAPTCHA'));
206206
$this->_actionFlag->set('', \Magento\Framework\App\Action\Action::FLAG_NO_DISPATCH, true);
207-
$this->_session->setCustomerFormData($controller->getRequest()->getPost());
207+
$this->_session->setCustomerFormData($controller->getRequest()->getPostValue());
208208
$url = $this->_urlManager->getUrl('*/*/create', ['_nosecret' => true]);
209209
$controller->getResponse()->setRedirect($this->redirect->error($url));
210210
}

app/code/Magento/Catalog/Controller/Adminhtml/Category/Save.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ public function execute()
8585

8686
$storeId = $this->getRequest()->getParam('store');
8787
$refreshTree = false;
88-
$data = $this->getRequest()->getPost();
88+
$data = $this->getRequest()->getPostValue();
8989
if ($data) {
9090
$category->addData($this->_filterCategoryPostData($data['general']));
9191
if (!$category->getId()) {

app/code/Magento/Catalog/Controller/Adminhtml/Product/Attribute/Save.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ public function __construct(
9696
*/
9797
public function execute()
9898
{
99-
$data = $this->getRequest()->getPost();
99+
$data = $this->getRequest()->getPostValue();
100100
$resultRedirect = $this->resultRedirectFactory->create();
101101
if ($data) {
102102
$setId = $this->getRequest()->getParam('set');

app/code/Magento/Catalog/Controller/Adminhtml/Product/Save.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public function execute()
6767
$productId = $this->getRequest()->getParam('id');
6868
$resultRedirect = $this->resultRedirectFactory->create();
6969

70-
$data = $this->getRequest()->getPost();
70+
$data = $this->getRequest()->getPostValue();
7171
if ($data) {
7272
try {
7373
$product = $this->initializationHelper->initialize($this->productBuilder->build($this->getRequest()));

app/code/Magento/Catalog/Controller/Product/Gallery.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,8 @@ public function execute()
5656
{
5757
$result = null;
5858
if (!$this->_initProduct()) {
59-
if (isset($_GET['store']) && !$this->getResponse()->isRedirect()) {
59+
$store = $this->getRequest()->getQuery('store');
60+
if (isset($store) && !$this->getResponse()->isRedirect()) {
6061
$result = $this->resultRedirectFactory->create();
6162
$result->setPath('');
6263
} elseif (!$this->getResponse()->isRedirect()) {

0 commit comments

Comments
 (0)