From ec910362091e53cbad4130fd12449b50f4a33978 Mon Sep 17 00:00:00 2001
From: Tiago Sampaio <tiago@tiagosampaio.com>
Date: Thu, 15 Jul 2021 22:17:30 -0300
Subject: [PATCH 1/8] Cleaning up unused code.

---
 .../Model/ProductCollectionStockCondition.php             | 1 -
 .../Model/ResourceModel/Stock/Item/StockItemCriteria.php  | 8 ++++----
 .../ResourceModel/Stock/Status/StockStatusCriteria.php    | 6 +++---
 app/code/Magento/CatalogInventory/Model/StockRegistry.php | 6 +++---
 .../CatalogInventory/Model/StockRegistryProvider.php      | 1 -
 .../Setup/Patch/Data/ConvertSerializedDataToJson.php      | 1 -
 .../Setup/Patch/Data/CreateDefaultStock.php               | 1 -
 .../Setup/Patch/Data/UpdateStockItemsWebsite.php          | 1 -
 8 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/app/code/Magento/CatalogInventory/Model/ProductCollectionStockCondition.php b/app/code/Magento/CatalogInventory/Model/ProductCollectionStockCondition.php
index 8de5f9821d143..a25164310bbfd 100644
--- a/app/code/Magento/CatalogInventory/Model/ProductCollectionStockCondition.php
+++ b/app/code/Magento/CatalogInventory/Model/ProductCollectionStockCondition.php
@@ -6,7 +6,6 @@
 namespace Magento\CatalogInventory\Model;
 
 use Magento\Catalog\Model\CollectionConditionInterface;
-use Magento\Eav\Model\Entity\Collection\AbstractCollection;
 use Magento\Framework\Data\Collection\AbstractDb;
 use Magento\Framework\Data\CollectionModifierInterface;
 
diff --git a/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Item/StockItemCriteria.php b/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Item/StockItemCriteria.php
index 3d82ab247c4a8..bb88312e16e9c 100644
--- a/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Item/StockItemCriteria.php
+++ b/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Item/StockItemCriteria.php
@@ -6,13 +6,13 @@
 
 namespace Magento\CatalogInventory\Model\ResourceModel\Stock\Item;
 
+use Magento\CatalogInventory\Api\StockItemCriteriaInterface;
 use Magento\Framework\Data\AbstractCriteria;
-use Magento\CatalogInventory\Model\ResourceModel\Stock\Item\StockItemCriteriaMapper;
 
 /**
  * Class StockItemCriteria
  */
