diff --git a/vendor/magento/module-catalog-import-export/Model/Import/Product.php b/vendor/magento/module-catalog-import-export/Model/Import/Product.php index 74c6576e6bc..665a44da7fc 100644 --- a/vendor/magento/module-catalog-import-export/Model/Import/Product.php +++ b/vendor/magento/module-catalog-import-export/Model/Import/Product.php @@ -169,8 +169,6 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity const URL_KEY = 'url_key'; /** - * Attribute cache - * * @var array */ protected $_attributeCache = []; @@ -236,8 +234,6 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity ]; /** - * Attributes codes which shows as date - * * @var array * @since 100.1.2 */ @@ -251,8 +247,6 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity ]; /** - * Need to log in import history - * * @var bool */ protected $logInHistory = true; @@ -265,8 +259,6 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity protected $_mediaGalleryAttributeId = null; /** - * Validation failure message template definitions - * * @var array * @codingStandardsIgnoreStart */ @@ -648,7 +640,7 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity private $_logger; /** - * {@inheritdoc} + * @var string */ protected $masterAttributeCode = 'sku'; @@ -689,15 +681,11 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity protected $rowNumbers = []; /** - * Product entity link field - * * @var string */ private $productEntityLinkField; /** - * Product entity identifier field - * * @var string */ private $productEntityIdentifierField; @@ -724,8 +712,6 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity private $catalogConfig; /** - * Stock Item Importer - * * @var StockItemImporterInterface */ private $stockItemImporter; @@ -3068,10 +3054,6 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity $stockItemDo = $this->stockRegistry->getStockItem($row['product_id'], $row['website_id']); $existStockData = $stockItemDo->getData(); - if (isset($rowData['qty']) && $rowData['qty'] == 0 && !isset($rowData['is_in_stock'])) { - $rowData['is_in_stock'] = 0; - } - $row = array_merge( $this->defaultStockData, array_intersect_key($existStockData, $this->defaultStockData), @@ -3080,11 +3062,10 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity ); if ($this->stockConfiguration->isQty($this->skuProcessor->getNewSku($sku)['type_id'])) { - if (isset($rowData['qty']) && $rowData['qty'] == 0) { - $row['is_in_stock'] = 0; - } $stockItemDo->setData($row); - $row['is_in_stock'] = $row['is_in_stock'] ?? $this->stockStateProvider->verifyStock($stockItemDo); + $row['is_in_stock'] = $this->stockStateProvider->verifyStock($stockItemDo) + ? (int) $row['is_in_stock'] + : 0; if ($this->stockStateProvider->verifyNotification($stockItemDo)) { $date = $this->dateTimeFactory->create('now', new \DateTimeZone('UTC')); $row['low_stock_date'] = $date->format(DateTime::DATETIME_PHP_FORMAT);