Skip to content

Commit 87b3f14

Browse files
o-iegorovo-iegorov
committed
ACP2E-3862: Partial update of copyrights for CE for file types 'php', 'phtml', 'html', 'js'
1 parent 2b8ca36 commit 87b3f14

File tree

25 files changed

+98
-79
lines changed

25 files changed

+98
-79
lines changed

‎app/code/Magento/AdminNotification/view/adminhtml/templates/notification/window.phtml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
/**
88
* @see \Magento\AdminNotification\Block\Window
99
* @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
10+
* @var \Magento\Framework\Escaper $escaper
1011
*/
1112
?>
1213
<ul class="message-system-list"
@@ -15,13 +16,13 @@
1516
"autoOpen": true,
1617
"buttons": false,
1718
"modalClass": "modal-system-messages",
18-
"title": "<?= $block->escapeHtmlAttr($block->getHeaderText()) ?>"
19+
"title": "<?= $escaper->escapeHtmlAttr($block->getHeaderText()) ?>"
1920
}
2021
}'>
2122
<li class="message message-warning warning">
22-
<?= $block->escapeHtml($block->getNoticeMessageText()) ?><br/>
23-
<a href="<?= $block->escapeUrl($block->getNoticeMessageUrl()) ?>">
24-
<?= $block->escapeHtml($block->getReadDetailsText()) ?>
23+
<?= $escaper->escapeHtml($block->getNoticeMessageText()) ?><br/>
24+
<a href="<?= $escaper->escapeUrl($block->getNoticeMessageUrl()) ?>">
25+
<?= $escaper->escapeHtml($block->getReadDetailsText()) ?>
2526
</a>
2627
</li>
2728
</ul>

‎app/code/Magento/AdvancedSearch/Model/SuggestedQueriesInterface.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ interface SuggestedQueriesInterface
1717
* Recommendations settings config paths
1818
*/
1919
public const SEARCH_RECOMMENDATIONS_ENABLED = 'catalog/search/search_recommendations_enabled';
20-
public const SEARCH_RECOMMENDATIONS_COUNT_RESULTS_ENABLED = 'catalog/search/search_recommendations_count_results_enabled';
20+
public const SEARCH_RECOMMENDATIONS_COUNT_RESULTS_ENABLED =
21+
'catalog/search/search_recommendations_count_results_enabled';
2122
public const SEARCH_RECOMMENDATIONS_COUNT = 'catalog/search/search_recommendations_count';
2223
/**#@-*/
2324

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,13 @@
33
* Copyright 2018 Adobe
44
* All Rights Reserved.
55
*/
6+
/** @var \Magento\Framework\Escaper $escaper */
67
?>
78
<button class="scalable" type="button" id="<?= $block->getHtmlId() ?>" data-mage-init='{"testConnection":{
8-
"url": "<?= $block->escapeUrl($block->getAjaxUrl()) ?>",
9+
"url": "<?= $escaper->escapeUrl($block->getAjaxUrl()) ?>",
910
"elementId": "<?= $block->getHtmlId() ?>",
10-
"successText": "<?= $block->escapeHtmlAttr(__('Successful! Test again?')) ?>",
11-
"failedText": "<?= $block->escapeHtmlAttr(__('Connection failed! Test again?')) ?>",
11+
"successText": "<?= $escaper->escapeHtmlAttr(__('Successful! Test again?')) ?>",
12+
"failedText": "<?= $escaper->escapeHtmlAttr(__('Connection failed! Test again?')) ?>",
1213
"fieldMapping": "<?= /* @noEscape */ $block->getFieldMapping() ?>"}, "validation": {}}'>
13-
<span id="<?= $block->getHtmlId() ?>_result"><?= $block->escapeHtml($block->getButtonLabel()) ?></span>
14+
<span id="<?= $block->getHtmlId() ?>_result"><?= $escaper->escapeHtml($block->getButtonLabel()) ?></span>
1415
</button>

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,19 @@
77
/**
88
* @var \Magento\AdvancedSearch\Block\SearchData $block
99
* @var \Magento\Framework\Locale\LocaleFormatter $localeFormatter
10+
* @var \Magento\Framework\Escaper $escaper
1011
*/
1112
?>
1213
<?php
1314
/** @var \Magento\Search\Model\QueryResult[] $data */
1415
$data = $block->getItems();
1516
if (count($data)): ?>
1617
<dl class="block">
17-
<dt class="title"><?= $block->escapeHtml(__($block->getTitle())) ?></dt>
18+
<dt class="title"><?= $escaper->escapeHtml(__($block->getTitle())) ?></dt>
1819
<?php foreach ($data as $additionalInfo): ?>
1920
<dd class="item">
20-
<a href="<?= $block->escapeUrl($block->getLink($additionalInfo->getQueryText())) ?>"
21-
><?= $block->escapeHtml($additionalInfo->getQueryText()) ?></a>
21+
<a href="<?= $escaper->escapeUrl($block->getLink($additionalInfo->getQueryText())) ?>"
22+
><?= $escaper->escapeHtml($additionalInfo->getQueryText()) ?></a>
2223
<?php if ($block->isShowResultsCount()): ?>
2324
<span class="count">
2425
<?= /* @noEscape */ $localeFormatter->formatNumber((int)$additionalInfo->getResultsCount()) ?>

