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

Conflicts: dev/tests/unit/testsuite/Magento/Framework/Module/Setup/MigrationTest.php
shuaiZend · Mar 5, 2015 · 0df90f9 · 0df90f9
2 parents 753cc0e + 3ab5b37
commit 0df90f9
Show file tree

Hide file tree

Showing 529 changed files with 18,017 additions and 4,064 deletions.
diff --git a/app/code/Magento/AdminNotification/Block/Grid/Renderer/Actions.php b/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;

diff --git a/app/code/Magento/AdminNotification/Block/System/Messages.php b/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,

diff --git a/app/code/Magento/AdminNotification/Controller/Adminhtml/Notification/AjaxMarkAsRead.php b/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)
         );
     }
 }
diff --git a/app/code/Magento/AdminNotification/Controller/Adminhtml/System/Message/ListAction.php b/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)
         );
     }
 }
diff --git a/app/code/Magento/Backend/App/AbstractAction.php b/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]
                     )

diff --git a/app/code/Magento/Backend/Block/Page/Locale.php b/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;

diff --git a/app/code/Magento/Backend/composer.json b/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",

diff --git a/app/code/Magento/Backend/view/adminhtml/templates/system/search.phtml b/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">

diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/button/split.phtml b/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(); ?>>

diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/form/element/gallery.phtml b/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" );
 

diff --git a/app/code/Magento/Bundle/Api/Data/LinkInterface.php b/app/code/Magento/Bundle/Api/Data/LinkInterface.php
@@ -16,34 +16,74 @@ interface LinkInterface extends \Magento\Framework\Api\ExtensibleDataInterface
      */
     public function getSku();
 
+    /**
+     * Set linked product sku
+     *
+     * @param string $sku
+     * @return $this
+     */
+    public function setSku($sku);
+
     /**
      * Get option id
      *
      * @return int|null
      */
     public function getOptionId();
 
+    /**
+     * Set option id
+     *
+     * @param int $optionId
+     * @return $this
+     */
+    public function setOptionId($optionId);
+
     /**
      * Get qty
      *
      * @return float|null
      */
     public function getQty();
 
+    /**
+     * Set qty
+     *
+     * @param float $qty
+     * @return $this
+     */
+    public function setQty($qty);
+
     /**
      * Get position
      *
      * @return int|null
      */
     public function getPosition();
 
+    /**
+     * Set position
+     *
+     * @param int $position
+     * @return $this
+     */
+    public function setPosition($position);
+
     /**
      * Get is defined
      *
      * @return bool|null
      */
     public function getIsDefined();
 
+    /**
+     * Set is defined
+     *
+     * @param bool $isDefined
+     * @return $this
+     */
+    public function setIsDefined($isDefined);
+
     /**
      * Get is default
      *
@@ -52,24 +92,56 @@ public function getIsDefined();
      */
     public function getIsDefault();
 
+    /**
+     * Set is default
+     *
+     * @param bool $isDefault
+     * @return $this
+     */
+    public function setIsDefault($isDefault);
+
     /**
      * Get price
      *
      * @return float
      */
     public function getPrice();
 
+    /**
+     * Set price
+     *
+     * @param float $price
+     * @return $this
+     */
+    public function setPrice($price);
+
     /**
      * Get price type
      *
      * @return int
      */
     public function getPriceType();
 
+    /**
+     * Set price type
+     *
+     * @param int $priceType
+     * @return $this
+     */
+    public function setPriceType($priceType);
+
     /**
      * Get whether quantity could be changed
      *
      * @return int|null
      */
     public function getCanChangeQuantity();
+
+    /**
+     * Set whether quantity could be changed
+     *
+     * @param int $canChangeQuantity
+     * @return $this
+     */
+    public function setCanChangeQuantity($canChangeQuantity);
 }
diff --git a/app/code/Magento/Bundle/Api/Data/OptionInterface.php b/app/code/Magento/Bundle/Api/Data/OptionInterface.php
@@ -16,45 +16,101 @@ interface OptionInterface extends \Magento\Framework\Api\ExtensibleDataInterface
      */
     public function getOptionId();
 
+    /**
+     * Set option id
+     *
+     * @param int $optionId
+     * @return $this
+     */
+    public function setOptionId($optionId);
+
     /**
      * Get option title
      *
      * @return string|null
      */
     public function getTitle();
 
+    /**
+     * Set option title
+     *
+     * @param string $title
+     * @return $this
+     */
+    public function setTitle($title);
+
     /**
      * Get is required option
      *
      * @return bool|null
      */
     public function getRequired();
 
+    /**
+     * Set whether option is required
+     *
+     * @param bool $required
+     * @return $this
+     */
+    public function setRequired($required);
+
     /**
      * Get input type
      *
      * @return string|null
      */
     public function getType();
 
+    /**
+     * Set input type
+     *
+     * @param string $type
+     * @return $this
+     */
+    public function setType($type);
+
     /**
      * Get option position
      *
      * @return int|null
      */
     public function getPosition();
 
+    /**
+     * Set option position
+     *
+     * @param int $position
+     * @return $this
+     */
+    public function setPosition($position);
+
     /**
      * Get product sku
      *
      * @return string|null
      */
     public function getSku();
 
+    /**
+     * Set product sku
+     *
+     * @param string $sku
+     * @return $this
+     */
+    public function setSku($sku);
+
     /**
      * Get product links
      *
      * @return \Magento\Bundle\Api\Data\LinkInterface[]|null
      */
     public function getProductLinks();
+
+    /**
+     * Set product links
+     *
+     * @param \Magento\Bundle\Api\Data\LinkInterface[] $productLinks
+     * @return $this
+     */
+    public function setProductLinks(array $productLinks = null);
 }