Skip to content
This repository was archived by the owner on Apr 29, 2019. It is now read-only.

Commit 128724f

Browse files
eduard13eduard13
committed
Merge branch '2.2-develop' into 2.2-develop-13747
# Conflicts: # app/code/Magento/Backend/Block/Media/Uploader.php
2 parents 0f63017 + 08b8956 commit 128724f

File tree

664 files changed

+12751
-3098
lines changed

Some content is hidden

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

664 files changed

+12751
-3098
lines changed

‎app/bootstrap.php

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,16 @@
5454
&& isset($_SERVER['HTTP_ACCEPT'])
5555
&& strpos($_SERVER['HTTP_ACCEPT'], 'text/html') !== false
5656
) {
57-
$profilerFlag = isset($_SERVER['MAGE_PROFILER']) && strlen($_SERVER['MAGE_PROFILER'])
57+
$profilerConfig = isset($_SERVER['MAGE_PROFILER']) && strlen($_SERVER['MAGE_PROFILER'])
5858
? $_SERVER['MAGE_PROFILER']
5959
: trim(file_get_contents(BP . '/var/profiler.flag'));
6060

61-
\Magento\Framework\Profiler::applyConfig(
62-
$profilerFlag,
61+
if ($profilerConfig) {
62+
$profilerConfig = json_decode($profilerConfig, true) ?: $profilerConfig;
63+
}
64+
65+
Magento\Framework\Profiler::applyConfig(
66+
$profilerConfig,
6367
BP,
6468
!empty($_SERVER['HTTP_X_REQUESTED_WITH']) && $_SERVER['HTTP_X_REQUESTED_WITH'] == 'XMLHttpRequest'
6569
);

‎app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MarkAsRead.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@ public function execute()
2828
)->markAsRead(
2929
$notificationId
3030
);
31-
$this->messageManager->addSuccess(__('The message has been marked as Read.'));
31+
$this->messageManager->addSuccessMessage(__('The message has been marked as Read.'));
3232
} catch (\Magento\Framework\Exception\LocalizedException $e) {
33-
$this->messageManager->addError($e->getMessage());
33+
$this->messageManager->addErrorMessage($e->getMessage());
3434
} catch (\Exception $e) {
35-
$this->messageManager->addException(
35+
$this->messageManager->addExceptionMessage(
3636
$e,
3737
__("We couldn't mark the notification as Read because of an error.")
3838
);

‎app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MassMarkAsRead.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public function execute()
2323
{
2424
$ids = $this->getRequest()->getParam('notification');
2525
if (!is_array($ids)) {
26-
$this->messageManager->addError(__('Please select messages.'));
26+
$this->messageManager->addErrorMessage(__('Please select messages.'));
2727
} else {
2828
try {
2929
foreach ($ids as $id) {
@@ -32,13 +32,13 @@ public function execute()
3232
$model->setIsRead(1)->save();
3333
}
3434
}
35-
$this->messageManager->addSuccess(
35+
$this->messageManager->addSuccessMessage(
3636
__('A total of %1 record(s) have been marked as Read.', count($ids))
3737
);
3838
} catch (\Magento\Framework\Exception\LocalizedException $e) {
39-
$this->messageManager->addError($e->getMessage());
39+
$this->messageManager->addErrorMessage($e->getMessage());
4040
} catch (\Exception $e) {
41-
$this->messageManager->addException(
41+
$this->messageManager->addExceptionMessage(
4242
$e,
4343
__("We couldn't mark the notification as Read because of an error.")
4444
);

‎app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MassRemove.php

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public function execute()
2323
{
2424
$ids = $this->getRequest()->getParam('notification');
2525
if (!is_array($ids)) {
26-
$this->messageManager->addError(__('Please select messages.'));
26+
$this->messageManager->addErrorMessage(__('Please select messages.'));
2727
} else {
2828
try {
2929
foreach ($ids as $id) {
@@ -32,11 +32,12 @@ public function execute()
3232
$model->setIsRemove(1)->save();
3333
}
3434
}
35-
$this->messageManager->addSuccess(__('Total of %1 record(s) have been removed.', count($ids)));
35+
$this->messageManager->addSuccessMessage(__('Total of %1 record(s) have been removed.', count($ids)));
3636
} catch (\Magento\Framework\Exception\LocalizedException $e) {
37-
$this->messageManager->addError($e->getMessage());
37+
$this->messageManager->addErrorMessage($e->getMessage());
3838
} catch (\Exception $e) {
39-
$this->messageManager->addException($e, __("We couldn't remove the messages because of an error."));
39+
$this->messageManager
40+
->addExceptionMessage($e, __("We couldn't remove the messages because of an error."));
4041
}
4142
}
4243
$this->_redirect('adminhtml/*/');

‎app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/Remove.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,12 @@ public function execute()
3131

3232
try {
3333
$model->setIsRemove(1)->save();
34-
$this->messageManager->addSuccess(__('The message has been removed.'));
34+
$this->messageManager->addSuccessMessage(__('The message has been removed.'));
3535
} catch (\Magento\Framework\Exception\LocalizedException $e) {
36-
$this->messageManager->addError($e->getMessage());
36+
$this->messageManager->addErrorMessage($e->getMessage());
3737
} catch (\Exception $e) {
38-
$this->messageManager->addException($e, __("We couldn't remove the messages because of an error."));
38+
$this->messageManager
39+
->addExceptionMessage($e, __("We couldn't remove the messages because of an error."));
3940
}
4041

4142
$this->_redirect('adminhtml/*/');

‎app/code/Magento/AdvancedPricingImportExport/Controller/Adminhtml/Export/GetFilter.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@ public function execute()
3737
);
3838
return $resultLayout;
3939
} catch (\Exception $e) {
40-
$this->messageManager->addError($e->getMessage());
40+
$this->messageManager->addErrorMessage($e->getMessage());
4141
}
4242
} else {
43-
$this->messageManager->addError(__('Please correct the data sent.'));
43+
$this->messageManager->addErrorMessage(__('Please correct the data sent.'));
4444
}
4545
/** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
4646
$resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);

‎app/code/Magento/Authorizenet/Model/Directpost/Request.php

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -112,50 +112,50 @@ public function setDataFromOrder(
112112
sprintf('%.2F', $order->getBaseShippingAmount())
113113
);
114114

115-
//need to use strval() because NULL values IE6-8 decodes as "null" in JSON in JavaScript,
115+
//need to use (string) because NULL values IE6-8 decodes as "null" in JSON in JavaScript,
116116
//but we need "" for null values.
117117
$billing = $order->getBillingAddress();
118118
if (!empty($billing)) {
119-
$this->setXFirstName(strval($billing->getFirstname()))
120-
->setXLastName(strval($billing->getLastname()))
121-
->setXCompany(strval($billing->getCompany()))
122-
->setXAddress(strval($billing->getStreetLine(1)))
123-
->setXCity(strval($billing->getCity()))
124-
->setXState(strval($billing->getRegion()))
125-
->setXZip(strval($billing->getPostcode()))
126-
->setXCountry(strval($billing->getCountryId()))
127-
->setXPhone(strval($billing->getTelephone()))
128-
->setXFax(strval($billing->getFax()))
129-
->setXCustId(strval($billing->getCustomerId()))
130-
->setXCustomerIp(strval($order->getRemoteIp()))
131-
->setXCustomerTaxId(strval($billing->getTaxId()))
132-
->setXEmail(strval($order->getCustomerEmail()))
133-
->setXEmailCustomer(strval($paymentMethod->getConfigData('email_customer')))
134-
->setXMerchantEmail(strval($paymentMethod->getConfigData('merchant_email')));
119+
$this->setXFirstName((string)$billing->getFirstname())
120+
->setXLastName((string)$billing->getLastname())
121+
->setXCompany((string)$billing->getCompany())
122+
->setXAddress((string)$billing->getStreetLine(1))
123+
->setXCity((string)$billing->getCity())
124+
->setXState((string)$billing->getRegion())
125+
->setXZip((string)$billing->getPostcode())
126+
->setXCountry((string)$billing->getCountryId())
127+
->setXPhone((string)$billing->getTelephone())
128+
->setXFax((string)$billing->getFax())
129+
->setXCustId((string)$billing->getCustomerId())
130+
->setXCustomerIp((string)$order->getRemoteIp())
131+
->setXCustomerTaxId((string)$billing->getTaxId())
132+
->setXEmail((string)$order->getCustomerEmail())
133+
->setXEmailCustomer((string)$paymentMethod->getConfigData('email_customer'))
134+
->setXMerchantEmail((string)$paymentMethod->getConfigData('merchant_email'));
135135
}
136136

137137
$shipping = $order->getShippingAddress();
138138
if (!empty($shipping)) {
139139
$this->setXShipToFirstName(
140-
strval($shipping->getFirstname())
140+
(string)$shipping->getFirstname()
141141
)->setXShipToLastName(
142-
strval($shipping->getLastname())
142+
(string)$shipping->getLastname()
143143
)->setXShipToCompany(
144-
strval($shipping->getCompany())
144+
(string)$shipping->getCompany()
145145
)->setXShipToAddress(
146-
strval($shipping->getStreetLine(1))
146+
(string)$shipping->getStreetLine(1)
147147
)->setXShipToCity(
148-
strval($shipping->getCity())
148+
(string)$shipping->getCity()
149149
)->setXShipToState(
150-
strval($shipping->getRegion())
150+
(string)$shipping->getRegion()
151151
)->setXShipToZip(
152-
strval($shipping->getPostcode())
152+
(string)$shipping->getPostcode()
153153
)->setXShipToCountry(
154-
strval($shipping->getCountryId())
154+
(string)$shipping->getCountryId()
155155
);
156156
}
157157

158-
$this->setXPoNum(strval($payment->getPoNumber()));
158+
$this->setXPoNum((string)$payment->getPoNumber());
159159

160160
return $this;
161161
}

‎app/code/Magento/Authorizenet/view/frontend/requirejs-config.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
var config = {
77
map: {
88
'*': {
9-
transparent: 'Magento_Payment/transparent'
9+
transparent: 'Magento_Payment/js/transparent',
10+
'Magento_Payment/transparent': 'Magento_Payment/js/transparent'
1011
}
1112
}
1213
};

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ protected function _processNotLoggedInUser(\Magento\Framework\App\RequestInterfa
160160
} else {
161161
$this->_actionFlag->set('', \Magento\Framework\App\ActionInterface::FLAG_NO_DISPATCH, true);
162162
$this->_response->setRedirect($this->_url->getCurrentUrl());
163-
$this->messageManager->addError(__('Invalid Form Key. Please refresh the page.'));
163+
$this->messageManager->addErrorMessage(__('Invalid Form Key. Please refresh the page.'));
164164
$isRedirectNeeded = true;
165165
}
166166
}
@@ -205,7 +205,7 @@ protected function _performLogin(\Magento\Framework\App\RequestInterface $reques
205205
$this->_auth->login($username, $password);
206206
} catch (AuthenticationException $e) {
207207
if (!$request->getParam('messageSent')) {
208-
$this->messageManager->addError($e->getMessage());
208+
$this->messageManager->addErrorMessage($e->getMessage());
209209
$request->setParam('messageSent', true);
210210
$outputValue = false;
211211
}

‎app/code/Magento/Backend/Block/Media/Uploader.php

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77

88
namespace Magento\Backend\Block\Media;
99

10+
use Magento\Framework\App\ObjectManager;
11+
use Magento\Framework\Serialize\Serializer\Json;
1012
use Magento\Framework\Image\Adapter\ConfigInterface;
1113

1214
/**
@@ -31,6 +33,11 @@ class Uploader extends \Magento\Backend\Block\Widget
3133
*/
3234
protected $_fileSizeService;
3335

36+
/**
37+
* @var Json
38+
*/
39+
private $jsonEncoder;
40+
3441
/**
3542
* @var ConfigInterface
3643
*/
@@ -39,19 +46,22 @@ class Uploader extends \Magento\Backend\Block\Widget
3946
/**
4047
* @param \Magento\Backend\Block\Template\Context $context
4148
* @param \Magento\Framework\File\Size $fileSize
42-
* @param ConfigInterface $imageConfig
4349
* @param array $data
50+
* @param Json $jsonEncoder
51+
* @param ConfigInterface $imageConfig
4452
*/
4553
public function __construct(
4654
\Magento\Backend\Block\Template\Context $context,
4755
\Magento\Framework\File\Size $fileSize,
48-
ConfigInterface $imageConfig,
49-
array $data = []
56+
array $data = [],
57+
Json $jsonEncoder = null,
58+
ConfigInterface $imageConfig = null
5059
) {
51-
parent::__construct($context, $data);
52-
5360
$this->_fileSizeService = $fileSize;
54-
$this->imageConfig = $imageConfig;
61+
$this->jsonEncoder = $jsonEncoder ?: ObjectManager::getInstance()->get(Json::class);
62+
$this->imageConfig = $imageConfig ?: ObjectManager::getInstance()->get(ConfigInterface::class);
63+
64+
parent::__construct($context, $data);
5565
}
5666

5767
/**
@@ -140,7 +150,7 @@ public function getJsObjectName()
140150
*/
141151
public function getConfigJson()
142152
{
143-
return $this->_coreData->jsonEncode($this->getConfig()->getData());
153+
return $this->jsonEncoder->encode($this->getConfig()->getData());
144154
}
145155

146156
/**

‎app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Currency.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ public function render(\Magento\Framework\DataObject $row)
8282
{
8383
if ($data = (string)$this->_getValue($row)) {
8484
$currency_code = $this->_getCurrencyCode($row);
85-
$data = floatval($data) * $this->_getRate($row);
85+
$data = (float)$data * $this->_getRate($row);
8686
$sign = (bool)(int)$this->getColumn()->getShowNumberSign() && $data > 0 ? '+' : '';
8787
$data = sprintf("%f", $data);
8888
$data = $this->_localeCurrency->getCurrency($currency_code)->toCurrency($data);
@@ -118,10 +118,10 @@ protected function _getCurrencyCode($row)
118118
protected function _getRate($row)
119119
{
120120
if ($rate = $this->getColumn()->getRate()) {
121-
return floatval($rate);
121+
return (float)$rate;
122122
}
123123
if ($rate = $row->getData($this->getColumn()->getRateField())) {
124-
return floatval($rate);
124+
return (float)$rate;
125125
}
126126
return $this->_defaultBaseCurrency->getRate($this->_getCurrencyCode($row));
127127
}

‎app/code/Magento/Backend/Block/Widget/Grid/Column/Renderer/Price.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public function render(\Magento\Framework\DataObject $row)
6060
return $data;
6161
}
6262

63-
$data = floatval($data) * $this->_getRate($row);
63+
$data = (float)$data * $this->_getRate($row);
6464
$data = sprintf("%f", $data);
6565
$data = $this->_localeCurrency->getCurrency($currencyCode)->toCurrency($data);
6666
return $data;
@@ -94,10 +94,10 @@ protected function _getCurrencyCode($row)
9494
protected function _getRate($row)
9595
{
9696
if ($rate = $this->getColumn()->getRate()) {
97-
return floatval($rate);
97+
return (float)$rate;
9898
}
9999
if ($rate = $row->getData($this->getColumn()->getRateField())) {
100-
return floatval($rate);
100+
return (float)$rate;
101101
}
102102
return 1;
103103
}

‎app/code/Magento/Backend/Controller/Adminhtml/Auth/Logout.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ class Logout extends \Magento\Backend\Controller\Adminhtml\Auth
1616
public function execute()
1717
{
1818
$this->_auth->logout();
19-
$this->messageManager->addSuccess(__('You have logged out.'));
19+
$this->messageManager->addSuccessMessage(__('You have logged out.'));
2020

2121
/** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
2222
$resultRedirect = $this->resultRedirectFactory->create();

‎app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanImages.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@ public function execute()
2828
try {
2929
$this->_objectManager->create(\Magento\Catalog\Model\Product\Image::class)->clearCache();
3030
$this->_eventManager->dispatch('clean_catalog_images_cache_after');
31-
$this->messageManager->addSuccess(__('The image cache was cleaned.'));
31+
$this->messageManager->addSuccessMessage(__('The image cache was cleaned.'));
3232
} catch (LocalizedException $e) {
33-
$this->messageManager->addError($e->getMessage());
33+
$this->messageManager->addErrorMessage($e->getMessage());
3434
} catch (\Exception $e) {
35-
$this->messageManager->addException($e, __('An error occurred while clearing the image cache.'));
35+
$this->messageManager->addExceptionMessage($e, __('An error occurred while clearing the image cache.'));
3636
}
3737

3838
/** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */

‎app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanMedia.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,12 @@ public function execute()
2828
try {
2929
$this->_objectManager->get(\Magento\Framework\View\Asset\MergeService::class)->cleanMergedJsCss();
3030
$this->_eventManager->dispatch('clean_media_cache_after');
31-
$this->messageManager->addSuccess(__('The JavaScript/CSS cache has been cleaned.'));
31+
$this->messageManager->addSuccessMessage(__('The JavaScript/CSS cache has been cleaned.'));
3232
} catch (LocalizedException $e) {
33-
$this->messageManager->addError($e->getMessage());
33+
$this->messageManager->addErrorMessage($e->getMessage());
3434
} catch (\Exception $e) {
35-
$this->messageManager->addException($e, __('An error occurred while clearing the JavaScript/CSS cache.'));
35+
$this->messageManager
36+
->addExceptionMessage($e, __('An error occurred while clearing the JavaScript/CSS cache.'));
3637
}
3738

3839
/** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */

‎app/code/Magento/Backend/Controller/Adminhtml/Cache/CleanStaticFiles.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public function execute()
2626
{
2727
$this->_objectManager->get(\Magento\Framework\App\State\CleanupFiles::class)->clearMaterializedViewFiles();
2828
$this->_eventManager->dispatch('clean_static_files_cache_after');
29-
$this->messageManager->addSuccess(__('The static files cache has been cleaned.'));
29+
$this->messageManager->addSuccessMessage(__('The static files cache has been cleaned.'));
3030

3131
/** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
3232
$resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT);

‎app/code/Magento/Backend/Controller/Adminhtml/Cache/FlushAll.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public function execute()
2727
foreach ($this->_cacheFrontendPool as $cacheFrontend) {
2828
$cacheFrontend->getBackend()->clean();
2929
}
30-
$this->messageManager->addSuccess(__("You flushed the cache storage."));
30+
$this->messageManager->addSuccessMessage(__("You flushed the cache storage."));
3131
/** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
3232
$resultRedirect = $this->resultRedirectFactory->create();
3333
return $resultRedirect->setPath('adminhtml/*');

‎app/code/Magento/Backend/Controller/Adminhtml/Cache/FlushSystem.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public function execute()
2727
$cacheFrontend->clean();
2828
}
2929
$this->_eventManager->dispatch('adminhtml_cache_flush_system');
30-
$this->messageManager->addSuccess(__("The Magento cache storage has been flushed."));
30+
$this->messageManager->addSuccessMessage(__("The Magento cache storage has been flushed."));
3131
/** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
3232
$resultRedirect = $this->resultRedirectFactory->create();
3333
return $resultRedirect->setPath('adminhtml/*');

0 commit comments

Comments
 (0)