Skip to content

Commit 68df3ed

Browse files
author
Dmytro Voskoboinikov
committed
Merge branch 'develop' into MAGETWO-34644
2 parents 1032a45 + 5c2ce64 commit 68df3ed

File tree

144 files changed

+4226
-1733
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

144 files changed

+4226
-1733
lines changed

‎CHANGELOG.md

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,30 @@
1+
0.74.0-beta4
2+
=============
3+
* Various
4+
* Implemented the getDefaultResult method, to be able to catch exceptions in FrontController and redirect user to the correct page
5+
* 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
6+
* Eliminated the unused exceptions. Exceptions that weren't linked to any logic were also eliminated and replaced with LocalizedException or its child classes
7+
* 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
8+
* Framework:
9+
* Created Magento Console to perform CLI actions
10+
* Introduced a new SalesSequence module that is responsible for documents numeration management across the Order Management System
11+
* Implemented the mechanism of asynchronous indexing of sales entities grids
12+
* Setup
13+
* Added the ConfigOption and ConfigOptionsList classes to be used by modules to manage deployment configuration
14+
* Moved all existing segments logic to new classes
15+
* Added the config:set command, which enables deployment configuration management
16+
* Removed the old 'install-configuration' tool
17+
* Functional tests:
18+
* Fixed functional test for order placement from backend
19+
* Replaced the end-to-end test for a product with MAP with an injectable test
20+
* Design
21+
* 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
22+
* Fixed bugs:
23+
* Fixed an issue where composite products could not be added to the order from the Recently Viewed Products section
24+
* Fixed an issue where not all .js files were added to a bundle
25+
* Fixed an issue where it was possible to save an incorrect IP value in the Developer Client Restriction field
26+
* Fixed an issue where a raw DB error was thrown when trying to enter a custom variable with duplicated variable code
27+
128
0.74.0-beta3
229
=============
330
* API

