From fb5238daa9e141583e176cff8415d39c1f11caa2 Mon Sep 17 00:00:00 2001 From: Pieter Hoste Date: Thu, 9 Feb 2023 09:07:05 +0100 Subject: [PATCH 1/2] Fixed phpdoc block for setUseConfigMinSaleQty, it takes a boolean, not an int. --- .../Magento/CatalogInventory/Api/Data/StockItemInterface.php | 2 +- app/code/Magento/CatalogInventory/Model/Stock/Item.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/CatalogInventory/Api/Data/StockItemInterface.php b/app/code/Magento/CatalogInventory/Api/Data/StockItemInterface.php index da38af7ad4ae3..6821993dc67bf 100644 --- a/app/code/Magento/CatalogInventory/Api/Data/StockItemInterface.php +++ b/app/code/Magento/CatalogInventory/Api/Data/StockItemInterface.php @@ -173,7 +173,7 @@ public function setMinQty($minQty); public function getUseConfigMinSaleQty(); /** - * @param int $useConfigMinSaleQty + * @param bool $useConfigMinSaleQty * @return $this */ public function setUseConfigMinSaleQty($useConfigMinSaleQty); diff --git a/app/code/Magento/CatalogInventory/Model/Stock/Item.php b/app/code/Magento/CatalogInventory/Model/Stock/Item.php index 553ea7393c94d..dde02f0d5c87f 100644 --- a/app/code/Magento/CatalogInventory/Model/Stock/Item.php +++ b/app/code/Magento/CatalogInventory/Model/Stock/Item.php @@ -654,7 +654,7 @@ public function setMinQty($minQty) } /** - * @param int $useConfigMinSaleQty + * @param bool $useConfigMinSaleQty * @return $this */ public function setUseConfigMinSaleQty($useConfigMinSaleQty) From db58df03df1352243da8c383fded4c173ce80887 Mon Sep 17 00:00:00 2001 From: Pieter Hoste Date: Thu, 9 Feb 2023 09:15:40 +0100 Subject: [PATCH 2/2] Fixed some static test failures (not all of them). --- .../Api/Data/StockItemInterface.php | 61 ++++++++++--------- .../CatalogInventory/Model/Stock/Item.php | 12 ++-- 2 files changed, 35 insertions(+), 38 deletions(-) diff --git a/app/code/Magento/CatalogInventory/Api/Data/StockItemInterface.php b/app/code/Magento/CatalogInventory/Api/Data/StockItemInterface.php index 6821993dc67bf..8a5ba82f621a9 100644 --- a/app/code/Magento/CatalogInventory/Api/Data/StockItemInterface.php +++ b/app/code/Magento/CatalogInventory/Api/Data/StockItemInterface.php @@ -12,52 +12,53 @@ * @api * @since 100.0.2 * - * @deprecated 100.3.0 Replaced with Multi Source Inventory + * @deprecated 100.3.0 + * @see Replaced with Multi Source Inventory * @link https://developer.adobe.com/commerce/webapi/rest/inventory/index.html * @link https://developer.adobe.com/commerce/webapi/rest/inventory/inventory-api-reference.html */ interface StockItemInterface extends ExtensibleDataInterface { - const BACKORDERS_NO = 0; + public const BACKORDERS_NO = 0; - const ITEM_ID = 'item_id'; - const PRODUCT_ID = 'product_id'; - const STOCK_ID = 'stock_id'; - const QTY = 'qty'; - const IS_QTY_DECIMAL = 'is_qty_decimal'; - const SHOW_DEFAULT_NOTIFICATION_MESSAGE = 'show_default_notification_message'; + public const ITEM_ID = 'item_id'; + public const PRODUCT_ID = 'product_id'; + public const STOCK_ID = 'stock_id'; + public const QTY = 'qty'; + public const IS_QTY_DECIMAL = 'is_qty_decimal'; + public const SHOW_DEFAULT_NOTIFICATION_MESSAGE = 'show_default_notification_message'; - const USE_CONFIG_MIN_QTY = 'use_config_min_qty'; - const MIN_QTY = 'min_qty'; + public const USE_CONFIG_MIN_QTY = 'use_config_min_qty'; + public const MIN_QTY = 'min_qty'; - const USE_CONFIG_MIN_SALE_QTY = 'use_config_min_sale_qty'; - const MIN_SALE_QTY = 'min_sale_qty'; + public const USE_CONFIG_MIN_SALE_QTY = 'use_config_min_sale_qty'; + public const MIN_SALE_QTY = 'min_sale_qty'; - const USE_CONFIG_MAX_SALE_QTY = 'use_config_max_sale_qty'; - const MAX_SALE_QTY = 'max_sale_qty'; + public const USE_CONFIG_MAX_SALE_QTY = 'use_config_max_sale_qty'; + public const MAX_SALE_QTY = 'max_sale_qty'; - const USE_CONFIG_BACKORDERS = 'use_config_backorders'; - const BACKORDERS = 'backorders'; + public const USE_CONFIG_BACKORDERS = 'use_config_backorders'; + public const BACKORDERS = 'backorders'; - const USE_CONFIG_NOTIFY_STOCK_QTY = 'use_config_notify_stock_qty'; - const NOTIFY_STOCK_QTY = 'notify_stock_qty'; + public const USE_CONFIG_NOTIFY_STOCK_QTY = 'use_config_notify_stock_qty'; + public const NOTIFY_STOCK_QTY = 'notify_stock_qty'; - const USE_CONFIG_QTY_INCREMENTS = 'use_config_qty_increments'; - const QTY_INCREMENTS = 'qty_increments'; + public const USE_CONFIG_QTY_INCREMENTS = 'use_config_qty_increments'; + public const QTY_INCREMENTS = 'qty_increments'; - const USE_CONFIG_ENABLE_QTY_INC = 'use_config_enable_qty_inc'; - const ENABLE_QTY_INCREMENTS = 'enable_qty_increments'; + public const USE_CONFIG_ENABLE_QTY_INC = 'use_config_enable_qty_inc'; + public const ENABLE_QTY_INCREMENTS = 'enable_qty_increments'; - const USE_CONFIG_MANAGE_STOCK = 'use_config_manage_stock'; - const MANAGE_STOCK = 'manage_stock'; + public const USE_CONFIG_MANAGE_STOCK = 'use_config_manage_stock'; + public const MANAGE_STOCK = 'manage_stock'; - const IS_IN_STOCK = 'is_in_stock'; - const LOW_STOCK_DATE = 'low_stock_date'; - const IS_DECIMAL_DIVIDED = 'is_decimal_divided'; - const STOCK_STATUS_CHANGED_AUTO = 'stock_status_changed_auto'; + public const IS_IN_STOCK = 'is_in_stock'; + public const LOW_STOCK_DATE = 'low_stock_date'; + public const IS_DECIMAL_DIVIDED = 'is_decimal_divided'; + public const STOCK_STATUS_CHANGED_AUTO = 'stock_status_changed_auto'; - const STORE_ID = 'store_id'; - const CUSTOMER_GROUP_ID = 'customer_group_id'; + public const STORE_ID = 'store_id'; + public const CUSTOMER_GROUP_ID = 'customer_group_id'; /** * @return int|null diff --git a/app/code/Magento/CatalogInventory/Model/Stock/Item.php b/app/code/Magento/CatalogInventory/Model/Stock/Item.php index dde02f0d5c87f..0466a9805e130 100644 --- a/app/code/Magento/CatalogInventory/Model/Stock/Item.php +++ b/app/code/Magento/CatalogInventory/Model/Stock/Item.php @@ -25,7 +25,7 @@ class Item extends AbstractExtensibleModel implements StockItemInterface /** * Stock item entity code */ - const ENTITY = 'cataloginventory_stock_item'; + public const ENTITY = 'cataloginventory_stock_item'; /** * Prefix of model events names @@ -34,7 +34,7 @@ class Item extends AbstractExtensibleModel implements StockItemInterface */ protected $_eventPrefix = 'cataloginventory_stock_item'; - const WEBSITE_ID = 'website_id'; + public const WEBSITE_ID = 'website_id'; /** * Parameter name in event @@ -73,15 +73,11 @@ class Item extends AbstractExtensibleModel implements StockItemInterface protected $qtyIncrements; /** - * Store id - * * @var int|null */ protected $storeId; /** - * Customer group id - * * @var int|null */ protected $customerGroupId; @@ -819,7 +815,7 @@ public function setStockStatusChangedAuto($stockStatusChangedAuto) } /** - * {@inheritdoc} + * @inheritdoc * * @return \Magento\CatalogInventory\Api\Data\StockItemExtensionInterface|null */ @@ -829,7 +825,7 @@ public function getExtensionAttributes() } /** - * {@inheritdoc} + * @inheritdoc * * @param \Magento\CatalogInventory\Api\Data\StockItemExtensionInterface $extensionAttributes * @return $this