Merge remote-tracking branch 'upstream/2.3-develop' into correct-branch

Author: avattam

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,33 @@
+---
+name: Bug report
+about: Technical issue with the Magento 2 core components
+
+---
+
+<!---
+Please review our guidelines before adding a new issue: https://github.com/magento/magento2/wiki/Issue-reporting-guidelines
+-->
+
+### Preconditions
+<!---
+Provide the exact Magento version (example: 2.2.5) and any important information on the environment where bug is reproducible.
+-->
+1.
+2.
+
+### Steps to reproduce
+<!---
+Important: Provide a set of clear steps to reproduce this bug. We can not provide support without clear instructions on how to reproduce.
+-->
+1.
+2.
+
+### Expected result
+<!--- Tell us what do you expect to happen. -->
+1. [Screenshots, logs or description]
+2.
+
+### Actual result
+<!--- Tell us what happened instead. Include error messages and issues. -->
+1. [Screenshots, logs or description]
+2.

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

@@ -0,0 +1,18 @@
+---
+name: Developer experience issue
+about: Issues related to customization, extensibility, modularity
+
+---
+
+<!---
+Please review our guidelines before adding a new issue: https://github.com/magento/magento2/wiki/Issue-reporting-guidelines
+-->
+
+### Summary
+<!--- Describe the issue you are experiencing. Include general information, error messages, environments, and so on. -->
+
+### Examples
+<!--- Provide code examples or a patch with a test (recommended) to clearly indicate the problem. -->
+
+### Proposed solution
+<!--- Suggest your potential solutions for this issue. -->

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,21 @@
+---
+name: Feature request
+about: Please consider reporting directly to https://github.com/magento/community-features
+
+---
+
+<!---
+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.
+-->
+
+### Description
+<!--- Describe the feature you would like to add. -->
+
+### Expected behavior
+<!--- What is the expected behavior of this feature? How is it going to work? -->
+
+### Benefits
+<!--- How do you think this feature would improve Magento? -->
+
+### Additional information
+<!--- What other information can you provide about the desired feature? -->

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

@@ -6,7 +6,7 @@
 var config = {
     map: {
         '*': {
-            transparent: 'Magento_Payment/transparent'
+            transparent: 'Magento_Payment/js/transparent'
         }
     }
 };

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

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
+    <page name="AdminDashboardPage" url="admin/dashboard/" area="admin" module="Magento_Backend">
+        <section name="AdminMenuSection"/>
+    </page>
+</pages>

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

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+    <section name="AdminMenuSection">
+        <element name="catalog" type="button" selector="#menu-magento-catalog-catalog"/>
+        <element name="customers" type="button" selector="#menu-magento-customer-customer"/>
+        <element name="content" type="button" selector="#menu-magento-backend-content"/>
+        <element name="widgets" type="button" selector="#nav li[data-ui-id='menu-magento-widget-cms-widget-instance']"/>
+        <element name="stores" type="button" selector="#menu-magento-backend-stores"/>
+        <element name="configuration" type="button" selector="#nav li[data-ui-id='menu-magento-config-system-config']"/>
+    </section>
+</sections>

app/code/Magento/Braintree/composer.json