‎app/code/Magento/AdminNotification/composer.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.5.0|~5.6.0",
6-
"magento/module-store": "0.74.0-beta3",
7-
"magento/module-backend": "0.74.0-beta3",
8-
"magento/module-media-storage": "0.74.0-beta3",
9-
"magento/framework": "0.74.0-beta3",
6+
"magento/module-store": "0.74.0-beta4",
7+
"magento/module-backend": "0.74.0-beta4",
8+
"magento/module-media-storage": "0.74.0-beta4",
9+
"magento/framework": "0.74.0-beta4",
1010
"lib-libxml": "*",
1111
"magento/magento-composer-installer": "*"
1212
},
1313
"type": "magento2-module",
14-
"version": "0.74.0-beta3",
14+
"version": "0.74.0-beta4",
1515
"license": [
1616
"OSL-3.0",
1717
"AFL-3.0"

‎app/code/Magento/Authorization/composer.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
"description": "Authorization module provides access to Magento ACL functionality.",
44
"require": {
55
"php": "~5.5.0|~5.6.0",
6-
"magento/module-backend": "0.74.0-beta3",
7-
"magento/framework": "0.74.0-beta3",
6+
"magento/module-backend": "0.74.0-beta4",
7+
"magento/framework": "0.74.0-beta4",
88
"magento/magento-composer-installer": "*"
99
},
1010
"type": "magento2-module",
11-
"version": "0.74.0-beta3",
11+
"version": "0.74.0-beta4",
1212
"license": [
1313
"OSL-3.0",
1414
"AFL-3.0"

‎app/code/Magento/Backend/composer.json

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,27 +3,27 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.5.0|~5.6.0",
6-
"magento/module-store": "0.74.0-beta3",
7-
"magento/module-directory": "0.74.0-beta3",
8-
"magento/module-developer": "0.74.0-beta3",
9-
"magento/module-eav": "0.74.0-beta3",
10-
"magento/module-cron": "0.74.0-beta3",
11-
"magento/module-theme": "0.74.0-beta3",
12-
"magento/module-reports": "0.74.0-beta3",
13-
"magento/module-sales": "0.74.0-beta3",
14-
"magento/module-quote": "0.74.0-beta3",
15-
"magento/module-catalog": "0.74.0-beta3",
16-
"magento/module-user": "0.74.0-beta3",
17-
"magento/module-backup": "0.74.0-beta3",
18-
"magento/module-customer": "0.74.0-beta3",
19-
"magento/module-translation": "0.74.0-beta3",
20-
"magento/module-require-js": "0.74.0-beta3",
21-
"magento/module-config": "0.74.0-beta3",
22-
"magento/framework": "0.74.0-beta3",
6+
"magento/module-store": "0.74.0-beta4",
7+
"magento/module-directory": "0.74.0-beta4",
8+
"magento/module-developer": "0.74.0-beta4",
9+
"magento/module-eav": "0.74.0-beta4",
10+
"magento/module-cron": "0.74.0-beta4",
11+
"magento/module-theme": "0.74.0-beta4",
12+
"magento/module-reports": "0.74.0-beta4",
13+
"magento/module-sales": "0.74.0-beta4",
14+
"magento/module-quote": "0.74.0-beta4",
15+
"magento/module-catalog": "0.74.0-beta4",
16+
"magento/module-user": "0.74.0-beta4",
17+
"magento/module-backup": "0.74.0-beta4",
18+
"magento/module-customer": "0.74.0-beta4",
19+
"magento/module-translation": "0.74.0-beta4",
20+
"magento/module-require-js": "0.74.0-beta4",
21+
"magento/module-config": "0.74.0-beta4",
22+
"magento/framework": "0.74.0-beta4",
2323
"magento/magento-composer-installer": "*"
2424
},
2525
"type": "magento2-module",
26-
"version": "0.74.0-beta3",
26+
"version": "0.74.0-beta4",
2727
"license": [
2828
"OSL-3.0",
2929
"AFL-3.0"

‎app/code/Magento/Backup/composer.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.5.0|~5.6.0",
6-
"magento/module-store": "0.74.0-beta3",
7-
"magento/module-backend": "0.74.0-beta3",
8-
"magento/module-cron": "0.74.0-beta3",
9-
"magento/framework": "0.74.0-beta3",
6+
"magento/module-store": "0.74.0-beta4",
7+
"magento/module-backend": "0.74.0-beta4",
8+
"magento/module-cron": "0.74.0-beta4",
9+
"magento/framework": "0.74.0-beta4",
1010
"magento/magento-composer-installer": "*"
1111
},
1212
"type": "magento2-module",
13-
"version": "0.74.0-beta3",
13+
"version": "0.74.0-beta4",
1414
"license": [
1515
"OSL-3.0",
1616
"AFL-3.0"

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

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,12 @@ class Price extends \Magento\Catalog\Model\Product\Type\Price
4747
* @param \Magento\Framework\Event\ManagerInterface $eventManager
4848
* @param PriceCurrencyInterface $priceCurrency
4949
* @param GroupManagementInterface $groupManagement
50+
* @param \Magento\Catalog\Api\Data\ProductGroupPriceInterfaceFactory $groupPriceFactory
51+
* @param \Magento\Catalog\Api\Data\ProductTierPriceInterfaceFactory $tierPriceFactory
52+
* @param \Magento\Framework\App\Config\ScopeConfigInterface $config
5053
* @param \Magento\Catalog\Helper\Data $catalogData
54+
*
55+
* @SuppressWarnings(PHPMD.ExcessiveParameterList)
5156
*/
5257
public function __construct(
5358
\Magento\CatalogRule\Model\Resource\RuleFactory $ruleFactory,
@@ -57,6 +62,9 @@ public function __construct(
5762
\Magento\Framework\Event\ManagerInterface $eventManager,
5863
PriceCurrencyInterface $priceCurrency,
5964
GroupManagementInterface $groupManagement,
65+
\Magento\Catalog\Api\Data\ProductGroupPriceInterfaceFactory $groupPriceFactory,
66+
\Magento\Catalog\Api\Data\ProductTierPriceInterfaceFactory $tierPriceFactory,
67+
\Magento\Framework\App\Config\ScopeConfigInterface $config,
6068
\Magento\Catalog\Helper\Data $catalogData
6169
) {
6270
$this->_catalogData = $catalogData;
@@ -67,7 +75,10 @@ public function __construct(
6775
$customerSession,
6876
$eventManager,
6977
$priceCurrency,
70-
$groupManagement
78+
$groupManagement,
79+
$groupPriceFactory,
80+
$tierPriceFactory,
81+
$config
7182
);
7283
}
7384

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

Lines changed: 22 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
*/
66
namespace Magento\Bundle\Test\Unit\Model\Product;
77

8+
use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
9+
810
class PriceTest extends \PHPUnit_Framework_TestCase
911
{
1012
/**
@@ -75,16 +77,26 @@ protected function setUp()
7577
$this->priceCurrency = $this->getMockBuilder('Magento\Framework\Pricing\PriceCurrencyInterface')->getMock();
7678
$this->groupManagement = $this->getMockBuilder('Magento\Customer\Api\GroupManagementInterface')
7779
->getMockForAbstractClass();
78-
79-
$this->model = new \Magento\Bundle\Model\Product\Price(
80-
$this->ruleFactoryMock,
81-
$this->storeManagerMock,
82-
$this->localeDateMock,
83-
$this->customerSessionMock,
84-
$this->eventManagerMock,
85-
$this->priceCurrency,
86-
$this->groupManagement,
87-
$this->catalogHelperMock
80+
$gpFactory = $this->getMock('Magento\Catalog\Api\Data\ProductGroupPriceInterfaceFactory', [], [], '', false);
81+
$tpFactory = $this->getMock('Magento\Catalog\Api\Data\ProductTierPriceInterfaceFactory', [], [], '', false);
82+
$scopeConfig = $this->getMock('Magento\Framework\App\Config\ScopeConfigInterface');
83+
84+
$objectManagerHelper = new ObjectManagerHelper($this);
85+
$this->model = $objectManagerHelper->getObject(
86+
'Magento\Bundle\Model\Product\Price',
87+
[
88+
'ruleFactory' => $this->ruleFactoryMock,
89+
'storeManager' => $this->storeManagerMock,
90+
'localeDate' => $this->localeDateMock,
91+
'customerSession' => $this->customerSessionMock,
92+
'eventManager' => $this->eventManagerMock,
93+
'priceCurrency' => $this->priceCurrency,
94+
'groupManagement' => $this->groupManagement,
95+
'groupPriceFactory' => $gpFactory,
96+
'tierPriceFactory' => $tpFactory,
97+
'config' => $scopeConfig,
98+
'catalogData' => $this->catalogHelperMock
99+
]
88100
);
89101
}
90102

‎app/code/Magento/Bundle/composer.json

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,28 +3,28 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.5.0|~5.6.0",
6-
"magento/module-store": "0.74.0-beta3",
7-
"magento/module-catalog": "0.74.0-beta3",
8-
"magento/module-tax": "0.74.0-beta3",
9-
"magento/module-backend": "0.74.0-beta3",
10-
"magento/module-sales": "0.74.0-beta3",
11-
"magento/module-checkout": "0.74.0-beta3",
12-
"magento/module-catalog-inventory": "0.74.0-beta3",
13-
"magento/module-customer": "0.74.0-beta3",
14-
"magento/module-catalog-rule": "0.74.0-beta3",
15-
"magento/module-eav": "0.74.0-beta3",
16-
"magento/module-config": "0.74.0-beta3",
17-
"magento/module-gift-message": "0.74.0-beta3",
18-
"magento/framework": "0.74.0-beta3",
19-
"magento/module-quote": "0.74.0-beta3",
20-
"magento/module-media-storage": "0.74.0-beta3",
6+
"magento/module-store": "0.74.0-beta4",
7+
"magento/module-catalog": "0.74.0-beta4",
8+
"magento/module-tax": "0.74.0-beta4",
9+
"magento/module-backend": "0.74.0-beta4",
10+
"magento/module-sales": "0.74.0-beta4",
11+
"magento/module-checkout": "0.74.0-beta4",
12+
"magento/module-catalog-inventory": "0.74.0-beta4",
13+
"magento/module-customer": "0.74.0-beta4",
14+
"magento/module-catalog-rule": "0.74.0-beta4",
15+
"magento/module-eav": "0.74.0-beta4",
16+
"magento/module-config": "0.74.0-beta4",
17+
"magento/module-gift-message": "0.74.0-beta4",
18+
"magento/framework": "0.74.0-beta4",
19+
"magento/module-quote": "0.74.0-beta4",
20+
"magento/module-media-storage": "0.74.0-beta4",
2121
"magento/magento-composer-installer": "*"
2222
},
2323
"suggest": {
24-
"magento/module-webapi": "0.74.0-beta3"
24+
"magento/module-webapi": "0.74.0-beta4"
2525
},
2626
"type": "magento2-module",
27-
"version": "0.74.0-beta3",
27+
"version": "0.74.0-beta4",
2828
"license": [
2929
"OSL-3.0",
3030
"AFL-3.0"

‎app/code/Magento/Captcha/composer.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.5.0|~5.6.0",
6-
"magento/module-store": "0.74.0-beta3",
7-
"magento/module-customer": "0.74.0-beta3",
8-
"magento/module-checkout": "0.74.0-beta3",
9-
"magento/module-backend": "0.74.0-beta3",
10-
"magento/framework": "0.74.0-beta3",
6+
"magento/module-store": "0.74.0-beta4",
7+
"magento/module-customer": "0.74.0-beta4",
8+
"magento/module-checkout": "0.74.0-beta4",
9+
"magento/module-backend": "0.74.0-beta4",
10+
"magento/framework": "0.74.0-beta4",
1111
"magento/magento-composer-installer": "*"
1212
},
1313
"type": "magento2-module",
14-
"version": "0.74.0-beta3",
14+
"version": "0.74.0-beta4",
1515
"license": [
1616
"OSL-3.0",
1717
"AFL-3.0"

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,12 @@ public function getChildren();
106106
*/
107107
public function getCreatedAt();
108108

109+
/**
110+
* @param string $createdAt
111+
* @return $this
112+
*/
113+
public function setCreatedAt($createdAt);
114+
109115
/**
110116
* @return string|null
111117
*/

0 commit comments

Comments
 (0)