Merge branch 'MC-20636' of github.com:magento-honey-badgers/magento2ce into MC-20636

# Conflicts:
#	dev/tests/api-functional/testsuite/Magento/GraphQl/Sales/RetrieveOrdersByOrderNumberTest.php

Author: dthampy

app/code/Magento/SalesGraphQl/Model/InvoiceItemInterfaceTypeResolverComposite.php

@@ -11,7 +11,7 @@
 use Magento\Framework\GraphQl\Query\Resolver\TypeResolverInterface;
 
 /**
- * @inheritDoc
+ *  Composite class to resolve invoice item type
  */
 class InvoiceItemInterfaceTypeResolverComposite implements TypeResolverInterface
 {

app/code/Magento/SalesGraphQl/Model/InvoiceItemTypeResolver.php

@@ -9,6 +9,9 @@
 
 use Magento\Framework\GraphQl\Query\Resolver\TypeResolverInterface;
 
+/**
+ * Leaf for composite class to resolve invoice item type
+ */
 class InvoiceItemTypeResolver implements TypeResolverInterface
 {
     /**

app/code/Magento/SalesGraphQl/Model/OrderItemInterfaceTypeResolverComposite.php

@@ -11,7 +11,7 @@
 use Magento\Framework\GraphQl\Query\Resolver\TypeResolverInterface;
 
 /**
- * @inheritdoc
+ * Composite class to resolve order item type
  */
 class OrderItemInterfaceTypeResolverComposite implements TypeResolverInterface
 {

app/code/Magento/SalesGraphQl/Model/OrderItemTypeResolver.php

@@ -9,6 +9,9 @@
 
 use Magento\Framework\GraphQl\Query\Resolver\TypeResolverInterface;
 
+/**
+ * Leaf for composite class to resolve order item type
+ */
 class OrderItemTypeResolver implements TypeResolverInterface
 {
     /**

app/code/Magento/SalesGraphQl/Model/Resolver/BundleOptions.php

@@ -129,14 +129,13 @@ private function formatBundleOptionItems(
             // Value Id is missing from parent, so we have to match the child to parent option
             if (isset($bundleChildAttributes['option_id'])
                 && $bundleChildAttributes['option_id'] == $bundleOptionId) {
+                $item = $this->orderItemProvider->getOrderItemById((int)$childrenOrderItem->getItemId());
                 $optionItems[$childrenOrderItem->getItemId()] = [
                     'id' => base64_encode($childrenOrderItem->getItemId()),
                     'product_name' => $childrenOrderItem->getName(),
                     'product_sku' => $childrenOrderItem->getSku(),
                     'quantity' => $bundleChildAttributes['qty'],
-                    'price' => [
-                        'value' => $bundleChildAttributes['price']
-                    ]
+                    'price' => $item['product_sale_price'],
                 ];
             }
         }

app/code/Magento/SalesGraphQl/Model/Resolver/CustomerOrders.php

@@ -15,7 +15,7 @@
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 use Magento\GraphQl\Model\Query\ContextInterface;
-use Magento\Sales\Model\Order;
+use Magento\Sales\Api\Data\OrderInterface;
 use Magento\SalesGraphQl\Model\Resolver\CustomerOrders\Query\SearchQuery;
 use Magento\Store\Api\Data\StoreInterface;
 
@@ -69,10 +69,10 @@ public function resolve(
 
         $orders = [];
         foreach (($searchResultDto->getItems() ?? []) as $order) {
-            if (!isset($order['model']) && !($order['model'] instanceof Order)) {
+            if (!($order['model'] ?? null instanceof OrderInterface)) {
                 throw new LocalizedException(__('"model" value should be specified'));
             }
-            /** @var Order $orderModel */
+            /** @var OrderInterface $orderModel */
             $orderModel = $order['model'];
             $orders[] = [
                 'created_at' => $order['created_at'],

app/code/Magento/SalesGraphQl/Model/Resolver/CustomerOrders/Query/OrderFilter.php

@@ -22,9 +22,6 @@
  */
 class OrderFilter
 {
-    /** Minimum query lenth for the filter */
-    private const DEFAULT_MIN_QUERY_LENGTH = 3;
-
     /**
      * @var ScopeConfigInterface
      */
@@ -70,7 +67,7 @@ public function __construct(
     /**
      * Filter for filtering the requested categories id's based on url_key, ids, name in the result.
      *
-     * @param string $userId
+     * @param int $userId
      * @param array $args
      * @param StoreInterface $store
      * @param SearchCriteriaBuilder $searchCriteriaBuilder

app/code/Magento/SalesGraphQl/Model/Resolver/InvoiceItems.php

@@ -12,10 +12,10 @@
 use Magento\Framework\GraphQl\Query\Resolver\ValueFactory;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-use Magento\Sales\Api\Data\InvoiceInterface as Invoice;
+use Magento\Sales\Api\Data\InvoiceInterface;
 use Magento\Sales\Api\Data\InvoiceItemInterface;
+use Magento\Sales\Api\Data\OrderInterface;
 use Magento\Sales\Api\Data\OrderItemInterface;
-use Magento\Sales\Model\Order;
 use Magento\SalesGraphQl\Model\Resolver\OrderItem\DataProvider as OrderItemProvider;
 
 /**
@@ -55,37 +55,38 @@ public function resolve(
         array $value = null,
         array $args = null
     ) {
-        if (!isset($value['model']) || !($value['model'] instanceof Invoice)) {
+        if (!(($value['model'] ?? null) instanceof InvoiceInterface)) {
             throw new LocalizedException(__('"model" value should be specified'));
         }
 
-        if (!isset($value['order']) || !($value['order'] instanceof Order)) {
+        if (!(($value['order'] ?? null) instanceof OrderInterface)) {
             throw new LocalizedException(__('"order" value should be specified'));
         }
 
-        /** @var Invoice $invoiceModel */
+        /** @var InvoiceInterface $invoiceModel */
         $invoiceModel = $value['model'];
-        $parentOrder = $value['order'];
+        /** @var OrderInterface $parentOrderModel */
+        $parentOrderModel = $value['order'];
 
         return $this->valueFactory->create(
-            $this->getInvoiceItems($parentOrder, $invoiceModel->getItems())
+            $this->getInvoiceItems($parentOrderModel, $invoiceModel->getItems())
         );
     }
 
     /**
-     * Get Invoice Item Data
+     * Get invoice items data as promise
      *
-     * @param Order $order
+     * @param OrderInterface $order
      * @param array $invoiceItems
      * @return \Closure
      */
-    public function getInvoiceItems(Order $order, array $invoiceItems)
+    public function getInvoiceItems(OrderInterface $order, array $invoiceItems): \Closure
     {
         $itemsList = [];
         foreach ($invoiceItems as $Item) {
             $this->orderItemProvider->addOrderItemId((int)$Item->getOrderItemId());
         }
-        $itemsList = function () use ($order, $invoiceItems, $itemsList) {
+        return function () use ($order, $invoiceItems, $itemsList): array {
             foreach ($invoiceItems as $invoiceItem) {
                 $orderItem = $this->orderItemProvider->getOrderItemById((int)$invoiceItem->getOrderItemId());
                 /** @var OrderItemInterface $orderItemModel */
@@ -99,19 +100,17 @@ public function getInvoiceItems(Order $order, array $invoiceItems)
             }
             return $itemsList;
         };
-        return $itemsList;
     }
 
     /**
-     * Get resolved Invoice Item Data
+     * Get formatted invoice item data
      *
-     * @param Order $order
+     * @param OrderInterface $order
      * @param InvoiceItemInterface $invoiceItem
      * @return array
      */
-    private function getInvoiceItemData(Order $order, InvoiceItemInterface $invoiceItem)
+    private function getInvoiceItemData(OrderInterface $order, InvoiceItemInterface $invoiceItem): array
     {
-        /** @var OrderItemInterface $orderItem */
         $orderItem = $this->orderItemProvider->getOrderItemById((int)$invoiceItem->getOrderItemId());
         return [
             'id' => base64_encode($invoiceItem->getEntityId()),

app/code/Magento/SalesGraphQl/Model/Resolver/Invoices.php

@@ -11,7 +11,7 @@
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
-use Magento\Sales\Model\Order;
+use Magento\Sales\Api\Data\OrderInterface;
 use Magento\Sales\Api\Data\InvoiceInterface as Invoice;
 
 /**
@@ -29,11 +29,11 @@ public function resolve(
         array $value = null,
         array $args = null
     ) {
-        if (!isset($value['model']) || !($value['model'] instanceof Order)) {
+        if (!(($value['model'] ?? null) instanceof OrderInterface)) {
             throw new LocalizedException(__('"model" value should be specified'));
         }
 
-        /** @var Order $orderModel */
+        /** @var OrderInterface $orderModel */
         $orderModel = $value['model'];
         $invoices = [];
         /** @var Invoice $invoice */

app/code/Magento/SalesGraphQl/Model/Resolver/OrderItems.php

@@ -14,7 +14,7 @@
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 use Magento\GraphQl\Model\Query\ContextInterface;
-use Magento\Sales\Model\Order;
+use Magento\Sales\Api\Data\OrderInterface;
 use Magento\SalesGraphQl\Model\Resolver\OrderItem\DataProvider as OrderItemProvider;
 
 /**
@@ -53,10 +53,10 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
         if (false === $context->getExtensionAttributes()->getIsCustomer()) {
             throw new GraphQlAuthorizationException(__('The current customer isn\'t authorized.'));
         }
-        if (!isset($value['model']) || !($value['model'] instanceof Order)) {
+        if (!(($value['model'] ?? null) instanceof OrderInterface)) {
             throw new LocalizedException(__('"model" value should be specified'));
         }
-        /** @var Order $parentOrder */
+        /** @var OrderInterface $parentOrder */
         $parentOrder = $value['model'];
         $orderItemIds = [];
         foreach ($parentOrder->getItems() as $item) {
@@ -69,7 +69,7 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
         foreach ($orderItemIds as $orderItemId) {
             $itemsList[] = $this->valueFactory->create(
                 function () use ($orderItemId) {
-                    return $this->orderItemProvider->getOrderItemById($orderItemId);
+                    return $this->orderItemProvider->getOrderItemById((int)$orderItemId);
                 }
             );
         }