Skip to content

Commit 4321600

Browse files
VladimirZaetsVladimirZaets
authored
Merge pull request #4873 from magento-engcom/2.3-develop-prs
[Magento Community Engineering] Community Contributions - 2.3-develop
2 parents ea73279 + 0a371da commit 4321600

File tree

20 files changed

+73
-55
lines changed

20 files changed

+73
-55
lines changed

‎app/code/Magento/Backend/etc/adminhtml/system.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -482,22 +482,22 @@
482482
<field id="base_url" translate="label comment" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
483483
<label>Base URL</label>
484484
<backend_model>Magento\Config\Model\Config\Backend\Baseurl</backend_model>
485-
<comment>Specify URL or {{base_url}} placeholder.</comment>
485+
<comment><![CDATA[Specify URL or {{base_url}} placeholder.]]></comment>
486486
</field>
487487
<field id="base_link_url" translate="label comment" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
488488
<label>Base Link URL</label>
489489
<backend_model>Magento\Config\Model\Config\Backend\Baseurl</backend_model>
490-
<comment>May start with {{unsecure_base_url}} placeholder.</comment>
490+
<comment><![CDATA[May start with {{unsecure_base_url}} placeholder.]]></comment>
491491
</field>
492492
<field id="base_static_url" translate="label comment" type="text" sortOrder="25" showInDefault="1" showInWebsite="1" showInStore="1">
493493
<label>Base URL for Static View Files</label>
494494
<backend_model>Magento\Config\Model\Config\Backend\Baseurl</backend_model>
495-
<comment>May be empty or start with {{unsecure_base_url}} placeholder.</comment>
495+
<comment><![CDATA[May be empty or start with {{unsecure_base_url}} placeholder.]]></comment>
496496
</field>
497497
<field id="base_media_url" translate="label comment" type="text" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
498498
<label>Base URL for User Media Files</label>
499499
<backend_model>Magento\Config\Model\Config\Backend\Baseurl</backend_model>
500-
<comment>May be empty or start with {{unsecure_base_url}} placeholder.</comment>
500+
<comment><![CDATA[May be empty or start with {{unsecure_base_url}} placeholder.]]></comment>
501501
</field>
502502
</group>
503503
<group id="secure" translate="label comment" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
@@ -506,22 +506,22 @@
506506
<field id="base_url" translate="label comment" type="text" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
507507
<label>Secure Base URL</label>
508508
<backend_model>Magento\Config\Model\Config\Backend\Baseurl</backend_model>
509-
<comment>Specify URL or {{base_url}}, or {{unsecure_base_url}} placeholder.</comment>
509+
<comment><![CDATA[Specify URL or {{base_url}}, or {{unsecure_base_url}} placeholder.]]></comment>
510510
</field>
511511
<field id="base_link_url" translate="label comment" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
512512
<label>Secure Base Link URL</label>
513513
<backend_model>Magento\Config\Model\Config\Backend\Baseurl</backend_model>
514-
<comment>May start with {{secure_base_url}} or {{unsecure_base_url}} placeholder.</comment>
514+
<comment><![CDATA[May start with {{secure_base_url}} or {{unsecure_base_url}} placeholder.]]></comment>
515515
</field>
516516
<field id="base_static_url" translate="label comment" type="text" sortOrder="25" showInDefault="1" showInWebsite="1" showInStore="1">
517517
<label>Secure Base URL for Static View Files</label>
518518
<backend_model>Magento\Config\Model\Config\Backend\Baseurl</backend_model>
519-
<comment>May be empty or start with {{secure_base_url}}, or {{unsecure_base_url}} placeholder.</comment>
519+
<comment><![CDATA[May be empty or start with {{secure_base_url}}, or {{unsecure_base_url}} placeholder.]]></comment>
520520
</field>
521521
<field id="base_media_url" translate="label comment" type="text" sortOrder="40" showInDefault="1" showInWebsite="1" showInStore="1">
522522
<label>Secure Base URL for User Media Files</label>
523523
<backend_model>Magento\Config\Model\Config\Backend\Baseurl</backend_model>
524-
<comment>May be empty or start with {{secure_base_url}}, or {{unsecure_base_url}} placeholder.</comment>
524+
<comment><![CDATA[May be empty or start with {{secure_base_url}}, or {{unsecure_base_url}} placeholder.]]></comment>
525525
</field>
526526
<field id="use_in_frontend" translate="label comment" type="select" sortOrder="50" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
527527
<label>Use Secure URLs on Storefront</label>

