ACP2E-3862: Partial update of copyrights for CE for file types 'php', 'phtml', 'html', 'js'

o-iegorov · o-iegorov · commit 32aefa9788b8 · 2025-05-14T11:35:11.000-05:00
diff --git a/app/code/Magento/AdminAnalytics/Controller/Adminhtml/Config/DisableAdminUsage.php b/app/code/Magento/AdminAnalytics/Controller/Adminhtml/Config/DisableAdminUsage.php
@@ -91,7 +91,7 @@ private function markUserNotified(): ResultInterface
     public function execute()
     {
         $this->disableAdminUsage();
-        $this->markUserNotified();
+        return $this->markUserNotified();
     }
 
     /**
diff --git a/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/Index.php b/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/Index.php
@@ -22,6 +22,6 @@ public function execute()
             __('Messages Inbox')
         );
         $this->_view->getPage()->getConfig()->getTitle()->prepend(__('Notifications'));
-        $this->_view->renderLayout();
+        return $this->_view->renderLayout();
     }
 }
diff --git a/app/code/Magento/AdminNotification/Controller/Adminhtml/System/Message/ListAction.php b/app/code/Magento/AdminNotification/Controller/Adminhtml/System/Message/ListAction.php
@@ -7,6 +7,9 @@
 
 use Magento\Framework\Controller\ResultFactory;
 
+/**
+ * @SuppressWarnings(PHPMD.AllPurposeAction)
+ */
 class ListAction extends \Magento\Backend\App\AbstractAction
 {
     /**
diff --git a/app/code/Magento/AdminNotification/view/adminhtml/templates/system/messages.phtml b/app/code/Magento/AdminNotification/view/adminhtml/templates/system/messages.phtml
@@ -4,42 +4,48 @@
  * All Rights Reserved.
  */
 
-/** @var $block \Magento\AdminNotification\Block\System\Messages */
+/**
+ * @var \Magento\AdminNotification\Block\System\Messages $block
+ * @var \Magento\Framework\Escaper $escaper
+ */
 ?>
 
-<?php $lastCritical = $block->getLastCritical();?>
+<?php
+$lastCritical = $block->getLastCritical();
+?>
 <div id="system_messages"
-     class="message-system<?php if ($lastCritical) : ?>
-     message-system-unread<?php endif; ?>">
+     class="message-system<?php if ($lastCritical):?>
+     message-system-unread<?php endif;?>">
     <div class="message-system-inner">
         <?php if ($lastCritical) : ?>
             <ul class="message-system-list">
                 <li class="message message-warning error">
-                    <?= $block->escapeHtml($lastCritical->getText()) ?>
+                    <?= $escaper->escapeHtml($lastCritical->getText()) ?>
                 </li>
             </ul>
         <?php endif; ?>
         <div class="message-system-short">
             <span class="message-system-short-label">
-                <?= $block->escapeHtml(__('System Messages:')) ?>
+                <?= $escaper->escapeHtml(__('System Messages:'))?>
             </span>
 
             <?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="<?= $escaper->escapeHtml(__('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="<?= $escaper->escapeHtml(__('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="<?= $escaper->escapeHtml(__('System messages')) ?>"
+             data-mage-init='<?= $escaper->escapeHtml($block->getSystemMessageDialogJson()) ?>'></div>
     </div>
 </div>
diff --git a/app/code/Magento/AdminNotification/view/adminhtml/templates/system/messages/popup.phtml b/app/code/Magento/AdminNotification/view/adminhtml/templates/system/messages/popup.phtml
@@ -4,16 +4,19 @@
  * All Rights Reserved.
  */
 
-/** @var $block \Magento\AdminNotification\Block\System\Messages\UnreadMessagePopup */
-/** @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer */
+/**
+ * @var \Magento\AdminNotification\Block\System\Messages\UnreadMessagePopup $block
+ * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
+ * @var \Magento\Framework\Escaper $escaper
+ */
 ?>
 
 <div id="system_messages_list" data-role="system_messages_list"
-     title="<?= $block->escapeHtmlAttr($block->getPopupTitle()) ?>">
+     title="<?= $escaper->escapeHtmlAttr($block->getPopupTitle()) ?>">
     <ul class="message-system-list messages">
         <?php foreach ($block->getUnreadMessages() as $message): ?>
             <li class="message message-warning <?= $block->escapeHtmlAttr($block->getItemClass($message)) ?>">
-                <?= $block->escapeHtml($message->getText()) ?>
+                <?= $escaper->escapeHtml($message->getText()) ?>
             </li>
         <?php endforeach;?>
     </ul>
diff --git a/app/code/Magento/AdminNotification/view/adminhtml/templates/toolbar_entry.phtml b/app/code/Magento/AdminNotification/view/adminhtml/templates/toolbar_entry.phtml
@@ -4,7 +4,10 @@
  * All Rights Reserved.
  */
 // phpcs:disable Generic.Files.LineLength
-/** @var $block \Magento\AdminNotification\Block\ToolbarEntry */
+/**
+ * @var \Magento\AdminNotification\Block\ToolbarEntry $block
+ * @var \Magento\Framework\Escaper $escaper
+ */
     $notificationCount = $block->getUnreadNotificationCount();
     $notificationCounterMax = $block->getNotificationCounterMax();
 ?>
@@ -14,67 +17,69 @@
     data-notification-count="<?= (int)$notificationCount ?>">
     <?php if ($notificationCount > 0): ?>
         <a
-            href="<?= $block->escapeUrl($block->getUrl('adminhtml/notification/index')) ?>"
+            href="<?= $escaper->escapeUrl($block->getUrl('adminhtml/notification/index')) ?>"
             class="notifications-action admin__action-dropdown"
             data-mage-init='{"dropdown":{}}'
-            title="<?= $block->escapeHtmlAttr(__('Notifications')) ?>"
+            title="<?= $escaper->escapeHtmlAttr(__('Notifications')) ?>"
             data-toggle="dropdown">
             <span class="notifications-counter">
                 <?= /* @noEscape */ ($notificationCount > $notificationCounterMax) ? (int)$notificationCounterMax . '+' : (int)$notificationCount ?>
             </span>
         </a>
         <ul
             class="admin__action-dropdown-menu"
-            data-mark-as-read-url="<?= $block->escapeUrl($block->getUrl('adminhtml/notification/ajaxMarkAsRead')) ?>">
+            data-mark-as-read-url="<?= $escaper->escapeUrl($block->getUrl('adminhtml/notification/ajaxMarkAsRead')) ?>">
             <?php foreach ($block->getLatestUnreadNotifications() as $notification): ?>
                 <?php /** @var $notification \Magento\AdminNotification\Model\Inbox */ ?>
                 <li class="notifications-entry<?php if ($notification->getSeverity() == 1): ?> notifications-critical<?php endif; ?>"
-                    data-notification-id="<?= $block->escapeHtmlAttr($notification->getId()) ?>"
+                    data-notification-id="<?= $escaper->escapeHtmlAttr($notification->getId()) ?>"
                     data-notification-severity="<?php if ($notification->getSeverity() == 1): ?>1<?php endif; ?>">
                     <?php
                         $notificationDescription = $notification->getDescription() ?? '';
                         $notificationDescriptionLength = $block->getNotificationDescriptionLength();
                     ?>
                     <strong class="notifications-entry-title">
-                        <?= $block->escapeHtml($notification->getTitle()) ?>
+                        <?= $escaper->escapeHtml($notification->getTitle()) ?>
                     </strong>
                     <?php if (strlen($notificationDescription) > $notificationDescriptionLength): ?>
                         <p class="notifications-entry-description _cutted">
                             <span class="notifications-entry-description-start">
-                                <?= $block->escapeHtml(substr($notificationDescription, 0, $notificationDescriptionLength)) ?>
+                                <?= $escaper->escapeHtml(substr($notificationDescription, 0, $notificationDescriptionLength)) ?>
                             </span>
                             <span class="notifications-entry-description-end">
-                                <?= $block->escapeHtml(substr($notificationDescription, $notificationDescriptionLength)) ?>
+                                <?= $escaper->escapeHtml(substr($notificationDescription, $notificationDescriptionLength)) ?>
                             </span>
                         </p>
                     <?php else: ?>
                         <p class="notifications-entry-description">
-                            <?= $block->escapeHtml($notificationDescription) ?>
+                            <?= $escaper->escapeHtml($notificationDescription) ?>
                         </p>
                     <?php endif; ?>
                     <time class="notifications-entry-time">
-                        <?= $block->escapeHtml($block->formatNotificationDate($notification->getDateAdded())) ?>
+                        <?= $escaper->escapeHtml($block->formatNotificationDate($notification->getDateAdded())) ?>
                     </time>
                     <button
                         type="button"
                         class="notifications-close"
-                        title="<?= $block->escapeHtmlAttr(__('Close')) ?>"
+                        title="<?= $escaper->escapeHtmlAttr(__('Close')) ?>"
                         ></button>
                 </li>
             <?php endforeach; ?>
             <li class="notifications-entry notifications-entry-last">
                 <a
-                    href="<?= $block->escapeUrl($block->getUrl('adminhtml/notification/index')) ?>"
+                    href="<?= $escaper->escapeUrl($block->getUrl('adminhtml/notification/index')) ?>"
                     class="action-tertiary action-more">
-                    <?= $block->escapeHtml(__('See All (')) ?><span class="notifications-counter"><?= (int)$notificationCount ?></span><?= $block->escapeHtml(__(' unread)')) ?>
+                    <?= $escaper->escapeHtml(__('See All (')) ?><span
+                        class="notifications-counter"><?= (int)$notificationCount ?></span>
+                    <?= $escaper->escapeHtml(__(' unread)')) ?>
                 </a>
             </li>
         </ul>
     <?php else: ?>
         <a
             class="notifications-action admin__action-dropdown"
-            href="<?= $block->escapeUrl($block->getUrl('adminhtml/notification/index')) ?>"
-            title="<?= $block->escapeHtmlAttr(__('Notifications')) ?>">
+            href="<?= $escaper->escapeUrl($block->getUrl('adminhtml/notification/index')) ?>"
+            title="<?= $escaper->escapeHtmlAttr(__('Notifications')) ?>">
         </a>
     <?php endif; ?>
 </div>
diff --git a/app/code/Magento/Analytics/Controller/Adminhtml/Subscription/Retry.php b/app/code/Magento/Analytics/Controller/Adminhtml/Subscription/Retry.php
@@ -15,6 +15,7 @@
 
 /**
  * Retry subscription to Magento BI Advanced Reporting.
+ * @SuppressWarnings(PHPMD.AllPurposeAction)
  */
 class Retry extends Action
 {
diff --git a/app/code/Magento/Analytics/Model/FileInfoManager.php b/app/code/Magento/Analytics/Model/FileInfoManager.php
@@ -118,6 +118,7 @@ private function encodeValue($value)
      */
     private function decodeValue($value)
     {
+        // phpcs:ignore Magento2.Functions.DiscouragedFunction
         return base64_decode($value);
     }
 }
diff --git a/app/code/Magento/Analytics/Model/FileRecorder.php b/app/code/Magento/Analytics/Model/FileRecorder.php
@@ -125,7 +125,7 @@ private function removeOldFile(FileInfo $fileInfo, WriteInterface $directory)
         }
 
         $directory->delete($fileInfo->getPath());
-
+        // phpcs:ignore Magento2.Functions.DiscouragedFunction
         $directoryName = dirname($fileInfo->getPath());
         if ($directoryName !== '.') {
             $directory->delete($directoryName);
diff --git a/app/code/Magento/Analytics/Model/StoreConfigurationProvider.php b/app/code/Magento/Analytics/Model/StoreConfigurationProvider.php
@@ -49,7 +49,9 @@ public function __construct(
 
     /**
      * Generates report using config paths from di.xml
+     *
      * For each website and store
+     *
      * @return \IteratorIterator
      */
     public function getReport()
@@ -58,6 +60,7 @@ public function getReport()
 
         /** @var WebsiteInterface $website */
         foreach ($this->storeManager->getWebsites() as $website) {
+            // phpcs:ignore Magento2.Performance.ForeachArrayMerge
             $configReport = array_merge(
                 $this->generateReportForScope(ScopeInterface::SCOPE_WEBSITES, $website->getId()),
                 $configReport
@@ -66,6 +69,7 @@ public function getReport()
 
         /** @var StoreInterface $store */
         foreach ($this->storeManager->getStores() as $store) {
+            // phpcs:ignore Magento2.Performance.ForeachArrayMerge
             $configReport = array_merge(
                 $this->generateReportForScope(ScopeInterface::SCOPE_STORES, $store->getId()),
                 $configReport
diff --git a/app/code/Magento/Analytics/Plugin/BearerTokenValidatorPlugin.php b/app/code/Magento/Analytics/Plugin/BearerTokenValidatorPlugin.php
@@ -30,14 +30,13 @@ public function __construct(ScopeConfigInterface $config)
         $this->config = $config;
     }
 
-    /***
+    /**
      * Always allow access token for analytics to be used as bearer
      *
      * @param BearerTokenValidator $subject
      * @param bool $result
      * @param Integration $integration
      * @return bool
-     *
      * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function afterIsIntegrationAllowedAsBearerToken(
diff --git a/app/code/Magento/Analytics/ReportXml/DB/Assembler/JoinAssembler.php b/app/code/Magento/Analytics/ReportXml/DB/Assembler/JoinAssembler.php
@@ -89,6 +89,7 @@ public function assemble(SelectBuilder $selectBuilder, $queryConfig)
                 )
             ];
             if (isset($join['filter'])) {
+                // phpcs:ignore Magento2.Performance.ForeachArrayMerge
                 $filters = array_merge(
                     $filters,
                     [
@@ -102,6 +103,7 @@ public function assemble(SelectBuilder $selectBuilder, $queryConfig)
                 );
             }
             $columns = $this->columnsResolver->getColumns($selectBuilder, isset($join['attribute']) ? $join : []);
+            // phpcs:ignore Magento2.Performance.ForeachArrayMerge
             $selectBuilder->setColumns(array_merge($selectBuilder->getColumns(), $columns));
         }
         $selectBuilder->setFilters($filters);
diff --git a/app/code/Magento/Analytics/ReportXml/DB/ConditionResolver.php b/app/code/Magento/Analytics/ReportXml/DB/ConditionResolver.php
@@ -140,6 +140,7 @@ public function getFilter(SelectBuilder $selectBuilder, $filterConfig, $aliasNam
             $parts = [];
             foreach ($filter['condition'] as $condition) {
                 if (isset($condition['type']) && $condition['type'] == 'variable') {
+                    // phpcs:ignore Magento2.Performance.ForeachArrayMerge
                     $selectBuilder->setParams(array_merge($selectBuilder->getParams(), [$condition['_value']]));
                 }
                 $parts[] = $this->getCondition(

Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ private function markUserNotified(): ResultInterface`
`91`	`91`	`public function execute()`
`92`	`92`	`{`
`93`	`93`	`$this->disableAdminUsage();`
`94`		`- $this->markUserNotified();`
	`94`	`+ return $this->markUserNotified();`
`95`	`95`	`}`
`96`	`96`
`97`	`97`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,6 @@ public function execute()`
`22`	`22`	`__('Messages Inbox')`
`23`	`23`	`);`
`24`	`24`	`$this->_view->getPage()->getConfig()->getTitle()->prepend(__('Notifications'));`
`25`		`- $this->_view->renderLayout();`
	`25`	`+ return $this->_view->renderLayout();`
`26`	`26`	`}`
`27`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,9 @@`
`7`	`7`
`8`	`8`	`use Magento\Framework\Controller\ResultFactory;`
`9`	`9`
	`10`	`+/**`
	`11`	`+ * @SuppressWarnings(PHPMD.AllPurposeAction)`
	`12`	`+ */`
`10`	`13`	`class ListAction extends \Magento\Backend\App\AbstractAction`
`11`	`14`	`{`
`12`	`15`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@`
`15`	`15`
`16`	`16`	`/**`
`17`	`17`	`* Retry subscription to Magento BI Advanced Reporting.`
	`18`	`+ * @SuppressWarnings(PHPMD.AllPurposeAction)`
`18`	`19`	`*/`
`19`	`20`	`class Retry extends Action`
`20`	`21`	`{`
Original file line number	Diff line number	Diff line change
`@@ -118,6 +118,7 @@ private function encodeValue($value)`
`118`	`118`	`*/`
`119`	`119`	`private function decodeValue($value)`
`120`	`120`	`{`
	`121`	`+ // phpcs:ignore Magento2.Functions.DiscouragedFunction`
`121`	`122`	`return base64_decode($value);`
`122`	`123`	`}`
`123`	`124`	`}`
Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ private function removeOldFile(FileInfo $fileInfo, WriteInterface $directory)`
`125`	`125`	`}`
`126`	`126`
`127`	`127`	`$directory->delete($fileInfo->getPath());`
`128`		`-`
	`128`	`+ // phpcs:ignore Magento2.Functions.DiscouragedFunction`
`129`	`129`	`$directoryName = dirname($fileInfo->getPath());`
`130`	`130`	`if ($directoryName !== '.') {`
`131`	`131`	`$directory->delete($directoryName);`