Skip to content

Commit f5661a2

Browse files
author
Joan He
committed
Merge remote-tracking branch 'origin/MC-4055-upgrade-lib' into BugFixPR
2 parents 068d9af + 72b9e53 commit f5661a2

File tree

5 files changed

+87
-85
lines changed

5 files changed

+87
-85
lines changed

app/code/Magento/Braintree/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
},
77
"require": {
88
"php": "~7.1.3||~7.2.0",
9-
"braintree/braintree_php": "3.34.0",
9+
"braintree/braintree_php": "3.35.0",
1010
"magento/framework": "*",
1111
"magento/magento-composer-installer": "*",
1212
"magento/module-catalog": "*",

app/code/Magento/CatalogGraphQl/Model/Resolver/Categories.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
9797
}
9898

9999
if (!$this->collection->isLoaded()) {
100-
$that->attributesJoiner->join($info->fieldASTs[0], $this->collection);
100+
$that->attributesJoiner->join($info->fieldNodes[0], $this->collection);
101101
$this->collection->addIdFilter($this->categoryIds);
102102
}
103103
/** @var CategoryInterface | \Magento\Catalog\Model\Category $item */

app/code/Magento/CatalogGraphQl/Model/Resolver/Products/DataProvider/CategoryTree.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ public function __construct(
8989
*/
9090
public function getTree(ResolveInfo $resolveInfo, int $rootCategoryId) : array
9191
{
92-
$categoryQuery = $resolveInfo->fieldASTs[0];
92+
$categoryQuery = $resolveInfo->fieldNodes[0];
9393
$collection = $this->collectionFactory->create();
9494
$this->joinAttributesRecursively($collection, $categoryQuery);
9595
$depth = $this->depthCalculator->calculate($categoryQuery);

composer.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
},
1313
"require": {
1414
"php": "~7.1.3||~7.2.0",
15+
"ext-bcmath": "*",
1516
"ext-ctype": "*",
1617
"ext-curl": "*",
1718
"ext-dom": "*",
@@ -27,9 +28,8 @@
2728
"ext-spl": "*",
2829
"ext-xsl": "*",
2930
"ext-zip": "*",
30-
"ext-bcmath": "*",
3131
"lib-libxml": "*",
32-
"braintree/braintree_php": "3.34.0",
32+
"braintree/braintree_php": "3.35.0",
3333
"colinmollenhour/cache-backend-file": "~1.4.1",
3434
"colinmollenhour/cache-backend-redis": "1.10.5",
3535
"colinmollenhour/credis": "1.10.0",
@@ -44,15 +44,15 @@
4444
"paragonie/sodium_compat": "^1.6",
4545
"pelago/emogrifier": "^2.0.0",
4646
"php-amqplib/php-amqplib": "~2.7.0",
47-
"phpseclib/mcrypt_compat": "1.0.5",
47+
"phpseclib/mcrypt_compat": "1.0.8",
4848
"phpseclib/phpseclib": "2.0.*",
49-
"ramsey/uuid": "~3.7.3",
49+
"ramsey/uuid": "~3.8.0",
5050
"symfony/console": "~4.1.0",
5151
"symfony/event-dispatcher": "~4.1.0",
5252
"symfony/process": "~4.1.0",
5353
"tedivm/jshrink": "~1.3.0",
5454
"tubalmartin/cssmin": "4.1.1",
55-
"webonyx/graphql-php": "^0.11.1",
55+
"webonyx/graphql-php": "^0.12.6",
5656
"zendframework/zend-captcha": "^2.7.1",
5757
"zendframework/zend-code": "~3.3.0",
5858
"zendframework/zend-config": "^2.6.0",
@@ -82,14 +82,14 @@
8282
"zendframework/zend-view": "~2.10.0"
8383
},
8484
"require-dev": {
85-
"magento/magento2-functional-testing-framework": "2.3.5",
86-
"friendsofphp/php-cs-fixer": "~2.12.0",
85+
"friendsofphp/php-cs-fixer": "~2.13.0",
8786
"lusitanian/oauth": "~0.8.10",
87+
"magento/magento2-functional-testing-framework": "2.3.5",
8888
"pdepend/pdepend": "2.5.2",
8989
"phpmd/phpmd": "@stable",
9090
"phpunit/phpunit": "~6.5.0",
9191
"sebastian/phpcpd": "~3.0.0",
92-
"squizlabs/php_codesniffer": "3.3.0"
92+
"squizlabs/php_codesniffer": "3.3.1"
9393
},
9494
"suggest": {
9595
"ext-pcntl": "Need for run processes in parallel mode"

0 commit comments

Comments
 (0)