Skip to content

Commit da105f2

Browse files
danielrenauddanielrenaud
committed
Merge remote-tracking branch 'mainline/develop' into MAGETWO-80353-Jenkins-Failures
2 parents d0b38c5 + 4ee8196 commit da105f2

File tree

571 files changed

+15890
-2397
lines changed

Some content is hidden

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

571 files changed

+15890
-2397
lines changed

‎.htaccess

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
############################################
3737
## adjust memory limit
3838

39-
php_value memory_limit 768M
39+
php_value memory_limit 756M
4040
php_value max_execution_time 18000
4141

4242
############################################
@@ -59,7 +59,7 @@
5959
############################################
6060
## adjust memory limit
6161

62-
php_value memory_limit 768M
62+
php_value memory_limit 756M
6363
php_value max_execution_time 18000
6464

6565
############################################

‎.htaccess.sample

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
############################################
3636
## adjust memory limit
3737

38-
php_value memory_limit 768M
38+
php_value memory_limit 756M
3939
php_value max_execution_time 18000
4040

4141
############################################

‎.user.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
memory_limit = 768M
1+
memory_limit = 756M
22
max_execution_time = 18000
33
session.auto_start = off
44
suhosin.session.cryptua = off

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

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
11
{
22
"name": "magento/module-admin-notification",
33
"description": "N/A",
4+
"config": {
5+
"sort-packages": true
6+
},
47
"require": {
58
"php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
6-
"magento/module-store": "100.3.*",
9+
"lib-libxml": "*",
10+
"magento/framework": "100.3.*",
711
"magento/module-backend": "100.3.*",
812
"magento/module-media-storage": "100.3.*",
9-
"magento/framework": "100.3.*",
10-
"magento/module-ui": "100.3.*",
11-
"lib-libxml": "*"
13+
"magento/module-store": "100.3.*",
14+
"magento/module-ui": "100.3.*"
1215
},
1316
"type": "magento2-module",
1417
"version": "100.3.0-dev",

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

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,19 @@
11
{
22
"name": "magento/module-advanced-pricing-import-export",
33
"description": "N/A",
4+
"config": {
5+
"sort-packages": true
6+
},
47
"require": {
58
"php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
9+
"magento/framework": "100.3.*",
610
"magento/module-catalog": "101.2.*",
11+
"magento/module-catalog-import-export": "100.3.*",
712
"magento/module-catalog-inventory": "100.3.*",
13+
"magento/module-customer": "100.3.*",
814
"magento/module-eav": "100.3.*",
915
"magento/module-import-export": "100.3.*",
10-
"magento/module-catalog-import-export": "100.3.*",
11-
"magento/module-customer": "100.3.*",
12-
"magento/module-store": "100.3.*",
13-
"magento/framework": "100.3.*"
16+
"magento/module-store": "100.3.*"
1417
},
1518
"type": "magento2-module",
1619
"version": "100.3.0-dev",

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
{
22
"name": "magento/module-authorization",
33
"description": "Authorization module provides access to Magento ACL functionality.",
4+
"config": {
5+
"sort-packages": true
6+
},
47
"require": {
58
"php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
6-
"magento/module-backend": "100.3.*",
7-
"magento/framework": "100.3.*"
9+
"magento/framework": "100.3.*",
10+
"magento/module-backend": "100.3.*"
811
},
912
"type": "magento2-module",
1013
"version": "100.3.0-dev",

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

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,19 @@
11
{
22
"name": "magento/module-authorizenet",
33
"description": "N/A",
4+
"config": {
5+
"sort-packages": true
6+
},
47
"require": {
58
"php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
6-
"magento/module-sales": "100.3.*",
7-
"magento/module-store": "100.3.*",
8-
"magento/module-quote": "100.3.*",
9-
"magento/module-checkout": "100.3.*",
9+
"magento/framework": "100.3.*",
1010
"magento/module-backend": "100.3.*",
11-
"magento/module-payment": "100.3.*",
1211
"magento/module-catalog": "101.2.*",
13-
"magento/framework": "100.3.*"
12+
"magento/module-checkout": "100.3.*",
13+
"magento/module-payment": "100.3.*",
14+
"magento/module-quote": "100.3.*",
15+
"magento/module-sales": "100.3.*",
16+
"magento/module-store": "100.3.*"
1417
},
1518
"suggest": {
1619
"magento/module-config": "100.3.*"

‎app/code/Magento/Backend/Block/Dashboard/Graph.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -421,6 +421,8 @@ public function getChartUrl($directUrl = true)
421421
$tmpstring = implode('|', $this->_axisLabels[$idx]);
422422

423423
$valueBuffer[] = $indexid . ":|" . $tmpstring;
424+
} elseif ($idx == 'y') {
425+
$valueBuffer[] = $indexid . ":|" . implode('|', $yLabels);
424426
}
425427
$indexid++;
426428
}

‎app/code/Magento/Backend/Block/Media/Uploader.php

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
*/
66
namespace Magento\Backend\Block\Media;
77

8+
use Magento\Framework\App\ObjectManager;
9+
use Magento\Framework\Serialize\Serializer\Json;
10+
811
/**
912
* Adminhtml media library uploader
1013
* @api
@@ -27,17 +30,25 @@ class Uploader extends \Magento\Backend\Block\Widget
2730
*/
2831
protected $_fileSizeService;
2932

33+
/**
34+
* @var Json
35+
*/
36+
private $jsonEncoder;
37+
3038
/**
3139
* @param \Magento\Backend\Block\Template\Context $context
3240
* @param \Magento\Framework\File\Size $fileSize
3341
* @param array $data
42+
* @param Json $jsonEncoder
3443
*/
3544
public function __construct(
3645
\Magento\Backend\Block\Template\Context $context,
3746
\Magento\Framework\File\Size $fileSize,
38-
array $data = []
47+
array $data = [],
48+
Json $jsonEncoder = null
3949
) {
4050
$this->_fileSizeService = $fileSize;
51+
$this->jsonEncoder = $jsonEncoder ?: ObjectManager::getInstance()->get(Json::class);
4152
parent::__construct($context, $data);
4253
}
4354

@@ -107,7 +118,7 @@ public function getJsObjectName()
107118
*/
108119
public function getConfigJson()
109120
{
110-
return $this->_coreData->jsonEncode($this->getConfig()->getData());
121+
return $this->jsonEncoder->encode($this->getConfig()->getData());
111122
}
112123

113124
/**

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

Lines changed: 21 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,28 @@
11
{
22
"name": "magento/module-backend",
33
"description": "N/A",
4+
"config": {
5+
"sort-packages": true
6+
},
47
"require": {
5-
"php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
6-
"magento/module-store": "100.3.*",
7-
"magento/module-directory": "100.3.*",
8-
"magento/module-developer": "100.3.*",
9-
"magento/module-eav": "100.3.*",
10-
"magento/module-reports": "100.3.*",
11-
"magento/module-sales": "100.3.*",
12-
"magento/module-quote": "100.3.*",
13-
"magento/module-catalog": "101.2.*",
14-
"magento/module-user": "100.3.*",
15-
"magento/module-security": "100.3.*",
16-
"magento/module-backup": "100.3.*",
17-
"magento/module-customer": "100.3.*",
18-
"magento/module-translation": "100.3.*",
19-
"magento/module-require-js": "100.3.*",
20-
"magento/module-config": "100.3.*",
21-
"magento/module-ui": "100.3.*",
22-
"magento/framework": "100.3.*"
8+
"php": "7.0.2|7.0.4|~7.0.6|~7.1.0",
9+
"magento/framework": "100.3.*",
10+
"magento/module-backup": "100.3.*",
11+
"magento/module-catalog": "101.2.*",
12+
"magento/module-config": "100.3.*",
13+
"magento/module-customer": "100.3.*",
14+
"magento/module-developer": "100.3.*",
15+
"magento/module-directory": "100.3.*",
16+
"magento/module-eav": "100.3.*",
17+
"magento/module-quote": "100.3.*",
18+
"magento/module-reports": "100.3.*",
19+
"magento/module-require-js": "100.3.*",
20+
"magento/module-sales": "100.3.*",
21+
"magento/module-security": "100.3.*",
22+
"magento/module-store": "100.3.*",
23+
"magento/module-translation": "100.3.*",
24+
"magento/module-ui": "100.3.*",
25+
"magento/module-user": "100.3.*"
2326
},
2427
"suggest": {
2528
"magento/module-theme": "100.3.*"

0 commit comments

Comments
 (0)