Skip to content

Commit a2028b1

Browse files
slopukhovslopukhov
committed
Merge branch 'develop' of github.corp.ebay.com:magento2/magento2ce into Troll_S31
2 parents dafed05 + 5e0aeea commit a2028b1

File tree

390 files changed

+6110
-2645
lines changed

Some content is hidden

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

390 files changed

+6110
-2645
lines changed

‎CHANGELOG.md

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,30 @@
1+
0.42.0-beta10
2+
=============
3+
* Framework
4+
* Replaced \Magento\Framework\Model\Exception with LocalizedException
5+
* Replaced obsolete exceptions
6+
* Config components are moved to new Magento_Config module
7+
* Variables components are moved to new Magento_Variable module
8+
* Preferences, shared instance creation and compiled factory accelerated by 3%
9+
* Fixed "HEADERS ALREADY SENT" error when controller action outputs directly
10+
* Setup
11+
* Added ability to install and upgrade components in Setup Tool (CLI)
12+
* Added ability to manage list of modules in Setup Wizard
13+
* Fixed error after "Start Readiness Check" button press in Setup Wizard
14+
* Fixed error with Base URL change after "Previous" button press on Step 4 in Setup Wizard
15+
* Fixed error with HTTPS options related to auto-filled Base URL on Step 3 of Setup Wizard
16+
* Fixed error in "app\design\frontend\Magento\luma\composer.json"
17+
* LESS Compiler
18+
* Added automatic update in "pub/static" of changed "css/js/images" after materialization
19+
* Variable names are renamed to meet Magento Code Standards
20+
* Added client-side LESS files compilation to reduce page load time in developer mode
21+
* Widgets
22+
* Fixed fatal error on page which contain a widget with a condition based on "Category"
23+
* GitHub requests
24+
* [#899](https://github.com/magento/magento2/issues/899) -- When accessing any category - error report generated
25+
* [#986](https://github.com/magento/magento2/pull/986) -- Make it possible to exclude classes (directories) for compilation
26+
* [#1054](https://github.com/magento/magento2/pull/1054) -- Fix typo in MAGE_MODE
27+
128
0.42.0-beta9
229
=============
330
* Framework Improvements:
@@ -30,7 +57,7 @@
3057
* Increased unit test coverage for Magento/Indexer module
3158
* Version number info became accessible at a public URL
3259
* GitHub requests:
33-
* [#1027](https://github.com/magento/magento2/issues/1027) -- Can't add new subctegory
60+
* [#1027](https://github.com/magento/magento2/issues/1027) -- Can't add new subcategory
3461
* [#921](https://github.com/magento/magento2/issues/921) -- Change resource ids from Magento_Adminhtml::* to Magento_Backend
3562

3663
0.42.0-beta8

‎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.42.0-beta9",
7-
"magento/module-core": "0.42.0-beta9",
8-
"magento/module-backend": "0.42.0-beta9",
9-
"magento/framework": "0.42.0-beta9",
6+
"magento/module-store": "0.42.0-beta10",
7+
"magento/module-core": "0.42.0-beta10",
8+
"magento/module-backend": "0.42.0-beta10",
9+
"magento/framework": "0.42.0-beta10",
1010
"lib-libxml": "*",
1111
"magento/magento-composer-installer": "*"
1212
},
1313
"type": "magento2-module",
14-
"version": "0.42.0-beta9",
14+
"version": "0.42.0-beta10",
1515
"license": [
1616
"OSL-3.0",
1717
"AFL-3.0"

‎app/code/Magento/Authorization/Model/Resource/Role.php

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,17 +32,19 @@ class Role extends \Magento\Framework\Model\Resource\Db\AbstractDb
3232
protected $dateTime;
3333

3434
/**
35-
* @param \Magento\Framework\App\Resource $resource
35+
* @param \Magento\Framework\Model\Resource\Db\Context $context
3636
* @param \Magento\Framework\App\CacheInterface $cache
3737
* @param \Magento\Framework\Stdlib\DateTime $dateTime
38+
* @param string|null $resourcePrefix
3839
*/
3940
public function __construct(
40-
\Magento\Framework\App\Resource $resource,
41+
\Magento\Framework\Model\Resource\Db\Context $context,
4142
\Magento\Framework\App\CacheInterface $cache,
42-
\Magento\Framework\Stdlib\DateTime $dateTime
43+
\Magento\Framework\Stdlib\DateTime $dateTime,
44+
$resourcePrefix = null
4345
) {
4446
$this->dateTime = $dateTime;
45-
parent::__construct($resource);
47+
parent::__construct($context, $resourcePrefix);
4648
$this->_cache = $cache->getFrontend();
4749
}
4850

‎app/code/Magento/Authorization/Model/Resource/Rules.php

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,21 +38,23 @@ class Rules extends \Magento\Framework\Model\Resource\Db\AbstractDb
3838
protected $_logger;
3939

4040
/**
41-
* @param \Magento\Framework\App\Resource $resource
41+
* @param \Magento\Framework\Model\Resource\Db\Context $context
4242
* @param \Magento\Framework\Acl\Builder $aclBuilder
4343
* @param \Psr\Log\LoggerInterface $logger
4444
* @param \Magento\Framework\Acl\RootResource $rootResource
4545
* @param \Magento\Framework\Acl\CacheInterface $aclCache
46+
* @param string|null $resourcePrefix
4647
*/
4748
public function __construct(
48-
\Magento\Framework\App\Resource $resource,
49+
\Magento\Framework\Model\Resource\Db\Context $context,
4950
\Magento\Framework\Acl\Builder $aclBuilder,
5051
\Psr\Log\LoggerInterface $logger,
5152
\Magento\Framework\Acl\RootResource $rootResource,
52-
\Magento\Framework\Acl\CacheInterface $aclCache
53+
\Magento\Framework\Acl\CacheInterface $aclCache,
54+
$resourcePrefix = null
5355
) {
5456
$this->_aclBuilder = $aclBuilder;
55-
parent::__construct($resource);
57+
parent::__construct($context, $resourcePrefix);
5658
$this->_rootResource = $rootResource;
5759
$this->_aclCache = $aclCache;
5860
$this->_logger = $logger;

‎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.42.0-beta9",
7-
"magento/framework": "0.42.0-beta9",
6+
"magento/module-backend": "0.42.0-beta10",
7+
"magento/framework": "0.42.0-beta10",
88
"magento/magento-composer-installer": "*"
99
},
1010
"type": "magento2-module",
11-
"version": "0.42.0-beta9",
11+
"version": "0.42.0-beta10",
1212
"license": [
1313
"OSL-3.0",
1414
"AFL-3.0"

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

Lines changed: 19 additions & 19 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.42.0-beta9",
7-
"magento/module-directory": "0.42.0-beta9",
8-
"magento/module-core": "0.42.0-beta9",
9-
"magento/module-developer": "0.42.0-beta9",
10-
"magento/module-eav": "0.42.0-beta9",
11-
"magento/module-cron": "0.42.0-beta9",
12-
"magento/module-theme": "0.42.0-beta9",
13-
"magento/module-reports": "0.42.0-beta9",
14-
"magento/module-sales": "0.42.0-beta9",
15-
"magento/module-quote": "0.42.0-beta9",
16-
"magento/module-catalog": "0.42.0-beta9",
17-
"magento/module-user": "0.42.0-beta9",
18-
"magento/module-backup": "0.42.0-beta9",
19-
"magento/module-customer": "0.42.0-beta9",
20-
"magento/module-translation": "0.42.0-beta9",
21-
"magento/module-require-js": "0.42.0-beta9",
22-
"magento/module-config": "0.42.0-beta9",
23-
"magento/framework": "0.42.0-beta9",
6+
"magento/module-store": "0.42.0-beta10",
7+
"magento/module-directory": "0.42.0-beta10",
8+
"magento/module-core": "0.42.0-beta10",
9+
"magento/module-developer": "0.42.0-beta10",
10+
"magento/module-eav": "0.42.0-beta10",
11+
"magento/module-cron": "0.42.0-beta10",
12+
"magento/module-theme": "0.42.0-beta10",
13+
"magento/module-reports": "0.42.0-beta10",
14+
"magento/module-sales": "0.42.0-beta10",
15+
"magento/module-quote": "0.42.0-beta10",
16+
"magento/module-catalog": "0.42.0-beta10",
17+
"magento/module-user": "0.42.0-beta10",
18+
"magento/module-backup": "0.42.0-beta10",
19+
"magento/module-customer": "0.42.0-beta10",
20+
"magento/module-translation": "0.42.0-beta10",
21+
"magento/module-require-js": "0.42.0-beta10",
22+
"magento/module-config": "0.42.0-beta10",
23+
"magento/framework": "0.42.0-beta10",
2424
"magento/magento-composer-installer": "*"
2525
},
2626
"type": "magento2-module",
27-
"version": "0.42.0-beta9",
27+
"version": "0.42.0-beta10",
2828
"license": [
2929
"OSL-3.0",
3030
"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.42.0-beta9",
7-
"magento/module-backend": "0.42.0-beta9",
8-
"magento/module-cron": "0.42.0-beta9",
9-
"magento/framework": "0.42.0-beta9",
6+
"magento/module-store": "0.42.0-beta10",
7+
"magento/module-backend": "0.42.0-beta10",
8+
"magento/module-cron": "0.42.0-beta10",
9+
"magento/framework": "0.42.0-beta10",
1010
"magento/magento-composer-installer": "*"
1111
},
1212
"type": "magento2-module",
13-
"version": "0.42.0-beta9",
13+
"version": "0.42.0-beta10",
1414
"license": [
1515
"OSL-3.0",
1616
"AFL-3.0"

‎app/code/Magento/Bundle/Model/Resource/Bundle.php

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,25 @@ class Bundle extends \Magento\Framework\Model\Resource\Db\AbstractDb
1818
protected $_productRelation;
1919

2020
/**
21-
* @param \Magento\Framework\App\Resource $resource
21+
* @var \Magento\Quote\Model\Resource\Quote
22+
*/
23+
protected $quoteResource;
24+
25+
/**
26+
* @param \Magento\Framework\Model\Resource\Db\Context $context
2227
* @param \Magento\Catalog\Model\Resource\Product\Relation $productRelation
28+
* @param \Magento\Quote\Model\Resource\Quote $quoteResource
29+
* @param null $resourcePrefix
2330
*/
2431
public function __construct(
25-
\Magento\Framework\App\Resource $resource,
26-
\Magento\Catalog\Model\Resource\Product\Relation $productRelation
32+
\Magento\Framework\Model\Resource\Db\Context $context,
33+
\Magento\Catalog\Model\Resource\Product\Relation $productRelation,
34+
\Magento\Quote\Model\Resource\Quote $quoteResource,
35+
$resourcePrefix = null
2736
) {
28-
parent::__construct($resource);
37+
parent::__construct($context, $resourcePrefix);
2938
$this->_productRelation = $productRelation;
39+
$this->quoteResource = $quoteResource;
3040
}
3141

3242
/**
@@ -83,8 +93,10 @@ public function getSelectionsData($productId)
8393
*/
8494
public function dropAllQuoteChildItems($productId)
8595
{
86-
$quoteItemIds = $this->_getReadAdapter()->fetchCol(
87-
$this->_getReadAdapter()->select()->from(
96+
$select = $this->quoteResource->getReadConnection()->select();
97+
$adapter = $select->getAdapter();
98+
$quoteItemIds = $adapter->fetchCol(
99+
$select->from(
88100
$this->getTable('quote_item'),
89101
['item_id']
90102
)->where(
@@ -94,7 +106,7 @@ public function dropAllQuoteChildItems($productId)
94106
);
95107

96108
if ($quoteItemIds) {
97-
$this->_getWriteAdapter()->delete(
109+
$adapter->delete(
98110
$this->getTable('quote_item'),
99111
['parent_item_id IN(?)' => $quoteItemIds]
100112
);

‎app/code/Magento/Bundle/Model/Resource/Option.php

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,16 @@ class Option extends \Magento\Framework\Model\Resource\Db\AbstractDb
1818
private $validator;
1919

2020
/**
21-
* @param \Magento\Framework\App\Resource $resource
21+
* @param \Magento\Framework\Model\Resource\Db\Context $context
2222
* @param \Magento\Bundle\Model\Option\Validator $validator
23+
* @param string|null $resourcePrefix
2324
*/
2425
public function __construct(
25-
\Magento\Framework\App\Resource $resource,
26-
\Magento\Bundle\Model\Option\Validator $validator
26+
\Magento\Framework\Model\Resource\Db\Context $context,
27+
\Magento\Bundle\Model\Option\Validator $validator,
28+
$resourcePrefix = null
2729
) {
28-
parent::__construct($resource);
30+
parent::__construct($context, $resourcePrefix);
2931
$this->validator = $validator;
3032
}
3133

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

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,26 +3,26 @@
33
"description": "N/A",
44
"require": {
55
"php": "~5.5.0|~5.6.0",
6-
"magento/module-config": "0.42.0-beta9",
7-
"magento/module-store": "0.42.0-beta9",
8-
"magento/module-catalog": "0.42.0-beta9",
9-
"magento/module-tax": "0.42.0-beta9",
10-
"magento/module-core": "0.42.0-beta9",
11-
"magento/module-backend": "0.42.0-beta9",
12-
"magento/module-sales": "0.42.0-beta9",
13-
"magento/module-checkout": "0.42.0-beta9",
14-
"magento/module-catalog-inventory": "0.42.0-beta9",
15-
"magento/module-customer": "0.42.0-beta9",
16-
"magento/module-catalog-rule": "0.42.0-beta9",
17-
"magento/module-eav": "0.42.0-beta9",
18-
"magento/module-gift-message": "0.42.0-beta9",
19-
"magento/framework": "0.42.0-beta9",
20-
"magento/module-webapi": "0.42.0-beta9",
21-
"magento/module-quote": "0.42.0-beta9",
6+
"magento/module-config": "0.42.0-beta10",
7+
"magento/module-store": "0.42.0-beta10",
8+
"magento/module-catalog": "0.42.0-beta10",
9+
"magento/module-tax": "0.42.0-beta10",
10+
"magento/module-core": "0.42.0-beta10",
11+
"magento/module-backend": "0.42.0-beta10",
12+
"magento/module-sales": "0.42.0-beta10",
13+
"magento/module-checkout": "0.42.0-beta10",
14+
"magento/module-catalog-inventory": "0.42.0-beta10",
15+
"magento/module-customer": "0.42.0-beta10",
16+
"magento/module-catalog-rule": "0.42.0-beta10",
17+
"magento/module-eav": "0.42.0-beta10",
18+
"magento/module-gift-message": "0.42.0-beta10",
19+
"magento/framework": "0.42.0-beta10",
20+
"magento/module-webapi": "0.42.0-beta10",
21+
"magento/module-quote": "0.42.0-beta10",
2222
"magento/magento-composer-installer": "*"
2323
},
2424
"type": "magento2-module",
25-
"version": "0.42.0-beta9",
25+
"version": "0.42.0-beta10",
2626
"license": [
2727
"OSL-3.0",
2828
"AFL-3.0"

0 commit comments

Comments
 (0)