Merge remote-tracking branch 'origin/2.3-develop' into MC-22819

Author: BaDos

app/code/Magento/CatalogGraphQl/Model/Resolver/Product/PriceRange.php

@@ -86,7 +86,7 @@ private function getMinimumProductPrice(SaleableInterface $product, StoreInterfa
         $priceProvider = $this->priceProviderPool->getProviderByProductType($product->getTypeId());
         $regularPrice = $priceProvider->getMinimalRegularPrice($product)->getValue();
         $finalPrice = $priceProvider->getMinimalFinalPrice($product)->getValue();
-        $minPriceArray = $this->formatPrice($regularPrice, $finalPrice, $store);
+        $minPriceArray = $this->formatPrice((float) $regularPrice, (float) $finalPrice, $store);
         $minPriceArray['model'] = $product;
         return $minPriceArray;
     }
@@ -103,7 +103,7 @@ private function getMaximumProductPrice(SaleableInterface $product, StoreInterfa
         $priceProvider = $this->priceProviderPool->getProviderByProductType($product->getTypeId());
         $regularPrice = $priceProvider->getMaximalRegularPrice($product)->getValue();
         $finalPrice = $priceProvider->getMaximalFinalPrice($product)->getValue();
-        $maxPriceArray = $this->formatPrice($regularPrice, $finalPrice, $store);
+        $maxPriceArray = $this->formatPrice((float) $regularPrice, (float) $finalPrice, $store);
         $maxPriceArray['model'] = $product;
         return $maxPriceArray;
     }

app/code/Magento/CustomerGraphQl/Model/Customer/ValidateCustomerData.php

