Merge remote-tracking branch 'origin/develop' into MAGETWO-35517

CHANGELOG.md

@@ -1,3 +1,30 @@
+0.74.0-beta4
+=============
+* Various
+   * Implemented the getDefaultResult method, to be able to catch exceptions in FrontController and redirect user to the correct page
+   * The getDefaultResult method is invoked to return default result of action execution within controllers. It can be used to generate the ‘execute’ method result in action controllers
+   * Eliminated the unused exceptions. Exceptions that weren't linked to any logic were also eliminated and replaced with LocalizedException or its child classes
+   * Refactored all controllers where possible: the default exception handling logic moved to FrontController. Controllers that cannot be refactored do not conflict with the new logic
+* Framework:
+   * Created Magento Console to perform CLI actions
+   * Introduced a new SalesSequence module that is responsible for documents numeration management across the Order Management System
+   * Implemented the mechanism of asynchronous indexing of sales entities grids
+* Setup
+   * Added the ConfigOption and ConfigOptionsList classes to be used by modules to manage deployment configuration
+   * Moved all existing segments logic to new classes
+   * Added the config:set command, which enables deployment configuration management
+   * Removed the old 'install-configuration' tool
+* Functional tests:
+   * Fixed functional test for order placement from backend
+   * Replaced the end-to-end test for a product with MAP with an injectable test
+* Design
+   * Updated the Blank and Luma themes to enable theme (not only library) variables overriding in the _theme.less file of any inherited theme. Included LESS code standards to the UI Library documentation
+* Fixed bugs:
+   * Fixed an issue where composite products could not be added to the order from the Recently Viewed Products section
+   * Fixed an issue where not all .js files were added to a bundle
+   * Fixed an issue where it was possible to save an incorrect IP value in the Developer Client Restriction field
+   * Fixed an issue where a raw DB error was thrown when trying to enter a custom variable with duplicated variable code
+
 0.74.0-beta3
 =============
 * API

app/code/Magento/AdminNotification/composer.json

