Skip to content

Commit 0e0a589

Browse files
committed
Merge branch '2.4-develop' of https://github.com/magento-commerce/magento2ce into MC-42026
2 parents 86043d4 + 4b439a6 commit 0e0a589

File tree

8 files changed

+1272
-303
lines changed

8 files changed

+1272
-303
lines changed

app/code/Magento/AdminAnalytics/etc/csp_whitelist.xml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,12 @@
1111
<policy id="script-src">
1212
<values>
1313
<value id="adobedtm" type="host">assets.adobedtm.com</value>
14+
<value id="adobe" type="host">*.adobe.com</value>
15+
</values>
16+
</policy>
17+
<policy id="style-src">
18+
<values>
19+
<value id="adobe" type="host">*.adobe.com</value>
1420
</values>
1521
</policy>
1622
<policy id="img-src">
@@ -19,6 +25,7 @@
1925
<value id="omtrdc" type="host">amcglobal.sc.omtrdc.net</value>
2026
<value id="dpmdemdex" type="host">dpm.demdex.net</value>
2127
<value id="everesttech" type="host">cm.everesttech.net</value>
28+
<value id="adobe" type="host">*.adobe.com</value>
2229
</values>
2330
</policy>
2431
<policy id="connect-src">
@@ -27,9 +34,15 @@
2734
<value id="omtrdc" type="host">amcglobal.sc.omtrdc.net</value>
2835
</values>
2936
</policy>
37+
<policy id="media-src">
38+
<values>
39+
<value id="adobe" type="host">*.adobe.com</value>
40+
</values>
41+
</policy>
3042
<policy id="frame-src">
3143
<values>
3244
<value id="amcdemdex" type="host">fast.amc.demdex.net</value>
45+
<value id="adobe" type="host">*.adobe.com</value>
3346
</values>
3447
</policy>
3548
</policies>

composer.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,9 @@
9393
"phpmd/phpmd": "^2.8.0",
9494
"phpstan/phpstan": "^0.12.77",
9595
"phpunit/phpunit": "^9",
96-
"sebastian/phpcpd": "~5.0.0",
97-
"squizlabs/php_codesniffer": "~3.5.4"
96+
"sebastian/phpcpd": "^6.0.3",
97+
"squizlabs/php_codesniffer": "~3.5.4",
98+
"symfony/finder": "^5.2"
9899
},
99100
"suggest": {
100101
"ext-pcntl": "Need for run processes in parallel mode"

0 commit comments

Comments
 (0)