Skip to content

Commit 023e58a

Browse files
author
avattam
committed
Merge remote-tracking branch 'upstream/2.3-develop' into correct-branch
2 parents 1fd9af0 + 9a6382c commit 023e58a

File tree

244 files changed

+2066
-1290
lines changed

Some content is hidden

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

244 files changed

+2066
-1290
lines changed

‎.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
---
2+
name: Bug report
3+
about: Technical issue with the Magento 2 core components
4+
5+
---
6+
7+
<!---
8+
Please review our guidelines before adding a new issue: https://github.com/magento/magento2/wiki/Issue-reporting-guidelines
9+
-->
10+
11+
### Preconditions
12+
<!---
13+
Provide the exact Magento version (example: 2.2.5) and any important information on the environment where bug is reproducible.
14+
-->
15+
1.
16+
2.
17+
18+
### Steps to reproduce
19+
<!---
20+
Important: Provide a set of clear steps to reproduce this bug. We can not provide support without clear instructions on how to reproduce.
21+
-->
22+
1.
23+
2.
24+
25+
### Expected result
26+
<!--- Tell us what do you expect to happen. -->
27+
1. [Screenshots, logs or description]
28+
2.
29+
30+
### Actual result
31+
<!--- Tell us what happened instead. Include error messages and issues. -->
32+
1. [Screenshots, logs or description]
33+
2.

‎.github/ISSUE_TEMPLATE/developer-experience-issue.md

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
---
2+
name: Developer experience issue
3+
about: Issues related to customization, extensibility, modularity
4+
5+
---
6+
7+
<!---
8+
Please review our guidelines before adding a new issue: https://github.com/magento/magento2/wiki/Issue-reporting-guidelines
9+
-->
10+
11+
### Summary
12+
<!--- Describe the issue you are experiencing. Include general information, error messages, environments, and so on. -->
13+
14+
### Examples
15+
<!--- Provide code examples or a patch with a test (recommended) to clearly indicate the problem. -->
16+
17+
### Proposed solution
18+
<!--- Suggest your potential solutions for this issue. -->

‎.github/ISSUE_TEMPLATE/feature_request.md

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
---
2+
name: Feature request
3+
about: Please consider reporting directly to https://github.com/magento/community-features
4+
5+
---
6+
7+
<!---
8+
Important: This repository is intended only for Magento 2 Technical Issues. Enter Feature Requests at https://github.com/magento/community-features. Project stakeholders monitor and manage requests. Feature requests entered using this form may be moved to the forum.
9+
-->
10+
11+
### Description
12+
<!--- Describe the feature you would like to add. -->
13+
14+
### Expected behavior
15+
<!--- What is the expected behavior of this feature? How is it going to work? -->
16+
17+
### Benefits
18+
<!--- How do you think this feature would improve Magento? -->
19+
20+
### Additional information
21+
<!--- What other information can you provide about the desired feature? -->

‎app/code/Magento/Authorizenet/view/frontend/requirejs-config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
var config = {
77
map: {
88
'*': {
9-
transparent: 'Magento_Payment/transparent'
9+
transparent: 'Magento_Payment/js/transparent'
1010
}
1111
}
1212
};

‎app/code/Magento/Backend/Test/Mftf/Page/AdminDashboardPage.xml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
11+
<page name="AdminDashboardPage" url="admin/dashboard/" area="admin" module="Magento_Backend">
12+
<section name="AdminMenuSection"/>
13+
</page>
14+
</pages>

‎app/code/Magento/Backend/Test/Mftf/Section/AdminMenuSection.xml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
11+
<section name="AdminMenuSection">
12+
<element name="catalog" type="button" selector="#menu-magento-catalog-catalog"/>
13+
<element name="customers" type="button" selector="#menu-magento-customer-customer"/>
14+
<element name="content" type="button" selector="#menu-magento-backend-content"/>
15+
<element name="widgets" type="button" selector="#nav li[data-ui-id='menu-magento-widget-cms-widget-instance']"/>
16+
<element name="stores" type="button" selector="#menu-magento-backend-stores"/>
17+
<element name="configuration" type="button" selector="#nav li[data-ui-id='menu-magento-config-system-config']"/>
18+
</section>
19+
</sections>

