Skip to content

Commit dcc962e

Browse files
magento-teamfascinosum
authored andcommitted
Merge branch '2.3.5-rc' into 2.3
2 parents 5f3b86a + e5e866b commit dcc962e

File tree

2,194 files changed

+82124
-14891
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,194 files changed

+82124
-14891
lines changed

CHANGELOG.md

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

README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
[![Open Source Helpers](https://www.codetriage.com/magento/magento2/badges/users.svg)](https://www.codetriage.com/magento/magento2)
22
[![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/magento/magento2?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
33
[![Crowdin](https://d322cqt584bo4o.cloudfront.net/magento-2/localized.svg)](https://crowdin.com/project/magento-2)
4-
<h2>Welcome</h2>
4+
5+
## Welcome
56
Welcome to Magento 2 installation! We're glad you chose to install Magento 2, a cutting-edge, feature-rich eCommerce solution that gets results.
67

78
## Magento System Requirements
@@ -30,7 +31,7 @@ To suggest documentation improvements, click [here][4].
3031
[4]: https://devdocs.magento.com
3132

3233
<h3>Community Maintainers</h3>
33-
The members of this team have been recognized for their outstanding commitment to maintaining and improving Magento. Magento has granted them permission to accept, merge, and reject pull requests, as well as review issues, and thanks these Community Maintainers for their valuable contributions.
34+
The members of this team have been recognized for their outstanding commitment to maintaining and improving Magento. Magento has granted them permission to accept, merge, and reject pull requests, as well as review issues, and thanks to these Community Maintainers for their valuable contributions.
3435

3536
<a href="https://magento.com/magento-contributors#maintainers">
3637
<img src="https://raw.githubusercontent.com/wiki/magento/magento2/images/maintainers.png"/>

app/code/Magento/AdminAnalytics/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,5 @@
2525
"Magento\\AdminAnalytics\\": ""
2626
}
2727
},
28-
"version": "100.3.1"
28+
"version": "100.3.2"
2929
}
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<csp_whitelist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Csp:etc/csp_whitelist.xsd">
10+
<policies>
11+
<policy id="script-src">
12+
<values>
13+
<value id="adobedtm" type="host">assets.adobedtm.com</value>
14+
</values>
15+
</policy>
16+
</policies>
17+
</csp_whitelist>

app/code/Magento/AdminNotification/Controller/Adminhtml/System/Message/ListAction.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?php
22
/**
3-
*
43
* Copyright © Magento, Inc. All rights reserved.
54
* See COPYING.txt for license details.
65
*/
@@ -44,6 +43,8 @@ public function __construct(
4443
}
4544

4645
/**
46+
* System message list action
47+
*
4748
* @return \Magento\Framework\Controller\Result\Json
4849
*/
4950
public function execute()

app/code/Magento/AdminNotification/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,5 @@
2727
"Magento\\AdminNotification\\": ""
2828
}
2929
},
30-
"version": "100.3.4"
30+
"version": "100.3.5"
3131
}
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<csp_whitelist xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Csp:etc/csp_whitelist.xsd">
10+
<policies>
11+
<policy id="img-src">
12+
<values>
13+
<value id="commerce_widgets" type="host">widgets.magentocommerce.com</value>
14+
</values>
15+
</policy>
16+
</policies>
17+
</csp_whitelist>
18+

app/code/Magento/Analytics/Cron/SignUp.php

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

88
use Magento\Analytics\Model\Config\Backend\Enabled\SubscriptionHandler;
99
use Magento\Analytics\Model\Connector;
10+
use Magento\Framework\Exception\NotFoundException;
1011
use Magento\Framework\FlagManager;
1112
use Magento\Framework\App\Config\ReinitableConfigInterface;
1213
use Magento\Framework\App\Config\Storage\WriterInterface;
@@ -57,22 +58,24 @@ public function __construct(
5758
}
5859