‎app/code/Magento/Catalog/Controller/Adminhtml/Product/Edit.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,14 @@
44
* Copyright © Magento, Inc. All rights reserved.
55
* See COPYING.txt for license details.
66
*/
7+
78
namespace Magento\Catalog\Controller\Adminhtml\Product;
89

910
use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
1011

12+
/**
13+
* Edit product
14+
*/
1115
class Edit extends \Magento\Catalog\Controller\Adminhtml\Product implements HttpGetActionInterface
1216
{
1317
/**
@@ -51,7 +55,7 @@ public function execute()
5155
$productId = (int) $this->getRequest()->getParam('id');
5256
$product = $this->productBuilder->build($this->getRequest());
5357

54-
if (($productId && !$product->getEntityId())) {
58+
if ($productId && !$product->getEntityId()) {
5559
/** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */
5660
$resultRedirect = $this->resultRedirectFactory->create();
5761
$this->messageManager->addErrorMessage(__('This product doesn\'t exist.'));

‎app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -726,7 +726,7 @@ public function setupAttributeMeta(ProductAttributeInterface $attribute, $groupC
726726

727727
// TODO: getAttributeModel() should not be used when MAGETWO-48284 is complete
728728
$childData = $this->arrayManager->get($configPath, $meta, []);
729-
if (($rules = $this->catalogEavValidationRules->build($this->getAttributeModel($attribute), $childData))) {
729+
if ($rules = $this->catalogEavValidationRules->build($this->getAttributeModel($attribute), $childData)) {
730730
$meta = $this->arrayManager->merge($configPath, $meta, ['validation' => $rules]);
731731
}
732732

‎app/code/Magento/Catalog/view/adminhtml/templates/catalog/category/tree.phtml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -507,8 +507,13 @@
507507
})(jQuery);
508508
this.closeModal();
509509
}
510-
}]
511-
510+
}],
511+
keyEventHandlers: {
512+
enterKey: function (event) {
513+
this.buttons[1].click();
514+
event.preventDefault();
515+
}
516+
}
512517
}).trigger('openModal');
513518

514519
}

‎app/code/Magento/NewRelicReporting/Model/Apm/Deployments.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77

88
use \Magento\Framework\HTTP\ZendClient;
99