‎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/Bundle/Test/Mftf/ActionGroup/AdminClearFiltersActionGroup.xml

100644100755
File mode changed.

‎app/code/Magento/BundleGraphQl/Model/Resolver/BundleItemLinks.php

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@
77

88
namespace Magento\BundleGraphQl\Model\Resolver;
99

10+
use Magento\Framework\GraphQl\Exception\GraphQlInputException;
1011
use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
1112
use Magento\BundleGraphQl\Model\Resolver\Links\Collection;
1213
use Magento\Framework\GraphQl\Config\Element\Field;
13-
use Magento\Framework\GraphQl\Query\Resolver\Value;
1414
use Magento\Framework\GraphQl\Query\Resolver\ValueFactory;
1515
use Magento\Framework\GraphQl\Query\ResolverInterface;
1616

1717
/**
18-
* {@inheritdoc}
18+
* @inheritdoc
1919
*/
2020
class BundleItemLinks implements ResolverInterface
2121
{
@@ -42,16 +42,14 @@ public function __construct(
4242
}
4343

4444
/**
45-
* {@inheritDoc}
45+
* @inheritdoc
4646
*/
47-
public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null) : Value
47+
public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
4848
{
4949
if (!isset($value['option_id']) || !isset($value['parent_id'])) {
50-
$result = function () {
51-
return null;
52-
};
53-
return $this->valueFactory->create($result);
50+
throw new GraphQlInputException(__('"option_id" and "parent_id" values should be specified'));
5451
}
52+
5553
$this->linkCollection->addIdFilters((int)$value['option_id'], (int)$value['parent_id']);
5654
$result = function () use ($value) {
5755
return $this->linkCollection->getLinksForOptionId((int)$value['option_id']);

‎app/code/Magento/BundleGraphQl/Model/Resolver/BundleItems.php

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,11 @@
1313
use Magento\Catalog\Api\Data\ProductInterface;
1414
use Magento\Framework\EntityManager\MetadataPool;
1515
use Magento\Framework\GraphQl\Config\Element\Field;
16-
use Magento\Framework\GraphQl\Query\Resolver\Value;
1716
use Magento\Framework\GraphQl\Query\Resolver\ValueFactory;
1817
use Magento\Framework\GraphQl\Query\ResolverInterface;
1918

2019
/**
21-
* {@inheritdoc}
20+
* @inheritdoc
2221
*/
2322
class BundleItems implements ResolverInterface
2423
{
@@ -35,31 +34,31 @@ class BundleItems implements ResolverInterface
3534
/**
3635
* @var MetadataPool
3736
*/
38-
private $metdataPool;
37+
private $metadataPool;
3938

4039
/**
4140
* @param Collection $bundleOptionCollection
4241
* @param ValueFactory $valueFactory
43-
* @param MetadataPool $metdataPool
42+
* @param MetadataPool $metadataPool
4443
*/
4544
public function __construct(
4645
Collection $bundleOptionCollection,
4746
ValueFactory $valueFactory,
48-
MetadataPool $metdataPool
47+
MetadataPool $metadataPool
4948
) {
5049
$this->bundleOptionCollection = $bundleOptionCollection;
5150
$this->valueFactory = $valueFactory;
52-
$this->metdataPool = $metdataPool;
51+
$this->metadataPool = $metadataPool;
5352
}
5453

5554
/**
5655
* Fetch and format bundle option items.
5756
*
5857
* {@inheritDoc}
5958
*/
60-
public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null) : Value
59+
public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
6160
{
62-
$linkField = $this->metdataPool->getMetadata(ProductInterface::class)->getLinkField();
61+
$linkField = $this->metadataPool->getMetadata(ProductInterface::class)->getLinkField();
6362
if ($value['type_id'] !== Type::TYPE_CODE
6463
|| !isset($value[$linkField])
6564
|| !isset($value[ProductInterface::SKU])

0 commit comments

Comments
 (0)