Merge branch 'patch-6' of https://github.com/pmzandbergen/magento2 into ACP2E-1769

� Conflicts:
�	app/code/Magento/SalesGraphQl/Model/OrderItem/DataProvider.php

Author: glo23503

app/code/Magento/SalesGraphQl/Model/OrderItem/DataProvider.php

@@ -10,7 +10,6 @@
 use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Framework\Api\SearchCriteriaBuilder;
-use Magento\Framework\App\ObjectManager;
 use Magento\Sales\Api\Data\OrderInterface;
 use Magento\Sales\Api\Data\OrderItemInterface;
 use Magento\Sales\Api\OrderItemRepositoryInterface;
@@ -68,22 +67,22 @@ class DataProvider
      * @param OrderRepositoryInterface $orderRepository
      * @param SearchCriteriaBuilder $searchCriteriaBuilder
      * @param OptionsProcessor $optionsProcessor
-     * @param TaxHelper|null $taxHelper
+     * @param TaxHelper $taxHelper
      */
     public function __construct(
         OrderItemRepositoryInterface $orderItemRepository,
         ProductRepositoryInterface $productRepository,
         OrderRepositoryInterface $orderRepository,
         SearchCriteriaBuilder $searchCriteriaBuilder,
         OptionsProcessor $optionsProcessor,
-        ?TaxHelper $taxHelper = null
+        TaxHelper $taxHelper
     ) {
         $this->orderItemRepository = $orderItemRepository;
         $this->productRepository = $productRepository;
         $this->orderRepository = $orderRepository;
         $this->searchCriteriaBuilder = $searchCriteriaBuilder;
         $this->optionsProcessor = $optionsProcessor;
-        $this->taxHelper = $taxHelper ?? ObjectManager::getInstance()->get(TaxHelper::class);
+        $this->taxHelper = $taxHelper;
     }
 
     /**