cia-2.4.8-beta2-develop-2.4-develop-sync-01132025: resolve conflict

magento · Jan 14, 2025 · 13b9fa2 · 13b9fa2
2 parents 2ddab94 + 7f625de
commit 13b9fa2
Show file tree

Hide file tree

Showing 143 changed files with 319 additions and 296 deletions.
diff --git a/Inventory/Model/ResourceModel/Source/Collection.php b/Inventory/Model/ResourceModel/Source/Collection.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2017 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -52,8 +52,8 @@ public function __construct(
         FetchStrategyInterface $fetchStrategy,
         ManagerInterface $eventManager,
         SourceCarrierLinkManagementInterface $sourceCarrierLinkManagement,
-        AdapterInterface $connection = null,
-        AbstractDb $resource = null
+        ?AdapterInterface $connection = null,
+        ?AbstractDb $resource = null
     ) {
         parent::__construct(
             $entityFactory,

diff --git a/Inventory/Model/Source/Command/GetList.php b/Inventory/Model/Source/Command/GetList.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2017 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -61,7 +61,7 @@ public function __construct(
     /**
      * @inheritdoc
      */
-    public function execute(SearchCriteriaInterface $searchCriteria = null): SourceSearchResultsInterface
+    public function execute(?SearchCriteriaInterface $searchCriteria = null): SourceSearchResultsInterface
     {
         /** @var Collection $collection */
         $collection = $this->sourceCollectionFactory->create();

diff --git a/Inventory/Model/Source/Command/GetListInterface.php b/Inventory/Model/Source/Command/GetListInterface.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2017 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -24,10 +24,11 @@ interface GetListInterface
 {
     /**
      * Find Sources by given SearchCriteria
+     *
      * SearchCriteria is not required because load all sources is useful case
      *
      * @param SearchCriteriaInterface|null $searchCriteria
      * @return SourceSearchResultsInterface
      */
-    public function execute(SearchCriteriaInterface $searchCriteria = null): SourceSearchResultsInterface;
+    public function execute(?SearchCriteriaInterface $searchCriteria = null): SourceSearchResultsInterface;
 }
diff --git a/Inventory/Model/SourceRepository.php b/Inventory/Model/SourceRepository.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2017 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -69,7 +69,7 @@ public function get(string $sourceCode): SourceInterface
     /**
      * @inheritdoc
      */
-    public function getList(SearchCriteriaInterface $searchCriteria = null): SourceSearchResultsInterface
+    public function getList(?SearchCriteriaInterface $searchCriteria = null): SourceSearchResultsInterface
     {
         return $this->commandGetList->execute($searchCriteria);
     }

diff --git a/Inventory/Model/Stock/Command/GetList.php b/Inventory/Model/Stock/Command/GetList.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2017 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -61,7 +61,7 @@ public function __construct(
     /**
      * @inheritdoc
      */
-    public function execute(SearchCriteriaInterface $searchCriteria = null): StockSearchResultsInterface
+    public function execute(?SearchCriteriaInterface $searchCriteria = null): StockSearchResultsInterface
     {
         /** @var Collection $collection */
         $collection = $this->stockCollectionFactory->create();

diff --git a/Inventory/Model/Stock/Command/GetListInterface.php b/Inventory/Model/Stock/Command/GetListInterface.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2017 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -24,10 +24,11 @@ interface GetListInterface
 {
     /**
      * Find Stocks by given SearchCriteria
+     *
      * SearchCriteria is not required because load all stocks is useful case
      *
      * @param SearchCriteriaInterface|null $searchCriteria
      * @return StockSearchResultsInterface
      */
-    public function execute(SearchCriteriaInterface $searchCriteria = null): StockSearchResultsInterface;
+    public function execute(?SearchCriteriaInterface $searchCriteria = null): StockSearchResultsInterface;
 }
diff --git a/Inventory/Model/StockRepository.php b/Inventory/Model/StockRepository.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2017 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -86,7 +86,7 @@ public function deleteById(int $stockId): void
     /**
      * @inheritdoc
      */
-    public function getList(SearchCriteriaInterface $searchCriteria = null): StockSearchResultsInterface
+    public function getList(?SearchCriteriaInterface $searchCriteria = null): StockSearchResultsInterface
     {
         return $this->commandGetList->execute($searchCriteria);
     }

diff --git a/Inventory/composer.json b/Inventory/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-inventory",
     "description": "N/A",
     "require": {
-        "php": "~8.2.0||~8.3.0",
+        "php": "~8.2.0||~8.3.0||~8.4.0",
         "magento/framework": "*",
         "magento/module-inventory-api": "*"
     },

diff --git a/InventoryAdminUi/Controller/Adminhtml/Stock/Save.php b/InventoryAdminUi/Controller/Adminhtml/Stock/Save.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2017 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -29,7 +29,7 @@ class Save extends Action implements HttpPostActionInterface
     /**
      * @see _isAllowed()
      */
-    const ADMIN_RESOURCE = 'Magento_InventoryApi::stock_edit';
+    public const ADMIN_RESOURCE = 'Magento_InventoryApi::stock_edit';
 
     /**
      * @var StockSaveProcessor
@@ -139,7 +139,7 @@ private function processRedirectAfterSuccessSave(Redirect $resultRedirect, int $
      *
      * @return void
      */
-    private function processRedirectAfterFailureSave(Redirect $resultRedirect, int $stockId = null)
+    private function processRedirectAfterFailureSave(Redirect $resultRedirect, ?int $stockId = null)
     {
         if (null === $stockId) {
             $resultRedirect->setPath('*/*/new');

diff --git a/InventoryAdminUi/Test/Mftf/composer.json b/InventoryAdminUi/Test/Mftf/composer.json
@@ -5,7 +5,7 @@
         "sort-packages": true
     },
     "require": {
-        "php": "~8.2.0||~8.3.0",
+        "php": "~8.2.0||~8.3.0||~8.4.0",
         "magento/magento2-functional-testing-framework": "2.2.0",
         "magento/functional-test-module-inventory-api": "100.0.0-dev",
         "magento/functional-test-module-backend": "100.0.0-dev",

diff --git a/InventoryAdminUi/Ui/DataProvider/SourceDataProvider.php b/InventoryAdminUi/Ui/DataProvider/SourceDataProvider.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2017 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -90,7 +90,7 @@ public function __construct(
         Session $session,
         array $meta = [],
         array $data = [],
-        PoolInterface $pool = null
+        ?PoolInterface $pool = null
     ) {
         parent::__construct(
             $name,

diff --git a/InventoryAdminUi/Ui/DataProvider/StockDataProvider.php b/InventoryAdminUi/Ui/DataProvider/StockDataProvider.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2017 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -111,6 +111,7 @@ class StockDataProvider extends DataProvider
      * @param StockSourceLinksExtensionAttributes $stockSourceLinksExtensionAttributes
      * @param int|null $assignedSourcesLimit
      * @SuppressWarnings(PHPMD.ExcessiveParameterList) All parameters are needed for backward compatibility
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function __construct(
         $name,
@@ -129,7 +130,7 @@ public function __construct(
         GetSourcesAssignedToStockOrderedByPriorityInterface $getSourcesAssignedToStockOrderedByPriority,
         array $meta = [],
         array $data = [],
-        PoolInterface $pool = null,
+        ?PoolInterface $pool = null,
         ?LoggerInterface $logger = null,
         ?StockSourceLinksExtensionAttributes $stockSourceLinksExtensionAttributes = null,
         ?int $assignedSourcesLimit = 100

diff --git a/InventoryAdminUi/composer.json b/InventoryAdminUi/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-inventory-admin-ui",
     "description": "N/A",
     "require": {
-        "php": "~8.2.0||~8.3.0",
+        "php": "~8.2.0||~8.3.0||~8.4.0",
         "magento/framework": "*",
         "magento/module-inventory": "*",
         "magento/module-inventory-api": "*",

diff --git a/InventoryAdvancedCheckout/composer.json b/InventoryAdvancedCheckout/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-inventory-advanced-checkout",
     "description": "N/A",
     "require": {
-        "php": "~8.2.0||~8.3.0",
+        "php": "~8.2.0||~8.3.0||~8.4.0",
         "magento/framework": "*",
         "magento/module-store": "*",
         "magento/module-inventory-catalog-api": "*",

diff --git a/InventoryApi/Api/SourceRepositoryInterface.php b/InventoryApi/Api/SourceRepositoryInterface.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2017 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -40,7 +40,8 @@ public function save(\Magento\InventoryApi\Api\Data\SourceInterface $source): vo
 
     /**
      * Get Source data by given code. If you want to create plugin on get method, also you need to create separate
-     * plugin on getList method, because entity loading way is different for these methods
+     *
+     * Plugin on getList method, because entity loading way is different for these methods
      *
      * @param string $sourceCode
      * @return \Magento\InventoryApi\Api\Data\SourceInterface
@@ -50,12 +51,13 @@ public function get(string $sourceCode): \Magento\InventoryApi\Api\Data\SourceIn
 
     /**
      * Find Sources by SearchCriteria
+     *
      * SearchCriteria is not required because load all stocks is useful case
      *
      * @param \Magento\Framework\Api\SearchCriteriaInterface|null $searchCriteria
      * @return \Magento\InventoryApi\Api\Data\SourceSearchResultsInterface
      */
     public function getList(
-        \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria = null
+        ?\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria = null
     ): \Magento\InventoryApi\Api\Data\SourceSearchResultsInterface;
 }
diff --git a/InventoryApi/Api/StockRepositoryInterface.php b/InventoryApi/Api/StockRepositoryInterface.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2017 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -37,7 +37,8 @@ public function save(\Magento\InventoryApi\Api\Data\StockInterface $stock): int;
 
     /**
      * Get Stock data by given stockId. If you want to create plugin on get method, also you need to create separate
-     * plugin on getList method, because entity loading way is different for these methods
+     *
+     * Plugin on getList method, because entity loading way is different for these methods
      *
      * @param int $stockId
      * @return \Magento\InventoryApi\Api\Data\StockInterface
@@ -47,13 +48,14 @@ public function get(int $stockId): \Magento\InventoryApi\Api\Data\StockInterface
 
     /**
      * Find Stocks by given SearchCriteria
+     *
      * SearchCriteria is not required because load all stocks is useful case
      *
      * @param \Magento\Framework\Api\SearchCriteriaInterface|null $searchCriteria
      * @return \Magento\InventoryApi\Api\Data\StockSearchResultsInterface
      */
     public function getList(
-        \Magento\Framework\Api\SearchCriteriaInterface $searchCriteria = null
+        ?\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria = null
     ): \Magento\InventoryApi\Api\Data\StockSearchResultsInterface;
 
     /**

diff --git a/InventoryApi/composer.json b/InventoryApi/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-inventory-api",
     "description": "N/A",
     "require": {
-        "php": "~8.2.0||~8.3.0",
+        "php": "~8.2.0||~8.3.0||~8.4.0",
         "magento/framework": "*"
     },
     "type": "magento2-module",

diff --git a/InventoryBundleImportExport/composer.json b/InventoryBundleImportExport/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-inventory-bundle-import-export",
     "description": "N/A",
     "require": {
-        "php": "~8.2.0||~8.3.0",
+        "php": "~8.2.0||~8.3.0||~8.4.0",
         "magento/framework": "*",
         "magento/module-bundle-import-export": "*",
         "magento/module-inventory-catalog-api": "*",

diff --git a/InventoryBundleProduct/composer.json b/InventoryBundleProduct/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-inventory-bundle-product",
     "description": "N/A",
     "require": {
-        "php": "~8.2.0||~8.3.0",
+        "php": "~8.2.0||~8.3.0||~8.4.0",
         "magento/framework": "*",
         "magento/module-bundle": "*",
         "magento/module-catalog": "*",

diff --git a/InventoryBundleProductAdminUi/Test/Mftf/composer.json b/InventoryBundleProductAdminUi/Test/Mftf/composer.json
@@ -5,7 +5,7 @@
         "sort-packages": true
     },
     "require": {
-        "php": "~8.2.0||~8.3.0",
+        "php": "~8.2.0||~8.3.0||~8.4.0",
         "magento/magento2-functional-testing-framework": "2.2.0",
         "magento/functional-test-module-bundle": "100.0.0-dev"
     },

diff --git a/InventoryBundleProductAdminUi/composer.json b/InventoryBundleProductAdminUi/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-inventory-bundle-product-admin-ui",
     "description": "N/A",
     "require": {
-        "php": "~8.2.0||~8.3.0",
+        "php": "~8.2.0||~8.3.0||~8.4.0",
         "magento/framework": "*",
         "magento/module-bundle": "*",
         "magento/module-catalog": "*",

diff --git a/InventoryBundleProductIndexer/composer.json b/InventoryBundleProductIndexer/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-inventory-bundle-product-indexer",
     "description": "N/A",
     "require": {
-        "php": "~8.2.0||~8.3.0",
+        "php": "~8.2.0||~8.3.0||~8.4.0",
         "magento/framework": "*",
         "magento/module-bundle": "*",
         "magento/module-catalog": "*",

diff --git a/InventoryCache/composer.json b/InventoryCache/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/module-inventory-cache",
     "description": "N/A",
     "require": {
-        "php": "~8.2.0||~8.3.0",
+        "php": "~8.2.0||~8.3.0||~8.4.0",
         "magento/framework": "*",
         "magento/module-inventory-catalog-api": "*",
         "magento/module-inventory-indexer": "*"