Merge remote-tracking branch 'remotes/origin/MAGETWO-89292-SDL' into MAGETWO-89292-SDL

# Conflicts:
#	app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/Product.php

Author: Eric Bohanon

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

@@ -16,24 +16,34 @@ class Messages extends \Magento\Backend\Block\Template
 
     /**
      * @var \Magento\Framework\Json\Helper\Data
+     * @deprecated
      */
     protected $jsonHelper;
 
+    /**
+     * @var \Magento\Framework\Serialize\Serializer\Json
+     */
+    private $serializer;
+
     /**
      * @param \Magento\Backend\Block\Template\Context $context
      * @param \Magento\AdminNotification\Model\ResourceModel\System\Message\Collection\Synchronized $messages
      * @param \Magento\Framework\Json\Helper\Data $jsonHelper
      * @param array $data
+     * @param \Magento\Framework\Serialize\Serializer\Json|null $serializer
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
         \Magento\AdminNotification\Model\ResourceModel\System\Message\Collection\Synchronized $messages,
         \Magento\Framework\Json\Helper\Data $jsonHelper,
-        array $data = []
+        array $data = [],
+        \Magento\Framework\Serialize\Serializer\Json $serializer = null
     ) {
         $this->jsonHelper = $jsonHelper;
         parent::__construct($context, $data);
         $this->_messages = $messages;
+        $this->serializer = $serializer ?: \Magento\Framework\App\ObjectManager::getInstance()
+            ->get(\Magento\Framework\Serialize\Serializer\Json::class);
     }
 
     /**
@@ -117,7 +127,7 @@ protected function _getMessagesUrl()
      */
     public function getSystemMessageDialogJson()
     {
-        return $this->jsonHelper->jsonEncode(
+        return $this->serializer->serialize(
             [
                 'systemMessageDialog' => [
                     'buttons' => [],

app/code/Magento/AdminNotification/Controller/Adminhtml/System/Message/ListAction.php

@@ -6,6 +6,8 @@
  */
 namespace Magento\AdminNotification\Controller\Adminhtml\System\Message;
 
+use Magento\Framework\Controller\ResultFactory;
+
 class ListAction extends \Magento\Backend\App\AbstractAction
 {
     /**
@@ -15,6 +17,7 @@ class ListAction extends \Magento\Backend\App\AbstractAction
 
     /**
      * @var \Magento\Framework\Json\Helper\Data
+     * @deprecated
      */
     protected $jsonHelper;
 
@@ -41,7 +44,7 @@ public function __construct(
     }
 
     /**
-     * @return void
+     * @return \Magento\Framework\Controller\Result\Json
      */
     public function execute()
     {
@@ -63,6 +66,9 @@ public function execute()
                     . 'Please refresh the web page to clear the notice alert.',
             ];
         }
-        $this->getResponse()->representJson($this->jsonHelper->jsonEncode($result));
+        /** @var \Magento\Framework\Controller\Result\Json $resultJson */
+        $resultJson = $this->resultFactory->create(ResultFactory::TYPE_JSON);
+        $resultJson->setData($result);
+        return $resultJson;
     }
 }

app/code/Magento/BundleGraphQl/Model/Resolver/BundleItemLinks.php

@@ -7,7 +7,7 @@
 
 namespace Magento\BundleGraphQl\Model\Resolver;
 
-use GraphQL\Type\Definition\ResolveInfo;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 use Magento\BundleGraphQl\Model\Resolver\Links\Collection;
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Query\Resolver\Value;

app/code/Magento/BundleGraphQl/Model/Resolver/BundleItems.php

@@ -7,7 +7,7 @@
 
 namespace Magento\BundleGraphQl\Model\Resolver;
 
-use GraphQL\Type\Definition\ResolveInfo;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 use Magento\Bundle\Model\Product\Type;
 use Magento\BundleGraphQl\Model\Resolver\Options\Collection;
 use Magento\Catalog\Api\Data\ProductInterface;

app/code/Magento/BundleGraphQl/Model/Resolver/Options/Label.php

@@ -7,7 +7,7 @@
 
 namespace Magento\BundleGraphQl\Model\Resolver\Options;
 
-use GraphQL\Type\Definition\ResolveInfo;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 use Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\Deferred\Product;
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Query\Resolver\Value;

app/code/Magento/BundleGraphQl/Model/Resolver/Product/Fields/DynamicPrice.php

@@ -8,7 +8,7 @@
 
 namespace Magento\BundleGraphQl\Model\Resolver\Product\Fields;
 
-use GraphQL\Type\Definition\ResolveInfo;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 use Magento\Bundle\Model\Product\Type as Bundle;
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Query\Resolver\Value;

app/code/Magento/BundleGraphQl/Model/Resolver/Product/Fields/DynamicSku.php

@@ -8,7 +8,7 @@
 
 namespace Magento\BundleGraphQl\Model\Resolver\Product\Fields;
 
-use GraphQL\Type\Definition\ResolveInfo;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 use Magento\Bundle\Model\Product\Type as Bundle;
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Query\Resolver\Value;

app/code/Magento/BundleGraphQl/Model/Resolver/Product/Fields/DynamicWeight.php

@@ -8,7 +8,7 @@
 
 namespace Magento\BundleGraphQl\Model\Resolver\Product\Fields;
 
-use GraphQL\Type\Definition\ResolveInfo;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 use Magento\Bundle\Model\Product\Type as Bundle;
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Query\Resolver\Value;

app/code/Magento/BundleGraphQl/Model/Resolver/Product/Fields/PriceView.php

@@ -8,7 +8,7 @@
 
 namespace Magento\BundleGraphQl\Model\Resolver\Product\Fields;
 
-use GraphQL\Type\Definition\ResolveInfo;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 use Magento\Bundle\Model\Product\Type as Bundle;
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Query\EnumLookup;

app/code/Magento/BundleGraphQl/Model/Resolver/Product/Fields/ShipBundleItems.php

@@ -8,7 +8,7 @@
 
 namespace Magento\BundleGraphQl\Model\Resolver\Product\Fields;
 
-use GraphQL\Type\Definition\ResolveInfo;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 use Magento\Bundle\Model\Product\Type as Bundle;
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Query\EnumLookup;