Skip to content

Commit 696f7ee

Browse files
Merge branch '2.4-develop-mainline' into 2.4-develop
2 parents e17a3e7 + ad08ccf commit 696f7ee

File tree

535 files changed

+19639
-51168
lines changed

Some content is hidden

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

535 files changed

+19639
-51168
lines changed

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,4 +43,5 @@
4343
- [ ] Pull request has a meaningful description of its purpose
4444
- [ ] All commits are accompanied by meaningful commit messages
4545
- [ ] All new or changed code is covered with unit/integration tests (if applicable)
46+
- [ ] README.md files for modified modules are updated and included in the pull request if any [README.md predefined sections](https://github.com/magento/devdocs/wiki/Magento-module-README.md) require an update
4647
- [ ] All automated tests passed successfully (all builds are green)

app/code/Magento/AdminNotification/Model/System/Message/Baseurl.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,8 @@ protected function _getConfigUrl()
101101
*/
102102
public function getIdentity()
103103
{
104+
// md5() here is not for cryptographic use.
105+
// phpcs:ignore Magento2.Security.InsecureFunction
104106
return md5('BASE_URL' . $this->_getConfigUrl());
105107
}
106108

app/code/Magento/AdminNotification/Model/System/Message/CacheOutdated.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,8 @@ protected function _getCacheTypesForRefresh()
6262
*/
6363
public function getIdentity()
6464
{
65+
// md5() here is not for cryptographic use.
66+
// phpcs:ignore Magento2.Security.InsecureFunction
6567
return md5('cache' . implode(':', $this->_getCacheTypesForRefresh()));
6668
}
6769

app/code/Magento/Analytics/Test/Mftf/Test/AdminAdvancedReportingButtonTest.xml

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,12 @@
99
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
1010
<test name="AdminAdvancedReportingButtonTest">
1111
<annotations>
12-
<stories value="AdvancedReporting"/>
13-
<title value="AdvancedReportingButtonTest"/>
14-
<description value="Test log in to AdvancedReporting and tests AdvancedReportingButtonTest"/>
15-
<testCaseId value="MC-14800"/>
16-
<skip>
17-
<issueId value="MC-14800" />
18-
</skip>
12+
<features value="Analytics"/>
13+
<stories value="Advanced Reporting"/>
14+
<title value="Assert the Advanced Reporting page is opened by dashboard link"/>
15+
<description value="Check the ability to navigate to the Advanced Reporting page through the Advanced Reporting button on the dashboard"/>
1916
<severity value="CRITICAL"/>
17+
<testCaseId value="MC-28376"/>
2018
<group value="analytics"/>
2119
<group value="mtf_migrated"/>
2220
</annotations>

app/code/Magento/AsynchronousOperations/Model/ResourceModel/System/Message/Collection/Synchronized/Plugin.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,8 @@ public function afterToArray(
108108
'data' => [
109109
'text' => __('Task "%1": ', $bulk->getDescription()) . $text,
110110
'severity' => \Magento\Framework\Notification\MessageInterface::SEVERITY_MAJOR,
111+
// md5() here is not for cryptographic use.
112+
// phpcs:ignore Magento2.Security.InsecureFunction
111113
'identity' => md5('bulk' . $bulkUuid),
112114
'uuid' => $bulkUuid,
113115
'status' => $bulkStatus,

0 commit comments

Comments
 (0)