Merge branch 'AC-9246' of https://github.com/magento-l3/magento2ce into PR-VK-2023-09-29

Author: vkolesny

app/code/Magento/ReleaseNotification/Controller/Adminhtml/Notification/MarkUserNotified.php

@@ -7,16 +7,19 @@
 namespace Magento\ReleaseNotification\Controller\Adminhtml\Notification;
 
 use Magento\Backend\App\Action;
+use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Controller\ResultFactory;
 use Magento\ReleaseNotification\Model\ResourceModel\Viewer\Logger as NotificationLogger;
 use Magento\Framework\App\ProductMetadataInterface;
 use Psr\Log\LoggerInterface;
 
 /**
- * Controller to record that the current admin user has seen the release notification content
+ * @deprecated Starting from Magento OS 2.4.7 Magento_ReleaseNotification module is deprecated
+ * in favor of another in-product messaging mechanism
+ * @see Current in-product messaging mechanism
  */
-class MarkUserNotified extends Action
+class MarkUserNotified extends Action implements HttpPostActionInterface
 {
     /**
      * @var ProductMetadataInterface
@@ -84,12 +87,4 @@ public function execute()
         $resultJson = $this->resultFactory->create(ResultFactory::TYPE_JSON);
         return $resultJson->setData($responseContent);
     }
-
-    /**
-     * @return bool
-     */
-    protected function _isAllowed()
-    {
-        return parent::_isAllowed();
-    }
 }

app/code/Magento/ReleaseNotification/Model/Condition/CanViewNotification.php

@@ -15,6 +15,10 @@
  * Dynamic validator for UI release notification, manage UI component visibility.
  * Return true if the logged in user has not seen the notification.
  * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
+ *
+ * @deprecated Starting from Magento OS 2.4.7 Magento_ReleaseNotification module is deprecated
+ * in favor of another in-product messaging mechanism
+ * @see Current in-product messaging mechanism
  */
 class CanViewNotification implements VisibilityConditionInterface
 {

app/code/Magento/ReleaseNotification/Model/ContentProvider/Http/HttpContentProvider.php

@@ -13,6 +13,10 @@
 
 /**
  * Requests the release notification content data via an HTTP call to a REST API
+ *
+ * @deprecated Starting from Magento OS 2.4.7 Magento_ReleaseNotification module is deprecated
+ * in favor of another in-product messaging mechanism
+ * @see Current in-product messaging mechanism
  */
 class HttpContentProvider implements ContentProviderInterface
 {

app/code/Magento/ReleaseNotification/Model/ContentProvider/Http/UrlBuilder.php

@@ -9,6 +9,10 @@
 
 /**
  * Builder to build Url to retrieve the notification content.
+ *
+ * @deprecated Starting from Magento OS 2.4.7 Magento_ReleaseNotification module is deprecated
+ * in favor of aMagento OS 2.4.7
+ * @see Current in-product messaging mechanism
  */
 class UrlBuilder
 {

app/code/Magento/ReleaseNotification/Model/ContentProviderInterface.php

@@ -9,6 +9,9 @@
 /**
  * Requests the release notification content data from a defined service
  * @api
+ * @deprecated Starting from Magento OS 2.4.7 Magento_ReleaseNotification module is deprecated
+ * in favor of another in-product messaging mechanism
+ * @see Current in-product messaging mechanism
  */
 interface ContentProviderInterface
 {

app/code/Magento/ReleaseNotification/Model/ResourceModel/Viewer/Logger.php

@@ -15,13 +15,17 @@
  * Release notification viewer log data logger.
  *
  * Saves and retrieves release notification viewer log data.
+ *
+ * @deprecated Starting from Magento OS 2.4.7 Magento_ReleaseNotification module is deprecated
+ * in favor of another in-product messaging mechanism
+ * @see Current in-product messaging mechanism
  */
 class Logger
 {
     /**
-     * Log table name
+     * Release notification log table name
      */
-    const LOG_TABLE_NAME = 'release_notification_viewer_log';
+    public const LOG_TABLE_NAME = 'release_notification_viewer_log';
 
     /**
      * @var Resource

app/code/Magento/ReleaseNotification/Model/Viewer/Log.php

@@ -9,6 +9,10 @@
 
 /**
  * Release notification viewer log resource
+ *
+ * @deprecated Starting from Magento OS 2.4.7 Magento_ReleaseNotification module is deprecated
+ * in favor of another in-product messaging mechanism
+ * @see Current in-product messaging mechanism
  */
 class Log extends DataObject
 {

app/code/Magento/ReleaseNotification/Ui/DataProvider/Modifier/Notifications.php

@@ -20,6 +20,9 @@
  * Modifies the metadata returning to the Release Notification data provider
  *
  * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
+ * @deprecated Starting from Magento OS 2.4.7 Magento_ReleaseNotification module is deprecated
+ * in favor of another in-product messaging mechanism
+ * @see Current in-product messaging mechanism
  */
 class Notifications implements ModifierInterface
 {

app/code/Magento/ReleaseNotification/Ui/DataProvider/NotificationDataProvider.php

@@ -14,6 +14,10 @@
 
 /**
  * Data Provider for the Release Notifications UI component.
+ *
+ * @deprecated Starting from Magento OS 2.4.7 Magento_ReleaseNotification module is deprecated
+ * in favor of another in-product messaging mechanism
+ * @see Current in-product messaging mechanism
  */
 class NotificationDataProvider implements DataProviderInterface
 {
@@ -177,20 +181,25 @@ public function getRequestFieldName()
 
     /**
      * @inheritdoc
+     * phpcs:disable Magento2.CodeAnalysis.EmptyBlock
      */
     public function addFilter(\Magento\Framework\Api\Filter $filter)
     {
+        // phpcs:ignore Squiz.PHP.NonExecutableCode.ReturnNotRequired
+        return;
     }
 
     /**
      * @inheritdoc
+     * phpcs:disable Magento2.CodeAnalysis.EmptyBlock
      */
     public function addOrder($field, $direction)
     {
     }
 
     /**
      * @inheritdoc
+     * phpcs:disable Magento2.CodeAnalysis.EmptyBlock
      */
     public function setLimit($offset, $size)
     {

app/code/Magento/ReleaseNotification/Ui/Renderer/NotificationRenderer.php

@@ -10,6 +10,10 @@
 
 /**
  * Builds the HTML for the release notification modals
+ *
+ * @deprecated Starting from Magento OS 2.4.7 Magento_ReleaseNotification module is deprecated
+ * in favor of another in-product messaging mechanism
+ * @see Current in-product messaging mechanism
  */
 class NotificationRenderer
 {

app/code/Magento/ReleaseNotification/etc/config.xml

@@ -9,7 +9,7 @@
     <default>
         <system>
             <release_notification>
-                <content_url>magento.com/release_notifications</content_url>
+                <content_url/>
                 <use_https>1</use_https>
             </release_notification>
         </system>