@@ -3,15 +3,15 @@
     "description": "N/A",
     "require": {
         "php": "~5.5.0|~5.6.0",
-        "magento/module-store": "0.74.0-beta3",
-        "magento/module-backend": "0.74.0-beta3",
-        "magento/module-media-storage": "0.74.0-beta3",
-        "magento/framework": "0.74.0-beta3",
+        "magento/module-store": "0.74.0-beta4",
+        "magento/module-backend": "0.74.0-beta4",
+        "magento/module-media-storage": "0.74.0-beta4",
+        "magento/framework": "0.74.0-beta4",
         "lib-libxml": "*",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.74.0-beta3",
+    "version": "0.74.0-beta4",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

app/code/Magento/Authorization/composer.json

@@ -3,12 +3,12 @@
     "description": "Authorization module provides access to Magento ACL functionality.",
     "require": {
         "php": "~5.5.0|~5.6.0",
-        "magento/module-backend": "0.74.0-beta3",
-        "magento/framework": "0.74.0-beta3",
+        "magento/module-backend": "0.74.0-beta4",
+        "magento/framework": "0.74.0-beta4",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.74.0-beta3",
+    "version": "0.74.0-beta4",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

app/code/Magento/Backend/composer.json

@@ -3,27 +3,27 @@
     "description": "N/A",
     "require": {
         "php": "~5.5.0|~5.6.0",
-        "magento/module-store": "0.74.0-beta3",
-        "magento/module-directory": "0.74.0-beta3",
-        "magento/module-developer": "0.74.0-beta3",
-        "magento/module-eav": "0.74.0-beta3",
-        "magento/module-cron": "0.74.0-beta3",
-        "magento/module-theme": "0.74.0-beta3",
-        "magento/module-reports": "0.74.0-beta3",
-        "magento/module-sales": "0.74.0-beta3",
-        "magento/module-quote": "0.74.0-beta3",
-        "magento/module-catalog": "0.74.0-beta3",
-        "magento/module-user": "0.74.0-beta3",
-        "magento/module-backup": "0.74.0-beta3",
-        "magento/module-customer": "0.74.0-beta3",
-        "magento/module-translation": "0.74.0-beta3",
-        "magento/module-require-js": "0.74.0-beta3",
-        "magento/module-config": "0.74.0-beta3",
-        "magento/framework": "0.74.0-beta3",
+        "magento/module-store": "0.74.0-beta4",
+        "magento/module-directory": "0.74.0-beta4",
+        "magento/module-developer": "0.74.0-beta4",
+        "magento/module-eav": "0.74.0-beta4",
+        "magento/module-cron": "0.74.0-beta4",
+        "magento/module-theme": "0.74.0-beta4",
+        "magento/module-reports": "0.74.0-beta4",
+        "magento/module-sales": "0.74.0-beta4",
+        "magento/module-quote": "0.74.0-beta4",
+        "magento/module-catalog": "0.74.0-beta4",
+        "magento/module-user": "0.74.0-beta4",
+        "magento/module-backup": "0.74.0-beta4",
+        "magento/module-customer": "0.74.0-beta4",
+        "magento/module-translation": "0.74.0-beta4",
+        "magento/module-require-js": "0.74.0-beta4",
+        "magento/module-config": "0.74.0-beta4",
+        "magento/framework": "0.74.0-beta4",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.74.0-beta3",
+    "version": "0.74.0-beta4",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

app/code/Magento/Backup/composer.json

@@ -3,14 +3,14 @@
     "description": "N/A",
     "require": {
         "php": "~5.5.0|~5.6.0",
-        "magento/module-store": "0.74.0-beta3",
-        "magento/module-backend": "0.74.0-beta3",
-        "magento/module-cron": "0.74.0-beta3",
-        "magento/framework": "0.74.0-beta3",
+        "magento/module-store": "0.74.0-beta4",
+        "magento/module-backend": "0.74.0-beta4",
+        "magento/module-cron": "0.74.0-beta4",
+        "magento/framework": "0.74.0-beta4",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.74.0-beta3",
+    "version": "0.74.0-beta4",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

app/code/Magento/Bundle/Model/Product/Price.php

@@ -47,7 +47,12 @@ class Price extends \Magento\Catalog\Model\Product\Type\Price
      * @param \Magento\Framework\Event\ManagerInterface $eventManager
      * @param PriceCurrencyInterface $priceCurrency
      * @param GroupManagementInterface $groupManagement
+     * @param \Magento\Catalog\Api\Data\ProductGroupPriceInterfaceFactory $groupPriceFactory
+     * @param \Magento\Catalog\Api\Data\ProductTierPriceInterfaceFactory $tierPriceFactory
+     * @param \Magento\Framework\App\Config\ScopeConfigInterface $config
      * @param \Magento\Catalog\Helper\Data $catalogData
+     *
+     * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
         \Magento\CatalogRule\Model\Resource\RuleFactory $ruleFactory,
@@ -57,6 +62,9 @@ public function __construct(
         \Magento\Framework\Event\ManagerInterface $eventManager,
         PriceCurrencyInterface $priceCurrency,
         GroupManagementInterface $groupManagement,
+        \Magento\Catalog\Api\Data\ProductGroupPriceInterfaceFactory $groupPriceFactory,
+        \Magento\Catalog\Api\Data\ProductTierPriceInterfaceFactory $tierPriceFactory,
+        \Magento\Framework\App\Config\ScopeConfigInterface $config,
         \Magento\Catalog\Helper\Data $catalogData
     ) {
         $this->_catalogData = $catalogData;
@@ -67,7 +75,10 @@ public function __construct(
             $customerSession,
             $eventManager,
             $priceCurrency,
-            $groupManagement
+            $groupManagement,
+            $groupPriceFactory,
+            $tierPriceFactory,
+            $config
         );
     }
 

app/code/Magento/Bundle/Test/Unit/Model/Product/PriceTest.php

@@ -5,6 +5,8 @@
  */
 namespace Magento\Bundle\Test\Unit\Model\Product;
 
+use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
+
 class PriceTest extends \PHPUnit_Framework_TestCase
 {
     /**
@@ -75,16 +77,26 @@ protected function setUp()
         $this->priceCurrency = $this->getMockBuilder('Magento\Framework\Pricing\PriceCurrencyInterface')->getMock();
         $this->groupManagement = $this->getMockBuilder('Magento\Customer\Api\GroupManagementInterface')
             ->getMockForAbstractClass();
-
-        $this->model = new \Magento\Bundle\Model\Product\Price(
-            $this->ruleFactoryMock,
-            $this->storeManagerMock,
-            $this->localeDateMock,
-            $this->customerSessionMock,
-            $this->eventManagerMock,
-            $this->priceCurrency,
-            $this->groupManagement,
-            $this->catalogHelperMock
+        $gpFactory = $this->getMock('Magento\Catalog\Api\Data\ProductGroupPriceInterfaceFactory', [], [], '', false);
+        $tpFactory = $this->getMock('Magento\Catalog\Api\Data\ProductTierPriceInterfaceFactory', [], [], '', false);
+        $scopeConfig = $this->getMock('Magento\Framework\App\Config\ScopeConfigInterface');
+
+        $objectManagerHelper = new ObjectManagerHelper($this);
+        $this->model = $objectManagerHelper->getObject(
+            'Magento\Bundle\Model\Product\Price',
+            [
+                'ruleFactory' => $this->ruleFactoryMock,
+                'storeManager' => $this->storeManagerMock,
+                'localeDate' => $this->localeDateMock,
+                'customerSession' => $this->customerSessionMock,
+                'eventManager' => $this->eventManagerMock,
+                'priceCurrency' => $this->priceCurrency,
+                'groupManagement' => $this->groupManagement,
+                'groupPriceFactory' => $gpFactory,
+                'tierPriceFactory' => $tpFactory,
+                'config' => $scopeConfig,
+                'catalogData' => $this->catalogHelperMock
+            ]
         );
     }
 

app/code/Magento/Bundle/composer.json

@@ -3,28 +3,28 @@
     "description": "N/A",
     "require": {
         "php": "~5.5.0|~5.6.0",
-        "magento/module-store": "0.74.0-beta3",
-        "magento/module-catalog": "0.74.0-beta3",
-        "magento/module-tax": "0.74.0-beta3",
-        "magento/module-backend": "0.74.0-beta3",
-        "magento/module-sales": "0.74.0-beta3",
-        "magento/module-checkout": "0.74.0-beta3",
-        "magento/module-catalog-inventory": "0.74.0-beta3",
-        "magento/module-customer": "0.74.0-beta3",
-        "magento/module-catalog-rule": "0.74.0-beta3",
-        "magento/module-eav": "0.74.0-beta3",
-        "magento/module-config": "0.74.0-beta3",
-        "magento/module-gift-message": "0.74.0-beta3",
-        "magento/framework": "0.74.0-beta3",
-        "magento/module-quote": "0.74.0-beta3",
-        "magento/module-media-storage": "0.74.0-beta3",
+        "magento/module-store": "0.74.0-beta4",
+        "magento/module-catalog": "0.74.0-beta4",
+        "magento/module-tax": "0.74.0-beta4",
+        "magento/module-backend": "0.74.0-beta4",
+        "magento/module-sales": "0.74.0-beta4",
+        "magento/module-checkout": "0.74.0-beta4",
+        "magento/module-catalog-inventory": "0.74.0-beta4",
+        "magento/module-customer": "0.74.0-beta4",
+        "magento/module-catalog-rule": "0.74.0-beta4",
+        "magento/module-eav": "0.74.0-beta4",
+        "magento/module-config": "0.74.0-beta4",
+        "magento/module-gift-message": "0.74.0-beta4",
+        "magento/framework": "0.74.0-beta4",
+        "magento/module-quote": "0.74.0-beta4",
+        "magento/module-media-storage": "0.74.0-beta4",
         "magento/magento-composer-installer": "*"
     },
     "suggest": {
-        "magento/module-webapi": "0.74.0-beta3"
+        "magento/module-webapi": "0.74.0-beta4"
     },
     "type": "magento2-module",
-    "version": "0.74.0-beta3",
+    "version": "0.74.0-beta4",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

app/code/Magento/Captcha/composer.json

@@ -3,15 +3,15 @@
     "description": "N/A",
     "require": {
         "php": "~5.5.0|~5.6.0",
-        "magento/module-store": "0.74.0-beta3",
-        "magento/module-customer": "0.74.0-beta3",
-        "magento/module-checkout": "0.74.0-beta3",
-        "magento/module-backend": "0.74.0-beta3",
-        "magento/framework": "0.74.0-beta3",
+        "magento/module-store": "0.74.0-beta4",
+        "magento/module-customer": "0.74.0-beta4",
+        "magento/module-checkout": "0.74.0-beta4",
+        "magento/module-backend": "0.74.0-beta4",
+        "magento/framework": "0.74.0-beta4",
         "magento/magento-composer-installer": "*"
     },
     "type": "magento2-module",
-    "version": "0.74.0-beta3",
+    "version": "0.74.0-beta4",
     "license": [
         "OSL-3.0",
         "AFL-3.0"

app/code/Magento/Catalog/Api/Data/CategoryInterface.php

@@ -106,6 +106,12 @@ public function getChildren();
      */
     public function getCreatedAt();
 
+    /**
+     * @param string $createdAt
+     * @return $this
+     */
+    public function setCreatedAt($createdAt);
+
     /**
      * @return string|null
      */

app/code/Magento/Catalog/Api/Data/ProductInterface.php

@@ -229,4 +229,79 @@ public function getExtensionAttributes();
      * @return $this
      */
     public function setExtensionAttributes(\Magento\Catalog\Api\Data\ProductExtensionInterface $extensionAttributes);
+
+    /**
+     * Get product links info
+     *
+     * @return \Magento\Catalog\Api\Data\ProductLinkInterface[]|null
+     */
+    public function getProductLinks();
+
+    /**
+     * Set product links info
+     *
+     * @param \Magento\Catalog\Api\Data\ProductLinkInterface[] $links
+     * @return $this
+     */
+    public function setProductLinks(array $links = null);
+
+    /**
+     * Get list of product options
+     *
+     * @return \Magento\Catalog\Api\Data\ProductCustomOptionInterface[]|null
+     */
+    public function getOptions();
+
+    /**
+     * Set list of product options
+     *
+     * @param \Magento\Catalog\Api\Data\ProductCustomOptionInterface[] $options
+     * @return $this
+     */
+    public function setOptions(array $options = null);
+
+    /**
+     * Get media gallery entries
+     *
+     * @return \Magento\Catalog\Api\Data\ProductAttributeMediaGalleryEntryInterface[]|null
+     */
+    public function getMediaGalleryEntries();
+
+    /**
+     * Set media gallery entries
+     *
+     * @param \Magento\Catalog\Api\Data\ProductAttributeMediaGalleryEntryInterface[] $mediaGalleryEntries
+     * @return $this
+     */
+    public function setMediaGalleryEntries(array $mediaGalleryEntries = null);
+
+    /**
+     * Gets list of product group prices
+     *
+     * @return \Magento\Catalog\Api\Data\ProductGroupPriceInterface[]|null
+     */
+    public function getGroupPrices();
+
+    /**
+     * Sets list of product group prices
+     *
+     * @param \Magento\Catalog\Api\Data\ProductGroupPriceInterface[] $groupPrices
+     * @return $this
+     */
+    public function setGroupPrices(array $groupPrices = null);
+
+    /**
+     * Gets list of product tier prices
+     *
+     * @return \Magento\Catalog\Api\Data\ProductTierPriceInterface[]|null
+     */
+    public function getTierPrices();
+
+    /**
+     * Sets list of product tier prices
+     *
+     * @param \Magento\Catalog\Api\Data\ProductTierPriceInterface[] $tierPrices
+     * @return $this
+     */
+    public function setTierPrices(array $tierPrices = null);
 }