Merge remote-tracking branch 'mainline/develop' into develop

Author: Mike Weis

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

@@ -13,18 +13,18 @@
 class Actions extends \Magento\Backend\Block\Widget\Grid\Column\Renderer\AbstractRenderer
 {
     /**
-     * @var \Magento\Core\Helper\Url
+     * @var \Magento\Framework\Url\Helper\Data
      */
     protected $_urlHelper;
 
     /**
      * @param \Magento\Backend\Block\Context $context
-     * @param \Magento\Core\Helper\Url $urlHelper
+     * @param \Magento\Framework\Url\Helper\Data $urlHelper
      * @param array $data
      */
     public function __construct(
         \Magento\Backend\Block\Context $context,
-        \Magento\Core\Helper\Url $urlHelper,
+        \Magento\Framework\Url\Helper\Data $urlHelper,
         array $data = []
     ) {
         $this->_urlHelper = $urlHelper;

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

@@ -15,23 +15,23 @@ class Messages extends \Magento\Backend\Block\Template
     protected $_messages;
 
     /**
-     * @var \Magento\Core\Helper\Data
+     * @var \Magento\Framework\Json\Helper\Data
      */
-    protected $_coreHelper;
+    protected $jsonHelper;
 
     /**
      * @param \Magento\Backend\Block\Template\Context $context
      * @param \Magento\AdminNotification\Model\Resource\System\Message\Collection\Synchronized $messages
-     * @param \Magento\Core\Helper\Data $coreHelper
+     * @param \Magento\Framework\Json\Helper\Data $jsonHelper
      * @param array $data
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
         \Magento\AdminNotification\Model\Resource\System\Message\Collection\Synchronized $messages,
-        \Magento\Core\Helper\Data $coreHelper,
+        \Magento\Framework\Json\Helper\Data $jsonHelper,
         array $data = []
     ) {
-        $this->_coreHelper = $coreHelper;
+        $this->jsonHelper = $jsonHelper;
         parent::__construct($context, $data);
         $this->_messages = $messages;
     }
@@ -117,7 +117,7 @@ protected function _getMessagesUrl()
      */
     public function getSystemMessageDialogJson()
     {
-        return $this->_coreHelper->jsonEncode(
+        return $this->jsonHelper->jsonEncode(
             [
                 'systemMessageDialog' => [
                     'autoOpen' => false,

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

@@ -31,7 +31,7 @@ public function execute()
             $responseData['success'] = false;
         }
         $this->getResponse()->representJson(
-            $this->_objectManager->create('Magento\Core\Helper\Data')->jsonEncode($responseData)
+            $this->_objectManager->create('Magento\Framework\Json\Helper\Data')->jsonEncode($responseData)
         );
     }
 }

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

@@ -25,7 +25,7 @@ public function execute()
             $result[] = ['severity' => $item->getSeverity(), 'text' => $item->getText()];
         }
         $this->getResponse()->representJson(
-            $this->_objectManager->get('Magento\Core\Helper\Data')->jsonEncode($result)
+            $this->_objectManager->get('Magento\Framework\Json\Helper\Data')->jsonEncode($result)
         );
     }
 }

app/code/Magento/Backend/App/AbstractAction.php

@@ -263,7 +263,7 @@ public function _processUrlKeys()
             if ($this->getRequest()->getQuery('isAjax', false) || $this->getRequest()->getQuery('ajax', false)) {
                 $this->getResponse()->representJson(
                     $this->_objectManager->get(
-                        'Magento\Core\Helper\Data'
+                        'Magento\Framework\Json\Helper\Data'
                     )->jsonEncode(
                         ['error' => true, 'message' => $_keyErrorMsg]
                     )

app/code/Magento/Backend/Block/Page/Locale.php

@@ -27,22 +27,22 @@ class Locale extends \Magento\Backend\Block\Template
     protected $_localeResolver;
 
     /**
-     * @var \Magento\Core\Helper\Url
+     * @var \Magento\Framework\Url\Helper\Data
      */
     protected $_urlHelper;
 
     /**
      * @param \Magento\Backend\Block\Template\Context $context
      * @param \Magento\Framework\Locale\ListsInterface $localeLists
      * @param \Magento\Framework\Locale\ResolverInterface $localeResolver
-     * @param \Magento\Core\Helper\Url $urlHelper
+     * @param \Magento\Framework\Url\Helper\Data $urlHelper
      * @param array $data
      */
     public function __construct(
         \Magento\Backend\Block\Template\Context $context,
         \Magento\Framework\Locale\ListsInterface $localeLists,
         \Magento\Framework\Locale\ResolverInterface $localeResolver,
-        \Magento\Core\Helper\Url $urlHelper,
+        \Magento\Framework\Url\Helper\Data $urlHelper,
         array $data = []
     ) {
         $this->_localeLists = $localeLists;

app/code/Magento/Backend/composer.json

@@ -5,7 +5,6 @@
         "php": "~5.5.0|~5.6.0",
         "magento/module-store": "0.42.0-beta10",
         "magento/module-directory": "0.42.0-beta10",
-        "magento/module-core": "0.42.0-beta10",
         "magento/module-developer": "0.42.0-beta10",
         "magento/module-eav": "0.42.0-beta10",
         "magento/module-cron": "0.42.0-beta10",

app/code/Magento/Backend/view/adminhtml/templates/system/search.phtml

@@ -18,7 +18,7 @@
                         id="search-global"
                         placeholder="<?php echo __('Search')?>"
                         name="query"
-                        data-mage-init='<?php echo $block->escapeHtml($this->helper('Magento\Core\Helper\Data')->jsonEncode($block->getWidgetInitOptions()))?>'>
+                        data-mage-init='<?php echo $block->escapeHtml($this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($block->getWidgetInitOptions()))?>'>
             </div>
         </div>
         <div class="actions search-global-actions">

app/code/Magento/Backend/view/adminhtml/templates/widget/button/split.phtml

@@ -9,8 +9,6 @@
 ?>
 <?php
 /** @var $block \Magento\Backend\Block\Widget\Button\SplitButton */
-/** @var $_helper \Magento\Core\Helper\Data */
-$_helper = $this->helper('Magento\Core\Helper\Data');
 ?>
 
 <div <?php echo $block->getAttributesHtml(); ?>>

app/code/Magento/Backend/view/adminhtml/templates/widget/form/element/gallery.phtml

@@ -75,7 +75,7 @@ window.addNewImage = function()
     new_row_input.value = '0';
 
     // Delete button
-    new_row_button = <?php echo $this->helper('Magento\Core\Helper\Data')->jsonEncode($block->getDeleteButtonHtml("this")) ?>;
+    new_row_button = <?php echo $this->helper('Magento\Framework\Json\Helper\Data')->jsonEncode($block->getDeleteButtonHtml("this")) ?>;
 
     table = document.getElementById( "gallery" );