Merge remote-tracking branch 'ihor-sviziev/cleanup-objectmanager-fallback' into cleanup-objectmanager-fallback

engcom-Kilo · engcom-Kilo · commit 6ec7be9ece60 · 2020-03-03T16:40:38.000+02:00
# Conflicts:
#	app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MarkAsRead.php
#	app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MassMarkAsRead.php
#	app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MassRemove.php
#	app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/Remove.php
diff --git a/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MarkAsRead.php b/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MarkAsRead.php
@@ -40,6 +40,8 @@ public function __construct(Action\Context $context, NotificationService $notifi
 
     /**
      * @inheritdoc
+     *
+     * @return \Magento\Framework\App\ResponseInterface|\Magento\Framework\Controller\ResultInterface
      */
     public function execute()
     {
diff --git a/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MassMarkAsRead.php b/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MassMarkAsRead.php
@@ -39,6 +39,8 @@ public function __construct(Action\Context $context, InboxModelFactory $inboxMod
 
     /**
      * @inheritdoc
+     *
+     * @return \Magento\Framework\App\ResponseInterface|\Magento\Framework\Controller\ResultInterface
      */
     public function execute()
     {
diff --git a/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MassRemove.php b/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/MassRemove.php
@@ -39,6 +39,8 @@ public function __construct(Action\Context $context, InboxModelFactory $inboxMod
 
     /**
      * @inheritdoc
+     *
+     * @return \Magento\Framework\App\ResponseInterface|\Magento\Framework\Controller\ResultInterface
      */
     public function execute()
     {
diff --git a/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/Remove.php b/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/Remove.php
@@ -39,6 +39,8 @@ public function __construct(Action\Context $context, InboxModelFactory $inboxMod
 
     /**
      * @inheritdoc
+     *
+     * @return \Magento\Framework\App\ResponseInterface|\Magento\Framework\Controller\ResultInterface
      */
     public function execute()
     {

Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,8 @@ public function __construct(Action\Context $context, NotificationService $notifi`
`40`	`40`
`41`	`41`	`/**`
`42`	`42`	`* @inheritdoc`
	`43`	`+ *`
	`44`	`+ * @return \Magento\Framework\App\ResponseInterface\|\Magento\Framework\Controller\ResultInterface`
`43`	`45`	`*/`
`44`	`46`	`public function execute()`
`45`	`47`	`{`
Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,8 @@ public function __construct(Action\Context $context, InboxModelFactory $inboxMod`
`39`	`39`
`40`	`40`	`/**`
`41`	`41`	`* @inheritdoc`
	`42`	`+ *`
	`43`	`+ * @return \Magento\Framework\App\ResponseInterface\|\Magento\Framework\Controller\ResultInterface`
`42`	`44`	`*/`
`43`	`45`	`public function execute()`
`44`	`46`	`{`