magento2/pull/26939: Fixed static test.

Author: engcom-Kilo

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

@@ -12,6 +12,9 @@
 use Magento\Framework\Notification\MessageInterface;
 use Magento\Framework\Serialize\Serializer\Json as JsonSerializer;
 
+/**
+ * AdminNotification Messages class
+ */
 class Messages extends Template
 {
     /**

app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/AjaxMarkAsRead.php

@@ -1,6 +1,5 @@
 <?php
 /**
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
@@ -9,9 +8,13 @@
 use Magento\AdminNotification\Controller\Adminhtml\Notification;
 use Magento\AdminNotification\Model\NotificationService;
 use Magento\Backend\App\Action;
+use Magento\Framework\App\Action\HttpPostActionInterface;
 use Magento\Framework\Controller\ResultFactory;
 
-class AjaxMarkAsRead extends Notification
+/**
+ * AdminNotification AjaxMarkAsRead controller
+ */
+class AjaxMarkAsRead extends Notification implements HttpPostActionInterface
 {
     /**
      * @var NotificationService

app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MarkAsRead.php

@@ -1,6 +1,5 @@
 <?php
 /**
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
@@ -9,9 +8,13 @@
 use Magento\AdminNotification\Controller\Adminhtml\Notification;
 use Magento\AdminNotification\Model\NotificationService;
 use Magento\Backend\App\Action;
+use Magento\Framework\App\Action\HttpGetActionInterface;
 use Magento\Framework\Exception\LocalizedException;
 
-class MarkAsRead extends Notification
+/**
+ * AdminNotification MarkAsRead controller
+ */
+class MarkAsRead extends Notification implements HttpGetActionInterface
 {
     /**
      * Authorization level of a basic admin session
@@ -25,14 +28,20 @@ class MarkAsRead extends Notification
      */
     private $notificationService;
 
+    /**
+     * @param Action\Context $context
+     * @param NotificationService $notificationService
+     */
     public function __construct(Action\Context $context, NotificationService $notificationService)
     {
         parent::__construct($context);
         $this->notificationService = $notificationService;
     }
 
     /**
-     * @return void
+     * @inheritdoc
+     *
+     * @return \Magento\Framework\App\ResponseInterface|\Magento\Framework\Controller\ResultInterface
      */
     public function execute()
     {
@@ -50,9 +59,8 @@ public function execute()
                 );
             }
 
-            $this->getResponse()->setRedirect($this->_redirect->getRedirectUrl($this->getUrl('*')));
-            return;
+            return $this->getResponse()->setRedirect($this->_redirect->getRedirectUrl($this->getUrl('*')));
         }
-        $this->_redirect('adminhtml/*/');
+        return $this->_redirect('adminhtml/*/');
     }
 }

app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MassMarkAsRead.php

@@ -1,6 +1,5 @@
 <?php
 /**
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
@@ -9,8 +8,12 @@
 use Magento\AdminNotification\Controller\Adminhtml\Notification;
 use Magento\AdminNotification\Model\InboxFactory as InboxModelFactory;
 use Magento\Backend\App\Action;
+use Magento\Framework\App\Action\HttpPostActionInterface;
 
-class MassMarkAsRead extends Notification
+/**
+ * AdminNotification MassMarkAsRead controller
+ */
+class MassMarkAsRead extends Notification implements HttpPostActionInterface
 {
     /**
      * Authorization level of a basic admin session
@@ -24,14 +27,20 @@ class MassMarkAsRead extends Notification
      */
     private $inboxModelFactory;
 
+    /**
+     * @param Action\Context $context
+     * @param InboxModelFactory $inboxModelFactory
+     */
     public function __construct(Action\Context $context, InboxModelFactory $inboxModelFactory)
     {
         parent::__construct($context);
         $this->inboxModelFactory = $inboxModelFactory;
     }
 
     /**
-     * @return void
+     * @inheritdoc
+     *
+     * @return \Magento\Framework\App\ResponseInterface|\Magento\Framework\Controller\ResultInterface
      */
     public function execute()
     {
@@ -58,6 +67,6 @@ public function execute()
                 );
             }
         }
-        $this->_redirect('adminhtml/*/');
+        return $this->_redirect('adminhtml/*/');
     }
 }

app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MassRemove.php

