merge magento/2.3.5-develop into magento-borg/MC-30925

Author: magento-mts-svc

CHANGELOG.md

@@ -26,4 +26,3 @@
           }
     }
 }
-

app/code/Magento/AdminAnalytics/composer.json

@@ -16,7 +16,7 @@ class Messages extends \Magento\Backend\Block\Template
 
     /**
      * @var \Magento\Framework\Json\Helper\Data
-     * @deprecated
+     * @deprecated 100.3.0
      */
     protected $jsonHelper;
 

app/code/Magento/AdminNotification/Block/System/Messages.php

@@ -1,6 +1,5 @@
 <?php
 /**
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
@@ -17,7 +16,7 @@ class ListAction extends \Magento\Backend\App\AbstractAction
 
     /**
      * @var \Magento\Framework\Json\Helper\Data
-     * @deprecated
+     * @deprecated 100.3.0
      */
     protected $jsonHelper;
 
@@ -44,6 +43,8 @@ public function __construct(
     }
 
     /**
+     * System message list action
+     *
      * @return \Magento\Framework\Controller\Result\Json
      */
     public function execute()

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

@@ -26,20 +26,20 @@
 
             <?php if ($block->getCriticalCount()) : ?>
                 <div class="message message-warning error">
-                    <a class="message-link" href="#" title="<?= $block->escapeHtml(__('Critical System Messages')) ?>">
+                    <a class="message-link" href="#" title="<?= $block->escapeHtmlAttr(__('Critical System Messages')) ?>">
                         <?= (int) $block->getCriticalCount() ?>
                     </a>
                 </div>
             <?php endif; ?>
 
             <?php if ($block->getMajorCount()) : ?>
                <div class="message message-warning warning">
-                   <a class="message-link" href="#" title="<?= $block->escapeHtml(__('Major System Messages')) ?>">
+                   <a class="message-link" href="#" title="<?= $block->escapeHtmlAttr(__('Major System Messages')) ?>">
                        <?= (int) $block->getMajorCount() ?>
                    </a>
                </div>
             <?php endif; ?>
         </div>
-        <div id="message-system-all" title="<?= $block->escapeHtml(__('System messages')) ?>" data-mage-init='<?= $block->escapeHtml($block->getSystemMessageDialogJson()) ?>'></div>
+        <div id="message-system-all" title="<?= $block->escapeHtmlAttr(__('System messages')) ?>" data-mage-init='<?= $block->escapeHtmlAttr($block->getSystemMessageDialogJson()) ?>'></div>
     </div>
 </div>

app/code/Magento/AdminNotification/view/adminhtml/templates/system/messages.phtml

@@ -381,7 +381,7 @@ private function prepareExportData(
      * @param array $exportData
      * @return array
      * @SuppressWarnings(PHPMD.UnusedLocalVariable)
-     * @deprecated
+     * @deprecated 100.3.0
      * @see prepareExportData
      */
     protected function correctExportData($exportData)
@@ -510,7 +510,7 @@ private function fetchTierPrices(array $productIds): array
      * @return array|bool
      * @SuppressWarnings(PHPMD.NPathComplexity)
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
-     * @deprecated
+     * @deprecated 100.3.0
      * @see fetchTierPrices
      */
     protected function getTierPrices(array $listSku, $table)

app/code/Magento/AdvancedPricingImportExport/Model/Export/AdvancedPricing.php

@@ -19,7 +19,7 @@ class ClientResolver
      *
      * @var ScopeConfigInterface
      * @since 100.1.0
-     * @deprecated since it is not used anymore
+     * @deprecated 100.3.0 since it is not used anymore
      */
     protected $scopeConfig;
 
@@ -55,14 +55,14 @@ class ClientResolver
      *
      * @var string
      * @since 100.1.0
-     * @deprecated since it is not used anymore
+     * @deprecated 100.3.0 since it is not used anymore
      */
     protected $path;
 
     /**
      * Config Scope
      * @since 100.1.0
-     * @deprecated since it is not used anymore
+     * @deprecated 100.3.0 since it is not used anymore
      */
     protected $scope;
 

app/code/Magento/AdvancedSearch/Model/Client/ClientResolver.php

@@ -4,11 +4,11 @@
  * See COPYING.txt for license details.
  */
 ?>
-<button class="scalable" type="button" id="<?= $block->getHtmlId() ?>" data-mage-init='{"testConnection":{
+<button class="scalable" type="button" id="<?= /* @noEscape */ $block->getHtmlId() ?>" data-mage-init='{"testConnection":{
     "url": "<?= $block->escapeUrl($block->getAjaxUrl()) ?>",
-    "elementId": "<?= $block->getHtmlId() ?>",
+    "elementId": "<?= /* @noEscape */ $block->getHtmlId() ?>",
     "successText": "<?= $block->escapeHtmlAttr(__('Successful! Test again?')) ?>",
     "failedText": "<?= $block->escapeHtmlAttr(__('Connection failed! Test again?')) ?>",
     "fieldMapping": "<?= /* @noEscape */ $block->getFieldMapping() ?>"}, "validation": {}}'>
-    <span id="<?= $block->getHtmlId() ?>_result"><?= $block->escapeHtml($block->getButtonLabel()) ?></span>
+    <span id="<?= /* @noEscape */ $block->getHtmlId() ?>_result"><?= $block->escapeHtml($block->getButtonLabel()) ?></span>
 </button>

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

@@ -9,30 +9,35 @@
  * Represents converter interface for http request and response body.
  *
  * @api
+ * @since 100.2.0
  */
 interface ConverterInterface
 {
     /**
      * @param string $body
      *
      * @return array
+     * @since 100.2.0
      */
     public function fromBody($body);
 
     /**
      * @param array $data
      *
      * @return string
+     * @since 100.2.0
      */
     public function toBody(array $data);
 
     /**
      * @return string
+     * @since 100.2.0
      */
     public function getContentTypeHeader();
 
     /**
      * @return string
+     * @since 100.3.0
      */
     public function getContentMediaType(): string;
 }

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

@@ -53,6 +53,8 @@ public function __construct(
     }
 
     /**
+     * Get select
+     *
      * @return Select
      */
     public function getSelect()
@@ -61,6 +63,8 @@ public function getSelect()
     }
 
     /**
+     * Get connection name
+     *
      * @return string
      */
     public function getConnectionName()
@@ -69,6 +73,8 @@ public function getConnectionName()
     }
 
     /**
+     * Get config
+     *
      * @return array
      */
     public function getConfig()
@@ -78,10 +84,10 @@ public function getConfig()
 
     /**
      * Specify data which should be serialized to JSON
+     *
      * @link http://php.net/manual/en/jsonserializable.jsonserialize.php
      * @return mixed data which can be serialized by <b>json_encode</b>,
      * which is a value of any type other than a resource.
-     * @since 5.4.0
      */
     public function jsonSerialize()
     {