@@ -6,7 +6,7 @@
     },
     "require": {
         "php": "~7.1.3||~7.2.0",
-        "braintree/braintree_php": "3.34.0",
+        "braintree/braintree_php": "3.35.0",
         "magento/framework": "*",
         "magento/magento-composer-installer": "*",
         "magento/module-catalog": "*",

app/code/Magento/Bundle/Test/Mftf/ActionGroup/AdminClearFiltersActionGroup.xml

@@ -7,15 +7,15 @@
 
 namespace Magento\BundleGraphQl\Model\Resolver;
 
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 use Magento\BundleGraphQl\Model\Resolver\Links\Collection;
 use Magento\Framework\GraphQl\Config\Element\Field;
-use Magento\Framework\GraphQl\Query\Resolver\Value;
 use Magento\Framework\GraphQl\Query\Resolver\ValueFactory;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 
 /**
- * {@inheritdoc}
+ * @inheritdoc
  */
 class BundleItemLinks implements ResolverInterface
 {
@@ -42,16 +42,14 @@ public function __construct(
     }
 
     /**
-     * {@inheritDoc}
+     * @inheritdoc
      */
-    public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null) : Value
+    public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
     {
         if (!isset($value['option_id']) || !isset($value['parent_id'])) {
-            $result = function () {
-                return null;
-            };
-            return $this->valueFactory->create($result);
+            throw new GraphQlInputException(__('"option_id" and "parent_id" values should be specified'));
         }
+
         $this->linkCollection->addIdFilters((int)$value['option_id'], (int)$value['parent_id']);
         $result = function () use ($value) {
             return $this->linkCollection->getLinksForOptionId((int)$value['option_id']);

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

@@ -13,12 +13,11 @@
 use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Framework\GraphQl\Config\Element\Field;
-use Magento\Framework\GraphQl\Query\Resolver\Value;
 use Magento\Framework\GraphQl\Query\Resolver\ValueFactory;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 
 /**
- * {@inheritdoc}
+ * @inheritdoc
  */
 class BundleItems implements ResolverInterface
 {
@@ -35,31 +34,31 @@ class BundleItems implements ResolverInterface
     /**
      * @var MetadataPool
      */
-    private $metdataPool;
+    private $metadataPool;
 
     /**
      * @param Collection $bundleOptionCollection
      * @param ValueFactory $valueFactory
-     * @param MetadataPool $metdataPool
+     * @param MetadataPool $metadataPool
      */
     public function __construct(
         Collection $bundleOptionCollection,
         ValueFactory $valueFactory,
-        MetadataPool $metdataPool
+        MetadataPool $metadataPool
     ) {
         $this->bundleOptionCollection = $bundleOptionCollection;
         $this->valueFactory = $valueFactory;
-        $this->metdataPool = $metdataPool;
+        $this->metadataPool = $metadataPool;
     }
 
     /**
      * Fetch and format bundle option items.
      *
      * {@inheritDoc}
      */
-    public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null) : Value
+    public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
     {
-        $linkField = $this->metdataPool->getMetadata(ProductInterface::class)->getLinkField();
+        $linkField = $this->metadataPool->getMetadata(ProductInterface::class)->getLinkField();
         if ($value['type_id'] !== Type::TYPE_CODE
             || !isset($value[$linkField])
             || !isset($value[ProductInterface::SKU])

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

@@ -7,10 +7,10 @@
 
 namespace Magento\BundleGraphQl\Model\Resolver\Options;
 
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-use Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\Deferred\Product;
+use Magento\CatalogGraphQl\Model\Resolver\Products\DataProvider\Deferred\Product as ProductDataProvider;
 use Magento\Framework\GraphQl\Config\Element\Field;
-use Magento\Framework\GraphQl\Query\Resolver\Value;
 use Magento\Framework\GraphQl\Query\Resolver\ValueFactory;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 
@@ -19,42 +19,38 @@
  */
 class Label implements ResolverInterface
 {
-
     /**
      * @var ValueFactory
      */
     private $valueFactory;
 
     /**
-     * @var Product
+     * @var ProductDataProvider
      */
     private $product;
 
     /**
      * @param ValueFactory $valueFactory
-     * @param Product $product
+     * @param ProductDataProvider $product
      */
-    public function __construct(ValueFactory $valueFactory, Product $product)
+    public function __construct(ValueFactory $valueFactory, ProductDataProvider $product)
     {
         $this->valueFactory = $valueFactory;
         $this->product = $product;
     }
 
     /**
-     * @inheritDoc
+     * @inheritdoc
      */
     public function resolve(
         Field $field,
         $context,
         ResolveInfo $info,
         array $value = null,
         array $args = null
-    ): Value {
+    ) {
         if (!isset($value['sku'])) {
-            $result = function () {
-                return null;
-            };
-            return $this->valueFactory->create($result);
+            throw new GraphQlInputException(__('"sku" value should be specified'));
         }
 
         $this->product->addProductSku($value['sku']);

app/code/Magento/BundleGraphQl/Model/Resolver/Options/Label.php

@@ -5,53 +5,33 @@
  */
 declare(strict_types=1);
 
-
 namespace Magento\BundleGraphQl\Model\Resolver\Product\Fields;
 
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 use Magento\Bundle\Model\Product\Type as Bundle;
 use Magento\Framework\GraphQl\Config\Element\Field;
-use Magento\Framework\GraphQl\Query\Resolver\Value;
-use Magento\Framework\GraphQl\Query\Resolver\ValueFactory;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 
 /**
- * {@inheritdoc}
+ * @inheritdoc
  */
 class DynamicPrice implements ResolverInterface
 {
     /**
-     * @var ValueFactory
-     */
-    private $valueFactory;
-
-    /**
-     * @param ValueFactory $valueFactory
-     */
-    public function __construct(ValueFactory $valueFactory)
-    {
-        $this->valueFactory = $valueFactory;
-    }
-
-    /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function resolve(
         Field $field,
         $context,
         ResolveInfo $info,
         array $value = null,
         array $args = null
-    ): Value {
+    ) {
         $result = null;
         if ($value['type_id'] === Bundle::TYPE_CODE) {
             $result = isset($value['price_type']) ? !$value['price_type'] : null;
         }
 
-        return $this->valueFactory->create(
-            function () use ($result) {
-                return $result;
-            }
-        );
+        return $result;
     }
 }

app/code/Magento/BundleGraphQl/Model/Resolver/Product/Fields/DynamicPrice.php

@@ -5,55 +5,33 @@
  */
 declare(strict_types=1);
 
-
 namespace Magento\BundleGraphQl\Model\Resolver\Product\Fields;
 
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 use Magento\Bundle\Model\Product\Type as Bundle;
 use Magento\Framework\GraphQl\Config\Element\Field;
-use Magento\Framework\GraphQl\Query\Resolver\Value;
-use Magento\Framework\GraphQl\Query\Resolver\ValueFactory;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 
 /**
- * {@inheritdoc}
+ * @inheritdoc
  */
 class DynamicSku implements ResolverInterface
 {
     /**
-     * @var ValueFactory
-     */
-    private $valueFactory;
-
-    /**
-     * @param ValueFactory $valueFactory
-     */
-    public function __construct(ValueFactory $valueFactory)
-    {
-        $this->valueFactory = $valueFactory;
-    }
-
-    /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function resolve(
         Field $field,
         $context,
         ResolveInfo $info,
         array $value = null,
         array $args = null
-    ): Value {
-        $result = function () {
-            return null;
-        };
+    ) {
+        $result = null;
         if ($value['type_id'] === Bundle::TYPE_CODE) {
             $result = isset($value['sku_type']) ? !$value['sku_type'] : null;
         }
 
-        return $this->valueFactory->create(
-            function () use ($result) {
-                return $result;
-            }
-        );
+        return $result;
     }
 }