-class StockItemCriteria extends AbstractCriteria implements \Magento\CatalogInventory\Api\StockItemCriteriaInterface
+class StockItemCriteria extends AbstractCriteria implements StockItemCriteriaInterface
 {
     /**
      * @param string $mapper
@@ -80,10 +80,10 @@ public function setQtyFilter($comparisonMethod, $qty)
     /**
      * Add Criteria object
      *
-     * @param \Magento\CatalogInventory\Api\StockItemCriteriaInterface $criteria
+     * @param StockItemCriteriaInterface $criteria
      * @return bool
      */
-    public function addCriteria(\Magento\CatalogInventory\Api\StockItemCriteriaInterface $criteria)
+    public function addCriteria(StockItemCriteriaInterface $criteria)
     {
         $this->data[self::PART_CRITERIA_LIST]['list'][] = $criteria;
         return true;
diff --git a/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Status/StockStatusCriteria.php b/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Status/StockStatusCriteria.php
index 5ae69362ab6aa..7509bb4544bf6 100644
--- a/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Status/StockStatusCriteria.php
+++ b/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Status/StockStatusCriteria.php
@@ -6,13 +6,13 @@
 
 namespace Magento\CatalogInventory\Model\ResourceModel\Stock\Status;
 
+use Magento\CatalogInventory\Api\StockStatusCriteriaInterface;
 use Magento\Framework\Data\AbstractCriteria;
-use Magento\CatalogInventory\Model\ResourceModel\Stock\Status\StockStatusCriteriaMapper;
 
 /**
  * Class StockStatusCriteria
  */
-class StockStatusCriteria extends AbstractCriteria implements \Magento\CatalogInventory\Api\StockStatusCriteriaInterface
+class StockStatusCriteria extends AbstractCriteria implements StockStatusCriteriaInterface
 {
     /**
      * @param string $mapper
@@ -50,7 +50,7 @@ public function setQtyFilter($qty)
     /**
      * @inheritdoc
      */
-    public function addCriteria(\Magento\CatalogInventory\Api\StockStatusCriteriaInterface $criteria)
+    public function addCriteria(StockStatusCriteriaInterface $criteria)
     {
         $this->data[self::PART_CRITERIA_LIST]['list'][] = $criteria;
     }
diff --git a/app/code/Magento/CatalogInventory/Model/StockRegistry.php b/app/code/Magento/CatalogInventory/Model/StockRegistry.php
index f60edee330195..9f0ad4f735995 100644
--- a/app/code/Magento/CatalogInventory/Model/StockRegistry.php
+++ b/app/code/Magento/CatalogInventory/Model/StockRegistry.php
@@ -80,7 +80,7 @@ public function getStock($scopeId = null)
     /**
      * @param int $productId
      * @param int $scopeId
-     * @return \Magento\CatalogInventory\Api\Data\StockItemInterface
+     * @return StockItemInterface
      */
     public function getStockItem($productId, $scopeId = null)
     {
@@ -91,7 +91,7 @@ public function getStockItem($productId, $scopeId = null)
     /**
      * @param string $productSku
      * @param int $scopeId
-     * @return \Magento\CatalogInventory\Api\Data\StockItemInterface
+     * @return StockItemInterface
      * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
     public function getStockItemBySku($productSku, $scopeId = null)
@@ -167,7 +167,7 @@ public function getLowStockItems($scopeId, $qty, $currentPage = 1, $pageSize = 0
     /**
      * @inheritdoc
      */
-    public function updateStockItemBySku($productSku, \Magento\CatalogInventory\Api\Data\StockItemInterface $stockItem)
+    public function updateStockItemBySku($productSku, StockItemInterface $stockItem)
     {
         $productId = $this->resolveProductId($productSku);
         $websiteId = $stockItem->getWebsiteId() ?: null;
diff --git a/app/code/Magento/CatalogInventory/Model/StockRegistryProvider.php b/app/code/Magento/CatalogInventory/Model/StockRegistryProvider.php
index 8bdc4288445c1..ef0c8755c293f 100644
--- a/app/code/Magento/CatalogInventory/Model/StockRegistryProvider.php
+++ b/app/code/Magento/CatalogInventory/Model/StockRegistryProvider.php
@@ -15,7 +15,6 @@
 use Magento\CatalogInventory\Api\StockCriteriaInterfaceFactory;
 use Magento\CatalogInventory\Api\StockItemCriteriaInterfaceFactory;
 use Magento\CatalogInventory\Api\StockStatusCriteriaInterfaceFactory;
-use Magento\Store\Model\StoreManagerInterface;
 
 /**
  * Class StockRegistryProvider
diff --git a/app/code/Magento/CatalogInventory/Setup/Patch/Data/ConvertSerializedDataToJson.php b/app/code/Magento/CatalogInventory/Setup/Patch/Data/ConvertSerializedDataToJson.php
index d0ea3da59c51d..7a6a581d8fcea 100644
--- a/app/code/Magento/CatalogInventory/Setup/Patch/Data/ConvertSerializedDataToJson.php
+++ b/app/code/Magento/CatalogInventory/Setup/Patch/Data/ConvertSerializedDataToJson.php
@@ -6,7 +6,6 @@
 
 namespace Magento\CatalogInventory\Setup\Patch\Data;
 
-use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\DB\DataConverter\SerializedToJson;
 use Magento\Framework\DB\FieldDataConverterFactory;
 use Magento\Framework\DB\Select\QueryModifierFactory;
diff --git a/app/code/Magento/CatalogInventory/Setup/Patch/Data/CreateDefaultStock.php b/app/code/Magento/CatalogInventory/Setup/Patch/Data/CreateDefaultStock.php
index ceb353a8091a7..6c288144e6928 100644
--- a/app/code/Magento/CatalogInventory/Setup/Patch/Data/CreateDefaultStock.php
+++ b/app/code/Magento/CatalogInventory/Setup/Patch/Data/CreateDefaultStock.php
@@ -8,7 +8,6 @@
 
 use Magento\Eav\Setup\EavSetup;
 use Magento\Eav\Setup\EavSetupFactory;
-use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Setup\ModuleDataSetupInterface;
 use Magento\Framework\Setup\Patch\DataPatchInterface;
 use Magento\Framework\Setup\Patch\PatchVersionInterface;
diff --git a/app/code/Magento/CatalogInventory/Setup/Patch/Data/UpdateStockItemsWebsite.php b/app/code/Magento/CatalogInventory/Setup/Patch/Data/UpdateStockItemsWebsite.php
index 9c73da8915b64..7f30eb9bf4bf2 100644
--- a/app/code/Magento/CatalogInventory/Setup/Patch/Data/UpdateStockItemsWebsite.php
+++ b/app/code/Magento/CatalogInventory/Setup/Patch/Data/UpdateStockItemsWebsite.php
@@ -7,7 +7,6 @@
 namespace Magento\CatalogInventory\Setup\Patch\Data;
 
 use Magento\CatalogInventory\Model\Indexer\Stock\Processor;
-use Magento\Framework\App\ResourceConnection;
 use Magento\Framework\Setup\ModuleDataSetupInterface;
 use Magento\Framework\Setup\Patch\DataPatchInterface;
 use Magento\Framework\Setup\Patch\PatchVersionInterface;

From a45a0f505954042067756d522d9637044b14f621 Mon Sep 17 00:00:00 2001
From: Indrani Sonawane <indrani.sonawane@BLR1-LMC-N71679.local>
Date: Tue, 12 Nov 2024 12:57:02 +0530
Subject: [PATCH 2/8] Fixed few static test failures

---
 .../Model/ProductCollectionStockCondition.php   |  4 ++--
 .../Stock/Item/StockItemCriteria.php            |  6 +++---
 .../Stock/Status/StockStatusCriteria.php        |  2 +-
 .../CatalogInventory/Model/StockRegistry.php    | 17 ++++++++++++++++-
 .../Model/StockRegistryProvider.php             | 14 +++++++++++---
 5 files changed, 33 insertions(+), 10 deletions(-)

diff --git a/app/code/Magento/CatalogInventory/Model/ProductCollectionStockCondition.php b/app/code/Magento/CatalogInventory/Model/ProductCollectionStockCondition.php
index a25164310bbfd..fb2f3ec9f222e 100644
--- a/app/code/Magento/CatalogInventory/Model/ProductCollectionStockCondition.php
+++ b/app/code/Magento/CatalogInventory/Model/ProductCollectionStockCondition.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2017 Adobe
+ * All Rights Reserved.
  */
 namespace Magento\CatalogInventory\Model;
 
diff --git a/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Item/StockItemCriteria.php b/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Item/StockItemCriteria.php
index bb88312e16e9c..cc38f190fd5f4 100644
--- a/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Item/StockItemCriteria.php
+++ b/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Item/StockItemCriteria.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2021 Adobe
+ * All Rights Reserved.
  */
 
 namespace Magento\CatalogInventory\Model\ResourceModel\Stock\Item;
@@ -10,7 +10,7 @@
 use Magento\Framework\Data\AbstractCriteria;
 
 /**
- * Class StockItemCriteria
+ * Class StockItemCriteria Resource model
  */
 class StockItemCriteria extends AbstractCriteria implements StockItemCriteriaInterface
 {
diff --git a/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Status/StockStatusCriteria.php b/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Status/StockStatusCriteria.php
index 7509bb4544bf6..ca83138125177 100644
--- a/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Status/StockStatusCriteria.php
+++ b/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Status/StockStatusCriteria.php
@@ -10,7 +10,7 @@
 use Magento\Framework\Data\AbstractCriteria;
 
 /**
- * Class StockStatusCriteria
+ * Class StockStatusCriteria Resource model
  */
 class StockStatusCriteria extends AbstractCriteria implements StockStatusCriteriaInterface
 {
diff --git a/app/code/Magento/CatalogInventory/Model/StockRegistry.php b/app/code/Magento/CatalogInventory/Model/StockRegistry.php
index 9f0ad4f735995..19ba81f205678 100644
--- a/app/code/Magento/CatalogInventory/Model/StockRegistry.php
+++ b/app/code/Magento/CatalogInventory/Model/StockRegistry.php
@@ -15,7 +15,7 @@
 use Magento\CatalogInventory\Model\Spi\StockRegistryProviderInterface;
 
 /**
- * Class StockRegistry
+ * Class Catalog StockRegistry
  *
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
@@ -68,6 +68,8 @@ public function __construct(
     }
 
     /**
+     * Get Stock data
+     *
      * @param int $scopeId
      * @return \Magento\CatalogInventory\Api\Data\StockInterface
      */
@@ -78,6 +80,8 @@ public function getStock($scopeId = null)
     }
 
     /**
+     * Get Stock Item data
+     *
      * @param int $productId
      * @param int $scopeId
      * @return StockItemInterface
@@ -89,6 +93,8 @@ public function getStockItem($productId, $scopeId = null)
     }
 
     /**
+     * Get Stock Item By SKU
+     *
      * @param string $productSku
      * @param int $scopeId
      * @return StockItemInterface
@@ -102,6 +108,8 @@ public function getStockItemBySku($productSku, $scopeId = null)
     }
 
     /**
+     * Get Stock status
+     *
      * @param int $productId
      * @param int $scopeId
      * @return \Magento\CatalogInventory\Api\Data\StockStatusInterface
@@ -113,6 +121,8 @@ public function getStockStatus($productId, $scopeId = null)
     }
 
     /**
+     * Get Stock status by SKU
+     *
      * @param string $productSku
      * @param int $scopeId
      * @return \Magento\CatalogInventory\Api\Data\StockStatusInterface
@@ -127,6 +137,7 @@ public function getStockStatusBySku($productSku, $scopeId = null)
 
     /**
      * Retrieve Product stock status
+     *
      * @param int $productId
      * @param int $scopeId
      * @return int
@@ -139,6 +150,8 @@ public function getProductStockStatus($productId, $scopeId = null)
     }
 
     /**
+     * Get Product Stock status by SKU
+     *
      * @param string $productSku
      * @param null $scopeId
      * @return int
@@ -182,6 +195,8 @@ public function updateStockItemBySku($productSku, StockItemInterface $stockItem)
     }
 
     /**
+     * Resolve the Product Id
+     *
      * @param string $productSku
      * @return int
      * @throws \Magento\Framework\Exception\NoSuchEntityException
diff --git a/app/code/Magento/CatalogInventory/Model/StockRegistryProvider.php b/app/code/Magento/CatalogInventory/Model/StockRegistryProvider.php
index ef0c8755c293f..abd2a86ae1608 100644
--- a/app/code/Magento/CatalogInventory/Model/StockRegistryProvider.php
+++ b/app/code/Magento/CatalogInventory/Model/StockRegistryProvider.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2024 Adobe
+ * All Rights Reserved.
  */
 namespace Magento\CatalogInventory\Model;
 
@@ -17,7 +17,7 @@
 use Magento\CatalogInventory\Api\StockStatusCriteriaInterfaceFactory;
 
 /**
- * Class StockRegistryProvider
+ * Class Catalog StockRegistryProvider
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class StockRegistryProvider implements StockRegistryProviderInterface
@@ -107,6 +107,8 @@ public function __construct(
     }
 
     /**
+     * Get Stock
+     *
      * @param int|null $scopeId
      * @return \Magento\CatalogInventory\Api\Data\StockInterface
      */
@@ -128,6 +130,8 @@ public function getStock($scopeId)
     }
 
     /**
+     * Get Stock Item
+     *
      * @param int $productId
      * @param int $scopeId
      * @return \Magento\CatalogInventory\Api\Data\StockItemInterface
@@ -150,6 +154,8 @@ public function getStockItem($productId, $scopeId)
     }
 
     /**
+     * Get Stock Status
+     *
      * @param int $productId
      * @param int $scopeId
      * @return \Magento\CatalogInventory\Api\Data\StockStatusInterface
@@ -173,6 +179,8 @@ public function getStockStatus($productId, $scopeId)
     }
 
     /**
+     * Get Stock Registry Storage
+     *
      * @return StockRegistryStorage
      */
     private function getStockRegistryStorage()

From a227f92bb861e2d89b248707e96a70037e6f0a1d Mon Sep 17 00:00:00 2001
From: engcom-Charlie <engcom-vendorworker-charlie@adobe.com>
Date: Mon, 2 Dec 2024 14:59:50 +0530
Subject: [PATCH 3/8] Fixed static tests failures

---
 .../Stock/Status/StockStatusCriteria.php          |  4 ++--
 .../CatalogInventory/Model/StockRegistry.php      |  6 +++---
 .../Setup/Patch/Data/CreateDefaultStock.php       | 15 +++++++--------
 .../Setup/Patch/Data/UpdateStockItemsWebsite.php  | 15 +++++++--------
 4 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Status/StockStatusCriteria.php b/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Status/StockStatusCriteria.php
index ca83138125177..ef8bfabd2f66f 100644
--- a/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Status/StockStatusCriteria.php
+++ b/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Status/StockStatusCriteria.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2017 Adobe
+ * All Rights Reserved.
  */
 
 namespace Magento\CatalogInventory\Model\ResourceModel\Stock\Status;
diff --git a/app/code/Magento/CatalogInventory/Model/StockRegistry.php b/app/code/Magento/CatalogInventory/Model/StockRegistry.php
index 19ba81f205678..521da2afdc49e 100644
--- a/app/code/Magento/CatalogInventory/Model/StockRegistry.php
+++ b/app/code/Magento/CatalogInventory/Model/StockRegistry.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2017 Adobe
+ * All Rights Reserved.
  */
 
 namespace Magento\CatalogInventory\Model;
@@ -153,7 +153,7 @@ public function getProductStockStatus($productId, $scopeId = null)
      * Get Product Stock status by SKU
      *
      * @param string $productSku
-     * @param null $scopeId
+     * @param null|int $scopeId
      * @return int
      * @throws \Magento\Framework\Exception\NoSuchEntityException
      */
diff --git a/app/code/Magento/CatalogInventory/Setup/Patch/Data/CreateDefaultStock.php b/app/code/Magento/CatalogInventory/Setup/Patch/Data/CreateDefaultStock.php
index 6c288144e6928..4c2985acf6849 100644
--- a/app/code/Magento/CatalogInventory/Setup/Patch/Data/CreateDefaultStock.php
+++ b/app/code/Magento/CatalogInventory/Setup/Patch/Data/CreateDefaultStock.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 namespace Magento\CatalogInventory\Setup\Patch\Data;
@@ -13,8 +13,7 @@
 use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
 /**
- * Class CreateDefaultStock
- * @package Magento\CatalogInventory\Setup\Patch
+ * Class CreateDefaultStock patch
  */
 class CreateDefaultStock implements DataPatchInterface, PatchVersionInterface
 {
@@ -42,7 +41,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function apply()
     {
@@ -65,7 +64,7 @@ public function apply()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public static function getDependencies()
     {
@@ -73,7 +72,7 @@ public static function getDependencies()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public static function getVersion()
     {
@@ -81,7 +80,7 @@ public static function getVersion()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getAliases()
     {
diff --git a/app/code/Magento/CatalogInventory/Setup/Patch/Data/UpdateStockItemsWebsite.php b/app/code/Magento/CatalogInventory/Setup/Patch/Data/UpdateStockItemsWebsite.php
index 7f30eb9bf4bf2..f045958888092 100644
--- a/app/code/Magento/CatalogInventory/Setup/Patch/Data/UpdateStockItemsWebsite.php
+++ b/app/code/Magento/CatalogInventory/Setup/Patch/Data/UpdateStockItemsWebsite.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2018 Adobe
+ * All Rights Reserved.
  */
 
 namespace Magento\CatalogInventory\Setup\Patch\Data;
@@ -12,8 +12,7 @@
 use Magento\Framework\Setup\Patch\PatchVersionInterface;
 
 /**
- * Class UpdateStockItemsWebsite
- * @package Magento\CatalogInventory\Setup\Patch
+ * Class UpdateStockItemsWebsite patch
  */
 class UpdateStockItemsWebsite implements DataPatchInterface, PatchVersionInterface
 {
@@ -57,7 +56,7 @@ public function __construct(
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function apply()
     {
@@ -70,7 +69,7 @@ public function apply()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public static function getDependencies()
     {
@@ -80,7 +79,7 @@ public static function getDependencies()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public static function getVersion()
     {
@@ -88,7 +87,7 @@ public static function getVersion()
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getAliases()
     {

From f83a270e3f7da3896792037b90ebe371de8a488b Mon Sep 17 00:00:00 2001
From: Indrani <51680850+engcom-Charlie@users.noreply.github.com>
Date: Fri, 6 Dec 2024 18:44:07 +0530
Subject: [PATCH 4/8] Update CreateDefaultStock.php

Fixed static test
---
 .../Setup/Patch/Data/CreateDefaultStock.php              | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/CatalogInventory/Setup/Patch/Data/CreateDefaultStock.php b/app/code/Magento/CatalogInventory/Setup/Patch/Data/CreateDefaultStock.php
index 4c2985acf6849..0358d89562e9a 100644
--- a/app/code/Magento/CatalogInventory/Setup/Patch/Data/CreateDefaultStock.php
+++ b/app/code/Magento/CatalogInventory/Setup/Patch/Data/CreateDefaultStock.php
@@ -41,7 +41,14 @@ public function __construct(
     }
 
     /**
-     * @inheritdoc
+     * Run code inside patch
+     * If code fails, patch must be reverted, in case when we are speaking about schema - then under revert
+     * means run PatchInterface::revert()
+     *
+     * If we speak about data, under revert means: $transaction->rollback()
+     *
+     * @return void
+     *
      */
     public function apply()
     {

From 8dbc15f4505484cae49d4abbf93ccd6129b22337 Mon Sep 17 00:00:00 2001
From: Indrani <51680850+engcom-Charlie@users.noreply.github.com>
Date: Fri, 6 Dec 2024 18:46:04 +0530
Subject: [PATCH 5/8] Update UpdateStockItemsWebsite.php, fixed static tests

---
 .../Setup/Patch/Data/UpdateStockItemsWebsite.php          | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/code/Magento/CatalogInventory/Setup/Patch/Data/UpdateStockItemsWebsite.php b/app/code/Magento/CatalogInventory/Setup/Patch/Data/UpdateStockItemsWebsite.php
index f045958888092..e39ad4a236ec6 100644
--- a/app/code/Magento/CatalogInventory/Setup/Patch/Data/UpdateStockItemsWebsite.php
+++ b/app/code/Magento/CatalogInventory/Setup/Patch/Data/UpdateStockItemsWebsite.php
@@ -56,7 +56,13 @@ public function __construct(
     }
 
     /**
-     * @inheritdoc
+     * Run code inside patch
+     * If code fails, patch must be reverted, in case when we are speaking about schema - then under revert
+     * means run PatchInterface::revert()
+     *
+     * If we speak about data, under revert means: $transaction->rollback()
+     *
+     * @return void
      */
     public function apply()
     {

From 316cee2ad514d1b9212e76546f6b0765cce5d278 Mon Sep 17 00:00:00 2001
From: Indrani <51680850+engcom-Charlie@users.noreply.github.com>
Date: Fri, 6 Dec 2024 18:48:36 +0530
Subject: [PATCH 6/8] Update StockStatusCriteria.php, fixed static tests

---
 .../Stock/Status/StockStatusCriteria.php      | 20 +++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Status/StockStatusCriteria.php b/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Status/StockStatusCriteria.php
index ef8bfabd2f66f..ef826ecd9d0e7 100644
--- a/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Status/StockStatusCriteria.php
+++ b/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Status/StockStatusCriteria.php
@@ -24,7 +24,10 @@ public function __construct($mapper = '')
     }
 
     /**
-     * @inheritdoc
+     * Filter by scope(s)
+     *
+     * @param int $scope
+     * @return void
      */
     public function setScopeFilter($scope)
     {
@@ -32,7 +35,10 @@ public function setScopeFilter($scope)
     }
 
     /**
-     * @inheritdoc
+     * Add product(s) filter
+     *
+     * @param int $products
+     * @return void
      */
     public function setProductsFilter($products)
     {
@@ -40,7 +46,10 @@ public function setProductsFilter($products)
     }
 
     /**
-     * @inheritdoc
+     * Add filter by quantity
+     *
+     * @param float $qty
+     * @return void
      */
     public function setQtyFilter($qty)
     {
@@ -48,7 +57,10 @@ public function setQtyFilter($qty)
     }
 
     /**
-     * @inheritdoc
+     * Add Criteria object
+     *
+     * @param \Magento\CatalogInventory\Api\StockStatusCriteriaInterface $criteria
+     * @return void
      */
     public function addCriteria(StockStatusCriteriaInterface $criteria)
     {

From 8012cb885cade82498bc1f350351c1b1d614c176 Mon Sep 17 00:00:00 2001
From: Indrani <51680850+engcom-Charlie@users.noreply.github.com>
Date: Mon, 9 Dec 2024 13:34:26 +0530
Subject: [PATCH 7/8] Update CreateDefaultStock.php, fixed static test

---
 .../CatalogInventory/Setup/Patch/Data/CreateDefaultStock.php     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/code/Magento/CatalogInventory/Setup/Patch/Data/CreateDefaultStock.php b/app/code/Magento/CatalogInventory/Setup/Patch/Data/CreateDefaultStock.php
index 0358d89562e9a..292fc4dc20bf4 100644
--- a/app/code/Magento/CatalogInventory/Setup/Patch/Data/CreateDefaultStock.php
+++ b/app/code/Magento/CatalogInventory/Setup/Patch/Data/CreateDefaultStock.php
@@ -48,7 +48,6 @@ public function __construct(
      * If we speak about data, under revert means: $transaction->rollback()
      *
      * @return void
-     *
      */
     public function apply()
     {

From 836a91b28e67119fc8249cd8ec111bf46571280a Mon Sep 17 00:00:00 2001
From: engcom-Dash <grp-engcom-vendorworker-Dash@adobe.com>
Date: Thu, 29 May 2025 13:23:14 +0530
Subject: [PATCH 8/8] Resolved Conflicts of coyrights

---
 .../Model/ResourceModel/Stock/Item/StockItemCriteria.php        | 2 +-
 .../Model/ResourceModel/Stock/Status/StockStatusCriteria.php    | 2 +-
 app/code/Magento/CatalogInventory/Model/StockRegistry.php       | 2 +-
 .../Magento/CatalogInventory/Model/StockRegistryProvider.php    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Item/StockItemCriteria.php b/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Item/StockItemCriteria.php
index cc38f190fd5f4..b93ff611c24aa 100644
--- a/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Item/StockItemCriteria.php
+++ b/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Item/StockItemCriteria.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2021 Adobe
+ * Copyright 2014 Adobe
  * All Rights Reserved.
  */
 
diff --git a/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Status/StockStatusCriteria.php b/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Status/StockStatusCriteria.php
index ef826ecd9d0e7..f59fcd1d53aca 100644
--- a/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Status/StockStatusCriteria.php
+++ b/app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Status/StockStatusCriteria.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2017 Adobe
+ * Copyright 2014 Adobe
  * All Rights Reserved.
  */
 
diff --git a/app/code/Magento/CatalogInventory/Model/StockRegistry.php b/app/code/Magento/CatalogInventory/Model/StockRegistry.php
index 521da2afdc49e..4eec4b9161cee 100644
--- a/app/code/Magento/CatalogInventory/Model/StockRegistry.php
+++ b/app/code/Magento/CatalogInventory/Model/StockRegistry.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2017 Adobe
+ * Copyright 2014 Adobe
  * All Rights Reserved.
  */
 
diff --git a/app/code/Magento/CatalogInventory/Model/StockRegistryProvider.php b/app/code/Magento/CatalogInventory/Model/StockRegistryProvider.php
index abd2a86ae1608..b68f974867dc2 100644
--- a/app/code/Magento/CatalogInventory/Model/StockRegistryProvider.php
+++ b/app/code/Magento/CatalogInventory/Model/StockRegistryProvider.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright 2024 Adobe
+ * Copyright 2014 Adobe
  * All Rights Reserved.
  */
 namespace Magento\CatalogInventory\Model;