@@ -1,6 +1,5 @@
 <?php
 /**
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
@@ -9,8 +8,12 @@
 use Magento\AdminNotification\Controller\Adminhtml\Notification;
 use Magento\AdminNotification\Model\InboxFactory as InboxModelFactory;
 use Magento\Backend\App\Action;
+use Magento\Framework\App\Action\HttpPostActionInterface;
 
-class MassRemove extends Notification
+/**
+ * AdminNotification MassRemove controller
+ */
+class MassRemove extends Notification implements HttpPostActionInterface
 {
 
     /**
@@ -24,14 +27,20 @@ class MassRemove extends Notification
      */
     private $inboxModelFactory;
 
+    /**
+     * @param Action\Context $context
+     * @param InboxModelFactory $inboxModelFactory
+     */
     public function __construct(Action\Context $context, InboxModelFactory $inboxModelFactory)
     {
         parent::__construct($context);
         $this->inboxModelFactory = $inboxModelFactory;
     }
 
     /**
-     * @return void
+     * @inheritdoc
+     *
+     * @return \Magento\Framework\App\ResponseInterface|\Magento\Framework\Controller\ResultInterface
      */
     public function execute()
     {
@@ -56,6 +65,6 @@ public function execute()
                 );
             }
         }
-        $this->_redirect('adminhtml/*/');
+        return $this->_redirect('adminhtml/*/');
     }
 }

app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/Remove.php

@@ -1,6 +1,5 @@
 <?php
 /**
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
@@ -9,8 +8,12 @@
 use Magento\AdminNotification\Controller\Adminhtml\Notification;
 use Magento\AdminNotification\Model\InboxFactory as InboxModelFactory;
 use Magento\Backend\App\Action;
+use Magento\Framework\App\Action\HttpGetActionInterface;
 
-class Remove extends Notification
+/**
+ * AdminNotification Remove controller
+ */
+class Remove extends Notification implements HttpGetActionInterface
 {
     /**
      * Authorization level of a basic admin session
@@ -24,23 +27,28 @@ class Remove extends Notification
      */
     private $inboxModelFactory;
 
+    /**
+     * @param Action\Context $context
+     * @param InboxModelFactory $inboxModelFactory
+     */
     public function __construct(Action\Context $context, InboxModelFactory $inboxModelFactory)
     {
         parent::__construct($context);
         $this->inboxModelFactory = $inboxModelFactory;
     }
 
     /**
-     * @return void
+     * @inheritdoc
+     *
+     * @return \Magento\Framework\App\ResponseInterface|\Magento\Framework\Controller\ResultInterface
      */
     public function execute()
     {
         if ($id = $this->getRequest()->getParam('id')) {
             $model = $this->inboxModelFactory->create()->load($id);
 
             if (!$model->getId()) {
-                $this->_redirect('adminhtml/*/');
-                return;
+                return $this->_redirect('adminhtml/*/');
             }
 
             try {
@@ -55,9 +63,8 @@ public function execute()
                 );
             }
 
-            $this->_redirect('adminhtml/*/');
-            return;
+            return $this->_redirect('adminhtml/*/');
         }
-        $this->_redirect('adminhtml/*/');
+        return $this->_redirect('adminhtml/*/');
     }
 }

dev/tests/integration/testsuite/Magento/AdminNotification/Controller/Adminhtml/Notification/MassMarkAsReadTest.php

@@ -5,12 +5,15 @@
  */
 namespace Magento\AdminNotification\Controller\Adminhtml\Notification;
 
+use Magento\Framework\App\Request\Http as HttpRequest;
+
 class MassMarkAsReadTest extends \Magento\TestFramework\TestCase\AbstractBackendController
 {
     public function setUp()
     {
         $this->resource = 'Magento_AdminNotification::mark_as_read';
         $this->uri = 'backend/admin/notification/massmarkasread';
+        $this->httpMethod = HttpRequest::METHOD_POST;
         parent::setUp();
     }
 }

dev/tests/integration/testsuite/Magento/AdminNotification/Controller/Adminhtml/Notification/MassRemoveTest.php

@@ -5,12 +5,15 @@
  */
 namespace Magento\AdminNotification\Controller\Adminhtml\Notification;
 
+use Magento\Framework\App\Request\Http as HttpRequest;
+
 class MassRemoveTest extends \Magento\TestFramework\TestCase\AbstractBackendController
 {
     public function setUp()
     {
         $this->resource = 'Magento_AdminNotification::adminnotification_remove';
         $this->uri = 'backend/admin/notification/massremove';
+        $this->httpMethod = HttpRequest::METHOD_POST;
         parent::setUp();
     }
 }