10+
/**
11+
* Performs the request to make the deployment
12+
*/
1013
class Deployments
1114
{
1215
/**
@@ -88,7 +91,7 @@ public function setDeployment($description, $change = false, $user = false)
8891
return false;
8992
}
9093

91-
if (($response->getStatus() < 200 || $response->getStatus() > 210)) {
94+
if ($response->getStatus() < 200 || $response->getStatus() > 210) {
9295
$this->logger->warning('Deployment marker request did not send a 200 status code.');
9396
return false;
9497
}

‎app/code/Magento/Persistent/Observer/MakePersistentQuoteGuestObserver.php

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,16 @@
44
* Copyright © Magento, Inc. All rights reserved.
55
* See COPYING.txt for license details.
66
*/
7+
78
namespace Magento\Persistent\Observer;
89

910
use Magento\Framework\Event\ObserverInterface;
1011

12+
/**
13+
* Make persistent quote to be guest
14+
*
15+
* @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
16+
*/
1117
class MakePersistentQuoteGuestObserver implements ObserverInterface
1218
{
1319
/**
@@ -65,8 +71,8 @@ public function execute(\Magento\Framework\Event\Observer $observer)
6571
/** @var $action \Magento\Persistent\Controller\Index */
6672
$action = $observer->getEvent()->getControllerAction();
6773
if ($action instanceof \Magento\Persistent\Controller\Index) {
68-
if ((($this->_persistentSession->isPersistent() && !$this->_customerSession->isLoggedIn())
69-
|| $this->_persistentData->isShoppingCartPersist())
74+
if (($this->_persistentSession->isPersistent() && !$this->_customerSession->isLoggedIn())
75+
|| $this->_persistentData->isShoppingCartPersist()
7076
) {
7177
$this->quoteManager->setGuest(true);
7278
}

‎app/code/Magento/Sales/view/adminhtml/templates/order/details.phtml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,8 @@ $_order = $block->getOrder() ?>
8181
</tr>
8282
<?php endif; ?>
8383
<tr bgcolor="#DEE5E8">
84-
<td colspan="2" align="right" style="padding:3px 9px"><strong><big><?= $block->escapeHtml(__('Grand Total')) ?></big></strong></td>
85-
<td align="right" style="padding:6px 9px"><strong><big><?= /* @noEscape */ $_order->formatPrice($_order->getGrandTotal()) ?></big></strong></td>
84+
<td colspan="2" align="right" style="padding:3px 9px"><strong style="font-size: larger"><?= $block->escapeHtml(__('Grand Total')) ?></strong></td>
85+
<td align="right" style="padding:6px 9px"><strong style="font-size: larger"><?= /* @noEscape */ $_order->formatPrice($_order->getGrandTotal()) ?></strong></td>
8686
</tr>
8787
</tfoot>
8888
</table>

‎app/code/Magento/Sales/view/adminhtml/templates/order/totals/due.phtml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
?>
77
<?php if ($block->getCanDisplayTotalDue()) : ?>
88
<tr>
9-
<td class="label"><big><strong><?= $block->escapeHtml(__('Total Due')) ?></strong></big></td>
10-
<td class="emph"><big><?= /* @noEscape */ $block->displayPriceAttribute('total_due', true) ?></big></td>
9+
<td class="label"><strong style="font-size: larger"><?= $block->escapeHtml(__('Total Due')) ?></strong></td>
10+
<td class="emph" style="font-size: larger"><?= /* @noEscape */ $block->displayPriceAttribute('total_due', true) ?></td>
1111
</tr>
1212
<?php endif; ?>

‎app/code/Magento/Sales/view/adminhtml/templates/order/totals/grand.phtml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@
99

1010
<tr>
1111
<td class="label">
12-
<strong><big>
12+
<strong style="font-size: larger">
1313
<?php if ($block->getGrandTotalTitle()) : ?>
1414
<?= $block->escapeHtml($block->getGrandTotalTitle()) ?>
1515
<?php else : ?>
1616
<?= $block->escapeHtml(__('Grand Total')) ?>
1717
<?php endif; ?>
18-
</big></strong>
18+
</strong>
1919
</td>
20-
<td class="emph"><big><?= /* @noEscape */ $block->displayPriceAttribute('grand_total', true) ?></big></td>
20+
<td class="emph" style="font-size: larger"><?= /* @noEscape */ $block->displayPriceAttribute('grand_total', true) ?></td>
2121
</tr>

‎app/code/Magento/Ui/Component/Control/SplitButton.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6+
67
namespace Magento\Ui\Component\Control;
78

89
/**
@@ -22,7 +23,7 @@
2223
class SplitButton extends Button
2324
{
2425
/**
25-
* {@inheritdoc}
26+
* @inheritdoc
2627
*/
2728
protected function getTemplatePath()
2829
{
@@ -83,12 +84,12 @@ public function getButtonAttributesHtml()
8384
'style' => $this->getStyle(),
8485
];
8586

86-
if (($idHard = $this->getIdHard())) {
87+
if ($idHard = $this->getIdHard()) {
8788
$attributes['id'] = $idHard;
8889
}
8990

9091
//TODO perhaps we need to skip data-mage-init when disabled="disabled"
91-
if (($dataAttribute = $this->getDataAttribute())) {
92+
if ($dataAttribute = $this->getDataAttribute()) {
9293
$this->getDataAttributes($dataAttribute, $attributes);
9394
}
9495

@@ -112,7 +113,7 @@ public function getToggleAttributesHtml()
112113
$title = $this->getLabel();
113114
}
114115

115-
if (($currentClass = $this->getClass())) {
116+
if ($currentClass = $this->getClass()) {
116117
$classes[] = $currentClass;
117118
}
118119

@@ -201,12 +202,11 @@ public function hasSplit()
201202
{
202203
return $this->hasData('has_split') ? (bool)$this->getData('has_split') : true;
203204
}
204-
205205
/**
206206
* Add data attributes to $attributes array
207207
*
208208
* @param array $data
209-
* @param array &$attributes
209+
* @param array $attributes
210210
* @return void
211211
*/
212212
protected function getDataAttributes($data, &$attributes)

0 commit comments

Comments
 (0)