MDEE-943: Fix deprecation on DataExporter (#463)

Author: duhon

CatalogDataExporter/Model/Provider/Product/CustomOptions.php

@@ -69,7 +69,7 @@ public function __construct(
     public function get(
         array $productIds,
         array $optionTypes,
-        string $storeViewCode = null,
+        ?string $storeViewCode = null,
         bool $addOptionValues = true
     ): array {
         $connection = $this->resourceConnection->getConnection();

CatalogDataExporter/Model/Query/ProductAttributeQuery.php

@@ -63,7 +63,7 @@ class ProductAttributeQuery
     public function __construct(
         ResourceConnection $resourceConnection,
         string $mainTable = 'catalog_product_entity',
-        EavAttributeQueryBuilderFactory $attributeQueryFactory = null,
+        ?EavAttributeQueryBuilderFactory $attributeQueryFactory = null,
         array $systemAttributes = []
     ) {
         $this->resourceConnection = $resourceConnection;

CatalogDataExporter/Model/Query/ProductLinksQuery.php

@@ -81,7 +81,7 @@ public function __construct(
      *
      * @return Select
      */
-    public function getQuery(array $productIds, string $storeViewCode, int $linkTypeId = null) : Select
+    public function getQuery(array $productIds, string $storeViewCode, ?int $linkTypeId = null) : Select
     {
         $connection = $this->resourceConnection->getConnection();
         $catalogProductTable = $this->resourceConnection->getTableName('catalog_product_entity');
@@ -171,7 +171,7 @@ public function getQuery(array $productIds, string $storeViewCode, int $linkType
      * @param int|null $linkTypeId
      * @return array
      */
-    private function getProductLinkAttributesData(int $linkTypeId = null) : array
+    private function getProductLinkAttributesData(?int $linkTypeId = null) : array
     {
         if (null === $this->productLinkAttributesCache) {
             $connection = $this->resourceConnection->getConnection();

DataExporter/Export/DataProcessorInterface.php

@@ -36,7 +36,7 @@ public function execute(
         array $arguments,
         callable $dataProcessorCallback,
         FeedIndexMetadata $metadata,
-        Node $node = null,
-        Info $info = null
+        ?Node $node = null,
+        ?Info $info = null
     ): void;
 }

DataExporter/Export/Processor.php

@@ -118,7 +118,7 @@ public function processWithCallback(
      * @param null|array $proxyData - added for backward compatibility with originally `processWithCallback` is called
      * @return array
      */
-    public function process(string $fieldName, array $arguments = [], array $proxyData = null) : array
+    public function process(string $fieldName, array $arguments = [], ?array $proxyData = null) : array
     {
         if ($proxyData !== null) {
             return $proxyData;

DataExporter/Model/Batch/BatchTable.php

@@ -87,7 +87,7 @@ public function __construct(
      * @throws \Zend_Db_Exception
      * @throws \Zend_Db_Statement_Exception
      */
-    public function create(string $insertDataQuery, bool $initializeCreate = null): int
+    public function create(string $insertDataQuery, ?bool $initializeCreate = null): int
     {
         $connection = $this->resourceConnection->getConnection();
         $batchTable = $connection->newTable()

DataExporter/Model/Batch/FeedSource/Generator.php

@@ -272,8 +272,8 @@ private function getSelect(
         string $sourceTableField,
         string $batchNumField,
         int $batchNumberIncrement = 0,
-        int $startFrom = null,
-        int $maxLimit = null
+        ?int $startFrom = null,
+        ?int $maxLimit = null
     ): Select {
         $connection = $this->resourceConnection->getConnection();
         $tableFeed = $this->resourceConnection->getTableName($metadata->getFeedTableName());

DataExporter/Model/Provider/QueryDataProvider.php

@@ -49,7 +49,7 @@ class QueryDataProvider
      */
     public function __construct(
         QueryProcessor $queryProcessor,
-        string $queryName = null,
+        ?string $queryName = null,
         array $queryArguments = []
     ) {
         $this->queryProcessor = $queryProcessor;

ProductPriceDataExporter/Model/Provider/ProductPrice.php

@@ -611,8 +611,8 @@ private function buildKey(int|string $productId, int|string $websiteId, int|stri
     private function addDiscountPrice(
         array &$priceFeedItem,
         string $code,
-        string $price = null,
-        string $percentage = null
+        ?string $price = null,
+        ?string $percentage = null
     ): void {
         foreach ($priceFeedItem['discounts'] as &$discount) {
             if ($discount['code'] === $code) {
@@ -686,7 +686,7 @@ private function buildCustomerGroupCode(string $customerGroupId): string
      * @param ?string $percent
      * @return void
      */
-    private function setPriceOrPercentageDiscount(array &$discount, string $price = null, string $percent = null): void
+    private function setPriceOrPercentageDiscount(array &$discount, ?string $price = null, ?string $percent = null): void
     {
         if (null !== $percent) {
             $discount['percentage'] = (float)$percent;

ProductPriceDataExporter/Model/Query/ProductPricesQuery.php

@@ -53,7 +53,7 @@ class ProductPricesQuery
     public function __construct(
         ResourceConnection $resourceConnection,
         MetadataPool $metadataPool,
-        Config $eavConfig = null
+        ?Config $eavConfig = null
     ) {
         $this->resourceConnection = $resourceConnection;
         $this->metadataPool = $metadataPool;

SalesOrdersDataExporter/Console/Command/Link.php

@@ -152,8 +152,8 @@ protected function execute(InputInterface $input, OutputInterface $output)
      */
     public function assignUuidsToOrderEntities(
         int $batchSize,
-        string $from = null,
-        string $to = null,
+        ?string $from = null,
+        ?string $to = null,
         string $state = ''
     ): int {
         return $this->orderUuidManager->assignByDate($batchSize, $from, $to, $state);

SalesOrdersDataExporter/Model/OrderUuidManager.php

@@ -100,8 +100,8 @@ public function __construct(
      */
     public function assignByDate(
         int $batchSize,
-        string $from = null,
-        string $to = null,
+        ?string $from = null,
+        ?string $to = null,
         string $state = ''
     ): int {
         $updatedEntities = 0;
@@ -141,8 +141,8 @@ public function assignByOrderIds(int $batchSize, array $orderIds): int
      */
     private function getOrders(
         int    $batchSize,
-        string $from = null,
-        string $to = null,
+        ?string $from = null,
+        ?string $to = null,
         string $state = '',
         array  $orderIds = []
     ): Generator {

SalesOrdersDataExporter/Model/Provider/Orders.php

@@ -43,7 +43,7 @@ class Orders extends \Magento\DataExporter\Model\Provider\QueryDataProvider
     public function __construct(
         CommerceDataExportLoggerInterface $logger,
         QueryProcessor $queryProcessor,
-        string $queryName = null,
+        ?string $queryName = null,
         array $queryArguments = []
     ) {
         parent::__construct($queryProcessor, $queryName, $queryArguments);