5960
/**
60-
* Execute scheduled subscription operation
61+
* Execute scheduled subscription operation.
62+
*
6163
* In case of failure writes message to notifications inbox
6264
*
6365
* @return bool
66+
* @throws NotFoundException
6467
*/
6568
public function execute()
6669
{
67-
$attemptsCount = $this->flagManager->getFlagData(SubscriptionHandler::ATTEMPTS_REVERSE_COUNTER_FLAG_CODE);
70+
$attemptsCount = (int)$this->flagManager->getFlagData(SubscriptionHandler::ATTEMPTS_REVERSE_COUNTER_FLAG_CODE);
6871

69-
if (($attemptsCount === null) || ($attemptsCount <= 0)) {
72+
if ($attemptsCount <= 0) {
7073
$this->deleteAnalyticsCronExpr();
7174
$this->flagManager->deleteFlag(SubscriptionHandler::ATTEMPTS_REVERSE_COUNTER_FLAG_CODE);
7275
return false;
7376
}
7477

75-
$attemptsCount -= 1;
78+
$attemptsCount--;
7679
$this->flagManager->saveFlag(SubscriptionHandler::ATTEMPTS_REVERSE_COUNTER_FLAG_CODE, $attemptsCount);
7780
$signUpResult = $this->connector->execute('signUp');
7881
if ($signUpResult === false) {

app/code/Magento/Analytics/Cron/Update.php

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
use Magento\Analytics\Model\AnalyticsToken;
99
use Magento\Analytics\Model\Config\Backend\Baseurl\SubscriptionUpdateHandler;
1010
use Magento\Analytics\Model\Connector;
11+
use Magento\Framework\Exception\NotFoundException;
1112
use Magento\Framework\FlagManager;
1213
use Magento\Framework\App\Config\ReinitableConfigInterface;
1314
use Magento\Framework\App\Config\Storage\WriterInterface;
@@ -67,26 +68,37 @@ public function __construct(
6768
* Execute scheduled update operation
6869
*
6970
* @return bool
71+
* @throws NotFoundException
7072
*/
7173
public function execute()
7274
{
7375
$result = false;
74-
$attemptsCount = $this->flagManager
76+
$attemptsCount = (int)$this->flagManager
7577
->getFlagData(SubscriptionUpdateHandler::SUBSCRIPTION_UPDATE_REVERSE_COUNTER_FLAG_CODE);
7678

77-
if ($attemptsCount) {
78-
$attemptsCount -= 1;
79+
if (($attemptsCount > 0) && $this->analyticsToken->isTokenExist()) {
80+
$attemptsCount--;
81+
$this->flagManager
82+
->saveFlag(SubscriptionUpdateHandler::SUBSCRIPTION_UPDATE_REVERSE_COUNTER_FLAG_CODE, $attemptsCount);
7983
$result = $this->connector->execute('update');
8084
}
8185

8286
if ($result || ($attemptsCount <= 0) || (!$this->analyticsToken->isTokenExist())) {
83-
$this->flagManager
84-
->deleteFlag(SubscriptionUpdateHandler::SUBSCRIPTION_UPDATE_REVERSE_COUNTER_FLAG_CODE);
85-
$this->flagManager->deleteFlag(SubscriptionUpdateHandler::PREVIOUS_BASE_URL_FLAG_CODE);
86-
$this->configWriter->delete(SubscriptionUpdateHandler::UPDATE_CRON_STRING_PATH);
87-
$this->reinitableConfig->reinit();
87+
$this->exitFromUpdateProcess();
8888
}
8989

9090
return $result;
9191
}
92+
93+
/**
94+
* Clean-up flags and refresh configuration
95+
*/
96+
private function exitFromUpdateProcess(): void
97+
{
98+
$this->flagManager
99+
->deleteFlag(SubscriptionUpdateHandler::SUBSCRIPTION_UPDATE_REVERSE_COUNTER_FLAG_CODE);
100+
$this->flagManager->deleteFlag(SubscriptionUpdateHandler::PREVIOUS_BASE_URL_FLAG_CODE);
101+
$this->configWriter->delete(SubscriptionUpdateHandler::UPDATE_CRON_STRING_PATH);
102+
$this->reinitableConfig->reinit();
103+
}
92104
}

app/code/Magento/Analytics/ReportXml/Query.php

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,8 @@ public function __construct(
5353
}
5454

5555
/**
56+
* Get select
57+
*
5658
* @return Select
5759
*/
5860
public function getSelect()
@@ -61,6 +63,8 @@ public function getSelect()
6163
}
6264

6365
/**
66+
* Get connection name
67+
*
6468
* @return string
6569
*/
6670
public function getConnectionName()
@@ -69,6 +73,8 @@ public function getConnectionName()
6973
}
7074

7175
/**
76+
* Get config
77+
*
7278
* @return array
7379
*/
7480
public function getConfig()
@@ -78,6 +84,7 @@ public function getConfig()
7884

7985
/**
8086
* Specify data which should be serialized to JSON
87+
*
8188
* @link http://php.net/manual/en/jsonserializable.jsonserialize.php
8289
* @return mixed data which can be serialized by <b>json_encode</b>,
8390
* which is a value of any type other than a resource.

0 commit comments

Comments
 (0)