Merge remote-tracking branch 'mainline/develop' into MAGETWO-71359-PR-10432

# Conflicts:
#	app/code/Magento/Cron/Test/Unit/Observer/ProcessCronQueueObserverTest.php

Author: Oleksii Korshenko

.travis.yml

@@ -59,5 +59,6 @@ script:
   - test $TEST_SUITE = "functional" && TEST_FILTER='dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests.php' || true
 
   # The scripts for grunt/phpunit type tests
-  - if [ $TEST_SUITE != "js" ]; then phpunit -c dev/tests/$TEST_SUITE $TEST_FILTER; fi
+  - if [ $TEST_SUITE == "functional" ]; then dev/tests/functional/vendor/phpunit/phpunit/phpunit -c dev/tests/$TEST_SUITE $TEST_FILTER; fi
+  - if [ $TEST_SUITE != "functional" ] && [ $TEST_SUITE != "js" ]; then phpunit -c dev/tests/$TEST_SUITE $TEST_FILTER; fi
   - if [ $TEST_SUITE == "js" ]; then grunt $GRUNT_COMMAND; fi

app/code/Magento/AdminNotification/Block/Grid/Renderer/Actions.php

@@ -8,6 +8,10 @@
 
 namespace Magento\AdminNotification\Block\Grid\Renderer;
 
+/**
+ * Class \Magento\AdminNotification\Block\Grid\Renderer\Actions
+ *
+ */
 class Actions extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
 {
     /**

app/code/Magento/AdminNotification/Block/Grid/Renderer/Notice.php

@@ -7,6 +7,10 @@
  */
 namespace Magento\AdminNotification\Block\Grid\Renderer;
 
+/**
+ * Class \Magento\AdminNotification\Block\Grid\Renderer\Notice
+ *
+ */
 class Notice extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
 {
     /**

app/code/Magento/AdminNotification/Block/Grid/Renderer/Severity.php

@@ -9,6 +9,10 @@
 
 use Magento\Framework\Notification\MessageInterface;
 
+/**
+ * Class \Magento\AdminNotification\Block\Grid\Renderer\Severity
+ *
+ */
 class Severity extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
 {
     /**

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

@@ -5,6 +5,10 @@
  */
 namespace Magento\AdminNotification\Block\System;
 
+/**
+ * Class \Magento\AdminNotification\Block\System\Messages
+ *
+ */
 class Messages extends \Magento\Backend\Block\Template
 {
     /**

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

@@ -6,12 +6,35 @@
  */
 namespace Magento\AdminNotification\Controller\Adminhtml\Notification;
 
+use Magento\Backend\App\Action;
+use Magento\Framework\Controller\ResultFactory;
+
 class AjaxMarkAsRead extends \Magento\AdminNotification\Controller\Adminhtml\Notification
 {
+    /**
+     * @var \Magento\AdminNotification\Model\NotificationService
+     */
+    private $notificationService;
+
+    /**
+     * @param Action\Context $context
+     * @param \Magento\AdminNotification\Model\NotificationService|null $notificationService
+     * @throws \RuntimeException
+     */
+    public function __construct(
+        Action\Context $context,
+        \Magento\AdminNotification\Model\NotificationService $notificationService = null
+    ) {
+        parent::__construct($context);
+        $this->notificationService = $notificationService?: \Magento\Framework\App\ObjectManager::getInstance()
+            ->get(\Magento\AdminNotification\Model\NotificationService::class);
+    }
+
     /**
      * Mark notification as read (AJAX action)
      *
-     * @return void
+     * @return \Magento\Framework\Controller\Result\Json|void
+     * @throws \InvalidArgumentException
      */
     public function execute()
     {
@@ -21,17 +44,15 @@ public function execute()
         $notificationId = (int)$this->getRequest()->getPost('id');
         $responseData = [];
         try {
-            $this->_objectManager->create(
-                \Magento\AdminNotification\Model\NotificationService::class
-            )->markAsRead(
-                $notificationId
-            );
+            $this->notificationService->markAsRead($notificationId);
             $responseData['success'] = true;
         } catch (\Exception $e) {
             $responseData['success'] = false;
         }
-        $this->getResponse()->representJson(
-            $this->_objectManager->create(\Magento\Framework\Json\Helper\Data::class)->jsonEncode($responseData)
-        );
+
+        /** @var \Magento\Framework\Controller\Result\Json $resultJson */
+        $resultJson = $this->resultFactory->create(ResultFactory::TYPE_JSON);
+        $resultJson->setData($responseData);
+        return $resultJson;
     }
 }

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

@@ -6,6 +6,10 @@
  */
 namespace Magento\AdminNotification\Controller\Adminhtml\Notification;
 
+/**
+ * Class \Magento\AdminNotification\Controller\Adminhtml\Notification\Index
+ *
+ */
 class Index extends \Magento\AdminNotification\Controller\Adminhtml\Notification
 {
     /**

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

@@ -6,6 +6,10 @@
  */
 namespace Magento\AdminNotification\Controller\Adminhtml\Notification;
 
+/**
+ * Class \Magento\AdminNotification\Controller\Adminhtml\Notification\MarkAsRead
+ *
+ */
 class MarkAsRead extends \Magento\AdminNotification\Controller\Adminhtml\Notification
 {
     /**

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

@@ -6,6 +6,10 @@
  */
 namespace Magento\AdminNotification\Controller\Adminhtml\Notification;
 
+/**
+ * Class \Magento\AdminNotification\Controller\Adminhtml\Notification\MassMarkAsRead
+ *
+ */
 class MassMarkAsRead extends \Magento\AdminNotification\Controller\Adminhtml\Notification
 {
 

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

@@ -6,6 +6,10 @@
  */
 namespace Magento\AdminNotification\Controller\Adminhtml\Notification;
 
+/**
+ * Class \Magento\AdminNotification\Controller\Adminhtml\Notification\MassRemove
+ *
+ */
 class MassRemove extends \Magento\AdminNotification\Controller\Adminhtml\Notification
 {