Merge remote-tracking branch 'mainline/2.3-develop' into EPAM-PR-85

Author: krissyhiserote

app/code/Magento/Catalog/Test/Mftf/Test/AdminCreateVirtualProductWithTierPriceTest.xml

@@ -97,6 +97,10 @@
         <waitForPageLoad stepKey="waitForCategoryPageToLoad"/>
         <see selector="{{StorefrontCategoryMainSection.productLink}}" userInput="{{virtualProductBigQty.name}}" stepKey="seeVirtualProductNameOnCategoryPage"/>
 
+        <!--Run full reindex and clear caches -->
+        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
+        <magentoCLI command="cache:flush" stepKey="flushCache"/>
+
         <!-- Verify customer see created virtual product with tier price(from above step) on storefront page and is searchable by sku -->
         <amOnPage url="{{StorefrontHomePage.url}}" stepKey="goToStorefront"/>
         <waitForPageLoad stepKey="waitForStoreFrontProductPageLoad"/>

app/code/Magento/CatalogGraphQl/Model/Product/Option/DateType.php

@@ -10,9 +10,12 @@
 use Magento\Catalog\Model\Product\Option\Type\Date as ProductDateOptionType;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Stdlib\DateTime;
+use Magento\Framework\GraphQl\Exception\GraphQlInputException;
 
 /**
- * @inheritdoc
+ * CatalogGraphQl product option date type
+ *
+ * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  */
 class DateType extends ProductDateOptionType
 {
@@ -43,6 +46,13 @@ private function formatValues($values)
         if (isset($values[$this->getOption()->getId()])) {
             $value = $values[$this->getOption()->getId()];
             $dateTime = \DateTime::createFromFormat(DateTime::DATETIME_PHP_FORMAT, $value);
+
+            if ($dateTime === false) {
+                throw new GraphQlInputException(
+                    __('Invalid format provided. Please use \'Y-m-d H:i:s\' format.')
+                );
+            }
+
             $values[$this->getOption()->getId()] = [
                 'date' => $value,
                 'year' => $dateTime->format('Y'),

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

@@ -70,13 +70,15 @@ public function execute(ContextInterface $context): CustomerInterface
 
         try {
             $customer = $this->customerRepository->getById($currentUserId);
+            // @codeCoverageIgnoreStart
         } catch (NoSuchEntityException $e) {
             throw new GraphQlNoSuchEntityException(
                 __('Customer with id "%customer_id" does not exist.', ['customer_id' => $currentUserId]),
                 $e
             );
         } catch (LocalizedException $e) {
             throw new GraphQlInputException(__($e->getMessage()));
+            // @codeCoverageIgnoreEnd
         }
 
         if (true === $this->authentication->isLocked($currentUserId)) {
@@ -85,8 +87,10 @@ public function execute(ContextInterface $context): CustomerInterface
 
         try {
             $confirmationStatus = $this->accountManagement->getConfirmationStatus($currentUserId);
+            // @codeCoverageIgnoreStart
         } catch (LocalizedException $e) {
             throw new GraphQlInputException(__($e->getMessage()));
+            // @codeCoverageIgnoreEnd
         }
 
         if ($confirmationStatus === AccountManagementInterface::ACCOUNT_CONFIRMATION_REQUIRED) {

app/code/Magento/DownloadableGraphQl/Model/Cart/BuyRequest/DownloadableLinksDataProvider.php

@@ -40,12 +40,7 @@ public function execute(array $cartItemData): array
 
         if (isset($cartItemData['data']) && isset($cartItemData['data']['sku'])) {
             $sku = $cartItemData['data']['sku'];
-
-            try {
-                $product = $this->productRepository->get($sku);
-            } catch (NoSuchEntityException $e) {
-                throw new GraphQlNoSuchEntityException(__('Could not find specified product.'));
-            }
+            $product = $this->productRepository->get($sku);
 
             if ($product->getLinksPurchasedSeparately() && isset($cartItemData['downloadable_product_links'])) {
                 $downloadableLinks = $cartItemData['downloadable_product_links'];

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

@@ -43,7 +43,7 @@ enum DownloadableFileTypeEnum @deprecated(reason: "`sample_url` serves to get th
 }
 
 type DownloadableProductLinks @doc(description: "DownloadableProductLinks defines characteristics of a downloadable product") {
-    id: Int @deprecated(reason: "This information shoud not be exposed on frontend")
+    id: Int @deprecated(reason: "This information should not be exposed on frontend")
     title: String @doc(description: "The display name of the link")
     sort_order: Int @doc(description: "A number indicating the sort order")
     price: Float @doc(description: "The price of the downloadable product")
@@ -56,7 +56,7 @@ type DownloadableProductLinks @doc(description: "DownloadableProductLinks define
 }
 
 type DownloadableProductSamples @doc(description: "DownloadableProductSamples defines characteristics of a downloadable product") {
-    id: Int @deprecated(reason: "This information shoud not be exposed on frontend")
+    id: Int @deprecated(reason: "This information should not be exposed on frontend")
     title: String @doc(description: "The display name of the sample")
     sort_order: Int @doc(description: "A number indicating the sort order")
     sample_url: String @doc(description: "URL to the downloadable sample")

app/code/Magento/Email/Model/Transport.php

@@ -9,7 +9,6 @@
 
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\Exception\MailException;
-use Magento\Framework\Mail\EmailMessageInterface;
 use Magento\Framework\Mail\MessageInterface;
 use Magento\Framework\Mail\TransportInterface;
 use Magento\Framework\Phrase;
@@ -62,12 +61,12 @@ class Transport implements TransportInterface
     private $message;
 
     /**
-     * @param EmailMessageInterface $message Email message object
+     * @param MessageInterface $message Email message object
      * @param ScopeConfigInterface $scopeConfig Core store config
      * @param null|string|array|\Traversable $parameters Config options for sendmail parameters
      */
     public function __construct(
-        EmailMessageInterface $message,
+        MessageInterface $message,
         ScopeConfigInterface $scopeConfig,
         $parameters = null
     ) {

app/code/Magento/QuoteGraphQl/Model/Cart/ExtractQuoteAddressData.php

@@ -7,7 +7,6 @@
 
 namespace Magento\QuoteGraphQl\Model\Cart;
 
-use Magento\Customer\Model\Address\AbstractAddress;
 use Magento\Framework\Api\ExtensibleDataObjectConverter;
 use Magento\Quote\Api\Data\AddressInterface;
 use Magento\Quote\Model\Quote\Address as QuoteAddress;
@@ -41,28 +40,37 @@ public function execute(QuoteAddress $address): array
         $addressData = $this->dataObjectConverter->toFlatArray($address, [], AddressInterface::class);
         $addressData['model'] = $address;
 
-        $addressData = array_merge($addressData, [
-            'country' => [
-                'code' => $address->getCountryId(),
-                'label' => $address->getCountry()
-            ],
-            'region' => [
-                'code' => $address->getRegionCode(),
-                'label' => $address->getRegion()
-            ],
-            'street' => $address->getStreet(),
-            'items_weight' => $address->getWeight(),
-            'customer_notes' => $address->getCustomerNotes()
-        ]);
+        $addressData = array_merge(
+            $addressData,
+            [
+                'country' => [
+                    'code' => $address->getCountryId(),
+                    'label' => $address->getCountry()
+                ],
+                'region' => [
+                    'code' => $address->getRegionCode(),
+                    'label' => $address->getRegion()
+                ],
+                'street' => $address->getStreet(),
+                'items_weight' => $address->getWeight(),
+                'customer_notes' => $address->getCustomerNotes()
+            ]
+        );
 
         if (!$address->hasItems()) {
             return $addressData;
         }
 
         $addressItemsData = [];
         foreach ($address->getAllItems() as $addressItem) {
+            if ($addressItem instanceof \Magento\Quote\Model\Quote\Item) {
+                $itemId = $addressItem->getItemId();
+            } else {
+                $itemId = $addressItem->getQuoteItemId();
+            }
+
             $addressItemsData[] = [
-                'cart_item_id' => $addressItem->getQuoteItemId(),
+                'cart_item_id' => $itemId,
                 'quantity' => $addressItem->getQty()
             ];
         }

app/code/Magento/QuoteGraphQl/Model/Cart/ValidateAddressFromSchema.php

@@ -0,0 +1,55 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\QuoteGraphQl\Model\Cart;
+
+use Magento\Framework\GraphQl\Schema\Type\TypeRegistry;
+
+/**
+ * Validates address against required fields from schema
+ */
+class ValidateAddressFromSchema
+{
+    /**
+     * @var TypeRegistry
+     */
+    private $typeRegistry;
+
+    /**
+     * @param TypeRegistry $typeRegistry
+     */
+    public function __construct(
+        TypeRegistry $typeRegistry
+    ) {
+        $this->typeRegistry = $typeRegistry;
+    }
+
+    /**
+     * Validate data from address against mandatory fields from graphql schema for address
+     *
+     * @param array $address
+     * @return bool
+     */
+    public function execute(array $address = []) : bool
+    {
+        /** @var \Magento\Framework\GraphQL\Schema\Type\Input\InputObjectType $cartAddressInput */
+        $cartAddressInput = $this->typeRegistry->get('CartAddressInput');
+        $fields = $cartAddressInput->getFields();
+
+        foreach ($fields as $field) {
+            if ($field->getType() instanceof \Magento\Framework\GraphQL\Schema\Type\NonNull) {
+                // an array key has to exist but it's value should not be null
+                if (array_key_exists($field->name, $address)
+                    && !is_array($address[$field->name])
+                    && !isset($address[$field->name])) {
+                    return false;
+                }
+            }
+        }
+        return true;
+    }
+}

app/code/Magento/QuoteGraphQl/Model/Resolver/BillingAddress.php

@@ -13,6 +13,7 @@
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 use Magento\Quote\Api\Data\CartInterface;
 use Magento\QuoteGraphQl\Model\Cart\ExtractQuoteAddressData;
+use Magento\QuoteGraphQl\Model\Cart\ValidateAddressFromSchema;
 
 /**
  * @inheritdoc
@@ -24,12 +25,21 @@ class BillingAddress implements ResolverInterface
      */
     private $extractQuoteAddressData;
 
+    /**
+     * @var ValidateAddressFromSchema
+     */
+    private $validateAddressFromSchema;
+
     /**
      * @param ExtractQuoteAddressData $extractQuoteAddressData
+     * @param ValidateAddressFromSchema $validateAddressFromSchema
      */
-    public function __construct(ExtractQuoteAddressData $extractQuoteAddressData)
-    {
+    public function __construct(
+        ExtractQuoteAddressData $extractQuoteAddressData,
+        ValidateAddressFromSchema $validateAddressFromSchema
+    ) {
         $this->extractQuoteAddressData = $extractQuoteAddressData;
+        $this->validateAddressFromSchema = $validateAddressFromSchema;
     }
 
     /**
@@ -44,11 +54,10 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
         $cart = $value['model'];
 
         $billingAddress = $cart->getBillingAddress();
-        if (null === $billingAddress) {
+        $addressData = $this->extractQuoteAddressData->execute($billingAddress);
+        if (!$this->validateAddressFromSchema->execute($addressData)) {
             return null;
         }
-
-        $addressData = $this->extractQuoteAddressData->execute($billingAddress);
         return $addressData;
     }
 }

app/code/Magento/QuoteGraphQl/Model/Resolver/ShippingAddresses.php

@@ -13,8 +13,7 @@
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 use Magento\Quote\Model\Quote;
 use Magento\QuoteGraphQl\Model\Cart\ExtractQuoteAddressData;
-use Magento\Framework\GraphQl\Schema\Type\TypeRegistry;
-use Magento\Framework\App\ObjectManager;
+use Magento\QuoteGraphQl\Model\Cart\ValidateAddressFromSchema;
 
 /**
  * @inheritdoc
@@ -27,20 +26,20 @@ class ShippingAddresses implements ResolverInterface
     private $extractQuoteAddressData;
 
     /**
-     * @var TypeRegistry
+     * @var ValidateAddressFromSchema
      */
-    private $typeRegistry;
+    private $validateAddressFromSchema;
 
     /**
      * @param ExtractQuoteAddressData $extractQuoteAddressData
-     * @param TypeRegistry|null $typeRegistry
+     * @param ValidateAddressFromSchema $validateAddressFromSchema
      */
     public function __construct(
         ExtractQuoteAddressData $extractQuoteAddressData,
-        TypeRegistry $typeRegistry = null
+        ValidateAddressFromSchema $validateAddressFromSchema
     ) {
         $this->extractQuoteAddressData = $extractQuoteAddressData;
-        $this->typeRegistry = $typeRegistry ?: ObjectManager::getInstance()->get(TypeRegistry::class);
+        $this->validateAddressFromSchema = $validateAddressFromSchema;
     }
 
     /**
@@ -61,36 +60,11 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
             foreach ($shippingAddresses as $shippingAddress) {
                 $address = $this->extractQuoteAddressData->execute($shippingAddress);
 
-                if ($this->validateAddressFromSchema($address)) {
+                if ($this->validateAddressFromSchema->execute($address)) {
                     $addressesData[] = $address;
                 }
             }
         }
         return $addressesData;
     }
-
-    /**
-     * Validate data from address against mandatory fields from graphql schema for address
-     *
-     * @param array $address
-     * @return bool
-     */
-    private function validateAddressFromSchema(array $address) : bool
-    {
-        /** @var \Magento\Framework\GraphQL\Schema\Type\Input\InputObjectType $cartAddressInput */
-        $cartAddressInput = $this->typeRegistry->get('CartAddressInput');
-        $fields = $cartAddressInput->getFields();
-
-        foreach ($fields as $field) {
-            if ($field->getType() instanceof \Magento\Framework\GraphQL\Schema\Type\NonNull) {
-                // an array key has to exist but it's value should not be null
-                if (array_key_exists($field->name, $address)
-                    && !is_array($address[$field->name])
-                    && !isset($address[$field->name])) {
-                    return false;
-                }
-            }
-        }
-        return true;
-    }
 }