Skip to content

Commit 540f03e

Browse files
committed
Merge branch '2.3-develop' into 16382-getAttributeRawValue-no-default
2 parents 4d380bf + cea3e79 commit 540f03e

File tree

2,251 files changed

+101923
-27011
lines changed

Some content is hidden

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

2,251 files changed

+101923
-27011
lines changed

.github/CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ The Magento 2 development team or community maintainers will review all issues a
1111
During the review we might require clarifications from the contributor.
1212
If there is no response from the contributor within two weeks, the pull request will be closed.
1313

14-
For more detialed information on contribution please read our [beginners guide](https://github.com/magento/magento2/wiki/Getting-Started).
14+
For more detailed information on contribution please read our [beginners guide](https://github.com/magento/magento2/wiki/Getting-Started).
1515

1616
## Contribution requirements
1717

CHANGELOG.md

Lines changed: 612 additions & 0 deletions
Large diffs are not rendered by default.

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

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

8+
use Magento\Framework\Escaper;
9+
use Magento\Framework\App\ObjectManager;
810
use Magento\Framework\Config\ConfigOptionsListConstants;
911

1012
/**
@@ -26,7 +28,7 @@ class Feed extends \Magento\Framework\Model\AbstractModel
2628
const XML_LAST_UPDATE_PATH = 'system/adminnotification/last_update';
2729

2830
/**
29-
* @var \Magento\Framework\Escaper
31+
* @var Escaper
3032
*/
3133
private $escaper;
3234

@@ -82,7 +84,7 @@ class Feed extends \Magento\Framework\Model\AbstractModel
8284
* @param \Magento\Framework\Model\ResourceModel\AbstractResource $resource
8385
* @param \Magento\Framework\Data\Collection\AbstractDb $resourceCollection
8486
* @param array $data
85-
* @param \Magento\Framework\Escaper|null $escaper
87+
* @param Escaper|null $escaper
8688
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
8789
*/
8890
public function __construct(
@@ -97,7 +99,7 @@ public function __construct(
9799
\Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
98100
\Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
99101
array $data = [],
100-
\Magento\Framework\Escaper $escaper = null
102+
Escaper $escaper = null
101103
) {
102104
parent::__construct($context, $registry, $resource, $resourceCollection, $data);
103105
$this->_backendConfig = $backendConfig;
@@ -106,8 +108,8 @@ public function __construct(
106108
$this->_deploymentConfig = $deploymentConfig;
107109
$this->productMetadata = $productMetadata;
108110
$this->urlBuilder = $urlBuilder;
109-
$this->escaper = $escaper ?? \Magento\Framework\App\ObjectManager::getInstance()->get(
110-
\Magento\Framework\Escaper::class
111+
$this->escaper = $escaper ?? ObjectManager::getInstance()->get(
112+
Escaper::class
111113
);
112114
}
113115

app/code/Magento/AdminNotification/composer.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,14 @@
55
"sort-packages": true
66
},
77
"require": {
8-
"php": "~7.1.3||~7.2.0",
8+
"php": "~7.1.3||~7.2.0||~7.3.0",
99
"lib-libxml": "*",
1010
"magento/framework": "*",
1111
"magento/module-backend": "*",
1212
"magento/module-media-storage": "*",
1313
"magento/module-store": "*",
14-
"magento/module-ui": "*"
14+
"magento/module-ui": "*",
15+
"magento/module-config": "*"
1516
},
1617
"type": "magento2-module",
1718
"license": [

app/code/Magento/AdvancedPricingImportExport/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"sort-packages": true
66
},
77
"require": {
8-
"php": "~7.1.3||~7.2.0",
8+
"php": "~7.1.3||~7.2.0||~7.3.0",
99
"magento/framework": "*",
1010
"magento/module-catalog": "*",
1111
"magento/module-catalog-import-export": "*",

app/code/Magento/AdvancedSearch/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"magento/module-customer": "*",
1414
"magento/module-search": "*",
1515
"magento/module-store": "*",
16-
"php": "~7.1.3||~7.2.0"
16+
"php": "~7.1.3||~7.2.0||~7.3.0"
1717
},
1818
"type": "magento2-module",
1919
"license": [

app/code/Magento/AdvancedSearch/view/adminhtml/templates/system/config/testconnection.phtml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,12 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6-
// @codingStandardsIgnoreFile
76
?>
87
<button class="scalable" type="button" id="<?= $block->getHtmlId() ?>" data-mage-init='{"testConnection":{
98
"url": "<?= $block->escapeUrl($block->getAjaxUrl()) ?>",
109
"elementId": "<?= $block->getHtmlId() ?>",
1110
"successText": "<?= $block->escapeHtmlAttr(__('Successful! Test again?')) ?>",
1211
"failedText": "<?= $block->escapeHtmlAttr(__('Connection failed! Test again?')) ?>",
1312
"fieldMapping": "<?= /* @noEscape */ $block->getFieldMapping() ?>"}, "validation": {}}'>
14-
<span><span><span id="<?= $block->getHtmlId() ?>_result"><?= $block->escapeHtml($block->getButtonLabel()) ?></span></span></span>
13+
<span id="<?= $block->getHtmlId() ?>_result"><?= $block->escapeHtml($block->getButtonLabel()) ?></span>
1514
</button>

app/code/Magento/AdvancedSearch/view/frontend/templates/search_data.phtml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,22 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6-
// @codingStandardsIgnoreFile
6+
77
/**
88
* @var \Magento\AdvancedSearch\Block\SearchData $block
99
*/
1010
?>
1111
<?php
1212
/** @var \Magento\Search\Model\QueryResult[] $data */
1313
$data = $block->getItems();
14-
if (count($data)):?>
14+
if (count($data)) : ?>
1515
<dl class="block">
1616
<dt class="title"><?= $block->escapeHtml(__($block->getTitle())) ?></dt>
1717
<?php foreach ($data as $additionalInfo) : ?>
1818
<dd class="item">
1919
<a href="<?= $block->escapeUrl($block->getLink($additionalInfo->getQueryText())) ?>"
2020
><?= $block->escapeHtml($additionalInfo->getQueryText()) ?></a>
21-
<?php if ($block->isShowResultsCount()): ?>
21+
<?php if ($block->isShowResultsCount()) : ?>
2222
<span class="count"><?= /* @noEscape */ (int)$additionalInfo->getResultsCount() ?></span>
2323
<?php endif; ?>
2424
</dd>

app/code/Magento/Amqp/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"magento/framework": "*",
99
"magento/framework-amqp": "*",
1010
"magento/framework-message-queue": "*",
11-
"php": "~7.1.3||~7.2.0"
11+
"php": "~7.1.3||~7.2.0||~7.3.0"
1212
},
1313
"type": "magento2-module",
1414
"license": [

app/code/Magento/AmqpStore/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"magento/framework": "*",
99
"magento/framework-amqp": "*",
1010
"magento/module-store": "*",
11-
"php": "~7.1.3||~7.2.0"
11+
"php": "~7.1.3||~7.2.0||~7.3.0"
1212
},
1313
"suggest": {
1414
"magento/module-asynchronous-operations": "*",

0 commit comments

Comments
 (0)