@@ -8,9 +8,10 @@
 namespace Magento\CustomerGraphQl\Model\Customer;
 
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
+use Magento\Framework\Validator\EmailAddress as EmailAddressValidator;
 
 /**
- * Class ValidateCustomerData
+ * Customer data validation used during customer account creation and updating
  */
 class ValidateCustomerData
 {
@@ -21,14 +22,23 @@ class ValidateCustomerData
      */
     private $getAllowedCustomerAttributes;
 
+    /**
+     * @var EmailAddressValidator
+     */
+    private $emailAddressValidator;
+
     /**
      * ValidateCustomerData constructor.
      *
      * @param GetAllowedCustomerAttributes $getAllowedCustomerAttributes
+     * @param EmailAddressValidator $emailAddressValidator
      */
-    public function __construct(GetAllowedCustomerAttributes $getAllowedCustomerAttributes)
-    {
+    public function __construct(
+        GetAllowedCustomerAttributes $getAllowedCustomerAttributes,
+        EmailAddressValidator $emailAddressValidator
+    ) {
         $this->getAllowedCustomerAttributes = $getAllowedCustomerAttributes;
+        $this->emailAddressValidator = $emailAddressValidator;
     }
 
     /**
@@ -59,5 +69,11 @@ public function execute(array $customerData): void
                 __('Required parameters are missing: %1', [implode(', ', $errorInput)])
             );
         }
+
+        if (isset($customerData['email']) && !$this->emailAddressValidator->isValid($customerData['email'])) {
+            throw new GraphQlInputException(
+                __('"%1" is not a valid email address.', $customerData['email'])
+            );
+        }
     }
 }

app/code/Magento/GraphQl/etc/graphql/di.xml

@@ -7,6 +7,7 @@
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
     <preference for="Magento\Framework\App\FrontControllerInterface" type="Magento\GraphQl\Controller\GraphQl" />
+    <preference for="Magento\Framework\Authorization\RoleLocatorInterface" type="Magento\Webapi\Model\WebapiRoleLocator" />
     <type name="Magento\Authorization\Model\CompositeUserContext">
         <arguments>
             <argument name="userContexts" xsi:type="array">

app/code/Magento/SwatchesGraphQl/Model/Resolver/Product/Options/DataProvider/SwatchDataProvider.php

@@ -0,0 +1,66 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\SwatchesGraphQl\Model\Resolver\Product\Options\DataProvider;
+
+use Magento\Swatches\Helper\Data as SwatchData;
+use Magento\Swatches\Helper\Media as SwatchesMedia;
+use Magento\Swatches\Model\Swatch;
+
+/**
+ * Data provider for options swatches.
+ */
+class SwatchDataProvider
+{
+    /**
+     * @var SwatchData
+     */
+    private $swatchHelper;
+
+    /**
+     * @var SwatchesMedia
+     */
+    private $swatchMediaHelper;
+
+    /**
+     * SwatchDataProvider constructor.
+     *
+     * @param SwatchData $swatchHelper
+     * @param SwatchesMedia $swatchMediaHelper
+     */
+    public function __construct(
+        SwatchData $swatchHelper,
+        SwatchesMedia $swatchMediaHelper
+    ) {
+        $this->swatchHelper = $swatchHelper;
+        $this->swatchMediaHelper = $swatchMediaHelper;
+    }
+
+    /**
+     * Returns swatch data by option ID.
+     *
+     * @param string $optionId
+     * @return array|null
+     */
+    public function getData(string $optionId): ?array
+    {
+        $swatches = $this->swatchHelper->getSwatchesByOptionsId([$optionId]);
+        if (!isset($swatches[$optionId]['type'], $swatches[$optionId]['value'])) {
+            return null;
+        }
+        $type = (int)$swatches[$optionId]['type'];
+        $value = $swatches[$optionId]['value'];
+        $data = ['value' => $value, 'type' => $type];
+        if ($type === Swatch::SWATCH_TYPE_VISUAL_IMAGE) {
+            $data['thumbnail'] = $this->swatchMediaHelper->getSwatchAttributeImage(
+                Swatch::SWATCH_THUMBNAIL_NAME,
+                $value
+            );
+        }
+        return $data;
+    }
+}

app/code/Magento/SwatchesGraphQl/Model/Resolver/Product/Options/SwatchData.php

@@ -0,0 +1,50 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\SwatchesGraphQl\Model\Resolver\Product\Options;
+
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\SwatchesGraphQl\Model\Resolver\Product\Options\DataProvider\SwatchDataProvider;
+
+/**
+ * Class SwatchData
+ *
+ * Product swatch data resolver, used for GraphQL request processing
+ */
+class SwatchData implements ResolverInterface
+{
+    /**
+     * @var SwatchDataProvider
+     */
+    private $swatchDataProvider;
+
+    /**
+     * SwatchData constructor.
+     *
+     * @param SwatchDataProvider $swatchDataProvider
+     */
+    public function __construct(
+        SwatchDataProvider $swatchDataProvider
+    ) {
+        $this->swatchDataProvider = $swatchDataProvider;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function resolve(
+        Field $field,
+        $context,
+        ResolveInfo $info,
+        array $value = null,
+        array $args = null
+    ) {
+        return $this->swatchDataProvider->getData($value['value_index']);
+    }
+}

app/code/Magento/SwatchesGraphQl/Model/Resolver/Product/Options/SwatchDataTypeResolver.php

@@ -0,0 +1,35 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\SwatchesGraphQl\Model\Resolver\Product\Options;
+
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\GraphQl\Query\Resolver\TypeResolverInterface;
+use Magento\Swatches\Model\Swatch;
+
+/**
+ * Resolver for swatch data interface.
+ */
+class SwatchDataTypeResolver implements TypeResolverInterface
+{
+    /**
+     * @inheritdoc
+     */
+    public function resolveType(array $data): string
+    {
+        switch ($data['type']) {
+            case Swatch::SWATCH_TYPE_TEXTUAL:
+                return 'TextSwatchData';
+            case Swatch::SWATCH_TYPE_VISUAL_COLOR:
+                return 'ColorSwatchData';
+            case Swatch::SWATCH_TYPE_VISUAL_IMAGE:
+                return 'ImageSwatchData';
+            default:
+                throw new LocalizedException(__('Unsupported swatch type'));
+        }
+    }
+}

app/code/Magento/SwatchesGraphQl/etc/graphql/di.xml

@@ -16,4 +16,4 @@
             </argument>
         </arguments>
     </type>
-</config>
+</config>

app/code/Magento/SwatchesGraphQl/etc/schema.graphqls

@@ -26,4 +26,24 @@ type SwatchLayerFilterItem implements LayerFilterItemInterface, SwatchLayerFilte
 type SwatchData {
     type: String @doc(description: "Type of swatch filter item: 1 - text, 2 - image")
     value: String @doc(description: "Value for swatch item (text or image link)")
-}
+}
+
+type ConfigurableProductOptionsValues {
+    swatch_data: SwatchDataInterface @doc(description: "Swatch data for configurable product option") @resolver(class: "Magento\\SwatchesGraphQl\\Model\\Resolver\\Product\\Options\\SwatchData")
+}
+
+interface SwatchDataInterface @typeResolver(class: "Magento\\SwatchesGraphQl\\Model\\Resolver\\Product\\Options\\SwatchDataTypeResolver") {
+    value: String @doc(description: "Value of swatch item (HEX color code, image link or textual value)")
+}
+
+type ImageSwatchData implements SwatchDataInterface {
+    thumbnail: String @doc(description: "Thumbnail swatch image URL")
+}
+
+type TextSwatchData implements SwatchDataInterface {
+
+}
+
+type ColorSwatchData implements SwatchDataInterface {
+
+}

composer.json

@@ -88,7 +88,7 @@
         "friendsofphp/php-cs-fixer": "~2.14.0",
         "lusitanian/oauth": "~0.8.10",
         "magento/magento-coding-standard": "*",
-        "magento/magento2-functional-testing-framework": "2.5.3",
+        "magento/magento2-functional-testing-framework": "2.5.4",
         "pdepend/pdepend": "2.5.2",
         "phpcompatibility/php-compatibility": "^9.3",
         "phpmd/phpmd": "@stable",