‎app/code/Magento/Amqp/Model/Exchange.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
* {@inheritdoc}
1515
*
1616
* @deprecated 100.2.0
17+
* @see Magento\Framework\MessageQueue
1718
*/
1819
class Exchange extends \Magento\Framework\Amqp\Exchange
1920
{
@@ -48,6 +49,7 @@ public function __construct(
4849
* @return PublisherConfig
4950
*
5051
* @deprecated 100.2.0
52+
* @see it's a private method, not used anymore
5153
*/
5254
private function getPublisherConfig()
5355
{
@@ -60,6 +62,7 @@ private function getPublisherConfig()
6062
* @return ResponseQueueNameBuilder
6163
*
6264
* @deprecated 100.2.0
65+
* @see it's a private method, not used anymore
6366
*/
6467
private function getResponseQueueNameBuilder()
6568
{

‎app/code/Magento/Amqp/Model/Queue.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
* {@inheritdoc}
1010
*
1111
* @deprecated 100.2.0
12+
* @see Magento\Framework\MessageQueue
1213
*/
1314
class Queue extends \Magento\Framework\Amqp\Queue
1415
{

‎app/code/Magento/Amqp/Model/Topology.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,27 +18,27 @@
1818
* Class Topology creates topology for Amqp messaging
1919
*
2020
* @deprecated 100.2.0
21+
* @see Magento\Framework\MessageQueue
2122
*/
2223
class Topology extends TopologyInstaller
2324
{
2425
/**
2526
* Type of exchange
2627
*
2728
* @deprecated
29+
* @see not used anymore
2830
*/
29-
const TOPIC_EXCHANGE = 'topic';
31+
public const TOPIC_EXCHANGE = 'topic';
3032

31-
/**
32-
* Amqp connection
33-
*/
34-
const AMQP_CONNECTION = 'amqp';
33+
public const AMQP_CONNECTION = 'amqp';
3534

3635
/**
3736
* Durability for exchange and queue
3837
*
3938
* @deprecated
39+
* @see not used anymore
4040
*/
41-
const IS_DURABLE = true;
41+
public const IS_DURABLE = true;
4242

4343
/**
4444
* Initialize dependencies

‎app/code/Magento/Amqp/Setup/ConfigOptionsList.php

Lines changed: 23 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -19,43 +19,41 @@ class ConfigOptionsList implements ConfigOptionsListInterface
1919
/**
2020
* Input key for the options
2121
*/
22-
const INPUT_KEY_QUEUE_AMQP_HOST = 'amqp-host';
23-
const INPUT_KEY_QUEUE_AMQP_PORT = 'amqp-port';
24-
const INPUT_KEY_QUEUE_AMQP_USER = 'amqp-user';
25-
const INPUT_KEY_QUEUE_AMQP_PASSWORD = 'amqp-password';
26-
const INPUT_KEY_QUEUE_AMQP_VIRTUAL_HOST = 'amqp-virtualhost';
27-
const INPUT_KEY_QUEUE_AMQP_SSL = 'amqp-ssl';
28-
const INPUT_KEY_QUEUE_AMQP_SSL_OPTIONS = 'amqp-ssl-options';
22+
public const INPUT_KEY_QUEUE_AMQP_HOST = 'amqp-host';
23+
public const INPUT_KEY_QUEUE_AMQP_PORT = 'amqp-port';
24+
public const INPUT_KEY_QUEUE_AMQP_USER = 'amqp-user';
25+
public const INPUT_KEY_QUEUE_AMQP_PASSWORD = 'amqp-password';
26+
public const INPUT_KEY_QUEUE_AMQP_VIRTUAL_HOST = 'amqp-virtualhost';
27+
public const INPUT_KEY_QUEUE_AMQP_SSL = 'amqp-ssl';
28+
public const INPUT_KEY_QUEUE_AMQP_SSL_OPTIONS = 'amqp-ssl-options';
2929

3030
/**
3131
* Path to the values in the deployment config
3232
*/
33-
const CONFIG_PATH_QUEUE_AMQP_HOST = 'queue/amqp/host';
34-
const CONFIG_PATH_QUEUE_AMQP_PORT = 'queue/amqp/port';
35-
const CONFIG_PATH_QUEUE_AMQP_USER = 'queue/amqp/user';
36-
const CONFIG_PATH_QUEUE_AMQP_PASSWORD = 'queue/amqp/password';
37-
const CONFIG_PATH_QUEUE_AMQP_VIRTUAL_HOST = 'queue/amqp/virtualhost';
38-
const CONFIG_PATH_QUEUE_AMQP_SSL = 'queue/amqp/ssl';
39-
const CONFIG_PATH_QUEUE_AMQP_SSL_OPTIONS = 'queue/amqp/ssl_options';
33+
public const CONFIG_PATH_QUEUE_AMQP_HOST = 'queue/amqp/host';
34+
public const CONFIG_PATH_QUEUE_AMQP_PORT = 'queue/amqp/port';
35+
public const CONFIG_PATH_QUEUE_AMQP_USER = 'queue/amqp/user';
36+
public const CONFIG_PATH_QUEUE_AMQP_PASSWORD = 'queue/amqp/password';
37+
public const CONFIG_PATH_QUEUE_AMQP_VIRTUAL_HOST = 'queue/amqp/virtualhost';
38+
public const CONFIG_PATH_QUEUE_AMQP_SSL = 'queue/amqp/ssl';
39+
public const CONFIG_PATH_QUEUE_AMQP_SSL_OPTIONS = 'queue/amqp/ssl_options';
4040

4141
/**
4242
* Default values
4343
*/
44-
const DEFAULT_AMQP_HOST = '';
45-
const DEFAULT_AMQP_PORT = '5672';
46-
const DEFAULT_AMQP_USER = '';
47-
const DEFAULT_AMQP_PASSWORD = '';
48-
const DEFAULT_AMQP_VIRTUAL_HOST = '/';
49-
const DEFAULT_AMQP_SSL = '';
44+
public const DEFAULT_AMQP_HOST = '';
45+
public const DEFAULT_AMQP_PORT = '5672';
46+
public const DEFAULT_AMQP_USER = '';
47+
public const DEFAULT_AMQP_PASSWORD = '';
48+
public const DEFAULT_AMQP_VIRTUAL_HOST = '/';
49+
public const DEFAULT_AMQP_SSL = '';
5050

5151
/**
5252
* @var ConnectionValidator
5353
*/
5454
private $connectionValidator;
5555

5656
/**
57-
* Constructor
58-
*
5957
* @param ConnectionValidator $connectionValidator
6058
*/
6159
public function __construct(ConnectionValidator $connectionValidator)
@@ -64,7 +62,7 @@ public function __construct(ConnectionValidator $connectionValidator)
6462
}
6563

6664
/**
67-
* {@inheritdoc}
65+
* @inheritdoc
6866
*/
6967
public function getOptions()
7068
{
@@ -122,7 +120,7 @@ public function getOptions()
122120
}
123121

124122
/**
125-
* {@inheritdoc}
123+
* @inheritdoc
126124
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
127125
*/
128126
public function createConfig(array $data, DeploymentConfig $deploymentConfig)
@@ -170,7 +168,7 @@ public function createConfig(array $data, DeploymentConfig $deploymentConfig)
170168
}
171169

172170
/**
173-
* {@inheritdoc}
171+
* @inheritdoc
174172
*/
175173
public function validate(array $options, DeploymentConfig $deploymentConfig)
176174
{

‎app/code/Magento/Analytics/Model/Config/Backend/Enabled/SubscriptionHandler.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,6 @@ class SubscriptionHandler
5252
private $configWriter;
5353

5454
/**
55-
* Flag Manager.
56-
*
5755
* @var FlagManager
5856
*/
5957
private $flagManager;

‎app/code/Magento/Analytics/Model/Connector/Http/ConverterInterface.php

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,28 +14,34 @@
1414
interface ConverterInterface
1515
{
1616
/**
17-
* @param string $body
17+
* Unserialize data
1818
*
19+
* @param string $body
1920
* @return array
2021
* @since 100.2.0
2122
*/
2223
public function fromBody($body);
2324

2425
/**
25-
* @param array $data
26+
* Serialize data
2627
*
28+
* @param array $data
2729
* @return string
2830
* @since 100.2.0
2931
*/
3032
public function toBody(array $data);
3133

3234
/**
35+
* Retrieve content type
36+
*
3337
* @return string
3438
* @since 100.2.0
3539
*/
3640
public function getContentTypeHeader();
3741

3842
/**
43+
* Retrieve content media
44+
*
3945
* @return string
4046
* @since 100.3.0
4147
*/

0 commit comments

Comments
 (0)