Merge pull request #467 from magento-gl/phpunit10

[Arrows] Delivery of PHPUnit 10 Upgrade
magento · Jun 7, 2024 · 5dd278d · 5dd278d
2 parents 2ebcef3 + 07d5e79
commit 5dd278d
Show file tree

Hide file tree

Showing 83 changed files with 194 additions and 160 deletions.
diff --git a/Inventory/Test/Integration/Source/Validator/CodeValidatorTest.php b/Inventory/Test/Integration/Source/Validator/CodeValidatorTest.php
@@ -63,7 +63,7 @@ public function testValidation($sourceCode, $errorCount, $errorStrings)
     /**
      * @return array
      */
-    public function dataProvider()
+    public static function dataProvider()
     {
         return [
             'valid code string' => [

diff --git a/Inventory/Test/Integration/Source/Validator/NameValidatorTest.php b/Inventory/Test/Integration/Source/Validator/NameValidatorTest.php
@@ -63,7 +63,7 @@ public function testValidation($value, $errorCount, $errorStrings)
     /**
      * @return array
      */
-    public function dataProvider()
+    public static function dataProvider()
     {
         return [
             'valid code string' => [

diff --git a/InventoryAdminUi/Test/Integration/Ui/DataProvider/StockDataProviderTest.php b/InventoryAdminUi/Test/Integration/Ui/DataProvider/StockDataProviderTest.php
@@ -56,7 +56,7 @@ public function testGetDataForListingDataStock($stockName, $assignedSources): vo
     /**
      * @return array
      */
-    public function listingDataStockDataProvider(): array
+    public static function listingDataStockDataProvider(): array
     {
         return [[
             'Global-stock',

diff --git a/InventoryApi/Test/Api/SourceItemsSave/ValidationTest.php b/InventoryApi/Test/Api/SourceItemsSave/ValidationTest.php
@@ -60,7 +60,7 @@ public function testCreateWithMissedRequiredFields(string $field, array $expecte
     /**
      * @return array
      */
-    public function dataProviderRequiredFields(): array
+    public static function dataProviderRequiredFields(): array
     {
         return [
             'without_' . SourceItemInterface::SKU => [
@@ -152,7 +152,7 @@ public function testFailedValidationOnCreate(string $field, $value, array $expec
      * @return array
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
-    public function failedValidationDataProvider(): array
+    public static function failedValidationDataProvider(): array
     {
         if (TESTS_WEB_API_ADAPTER === self::ADAPTER_SOAP) {
             $nonExistedSourceCodeError = [
@@ -357,7 +357,7 @@ public function testFailedValidationOnCreateRelatedOnlyForRest(string $field, $v
     /**
      * @return array
      */
-    public function failedValidationRelatedOnlyForRestDataProvider(): array
+    public static function failedValidationRelatedOnlyForRestDataProvider(): array
     {
         return [
             'empty_' . SourceItemInterface::QUANTITY => [

diff --git a/InventoryApi/Test/Api/SourceRepository/CarrierLinkManagementTest.php b/InventoryApi/Test/Api/SourceRepository/CarrierLinkManagementTest.php
@@ -17,8 +17,8 @@ class CarrierLinkManagementTest extends WebapiAbstract
     /**#@+
      * Service constants
      */
-    const RESOURCE_PATH = '/V1/inventory/sources';
-    const SERVICE_NAME = 'inventoryApiSourceRepositoryV1';
+    private const RESOURCE_PATH = '/V1/inventory/sources';
+    private const SERVICE_NAME = 'inventoryApiSourceRepositoryV1';
     /**#@-*/
 
     /**
@@ -54,7 +54,7 @@ public function testCarrierLinksManagement(array $carrierLinks)
     /**
      * @return array
      */
-    public function dataProviderCarrierLinks(): array
+    public static function dataProviderCarrierLinks(): array
     {
         return [
             'add_carrier_new_links' => [

diff --git a/InventoryApi/Test/Api/SourceRepository/ValidationTest.php b/InventoryApi/Test/Api/SourceRepository/ValidationTest.php
@@ -17,8 +17,8 @@ class ValidationTest extends WebapiAbstract
     /**#@+
      * Service constants
      */
-    const RESOURCE_PATH = '/V1/inventory/sources';
-    const SERVICE_NAME = 'inventoryApiSourceRepositoryV1';
+    private const RESOURCE_PATH = '/V1/inventory/sources';
+    private const SERVICE_NAME = 'inventoryApiSourceRepositoryV1';
     /**#@-*/
 
     /**
@@ -58,7 +58,7 @@ public function testCreateWithMissedRequiredFields(string $field, array $expecte
     /**
      * @return array
      */
-    public function dataProviderRequiredFields(): array
+    public static function dataProviderRequiredFields(): array
     {
         return [
             'without_' . SourceInterface::NAME => [
@@ -162,7 +162,7 @@ public function testFailedValidationOnUpdate(string $field, $value, array $expec
      * @return array
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
-    public function failedValidationDataProvider(): array
+    public static function failedValidationDataProvider(): array
     {
         return [
             'null_' . SourceInterface::SOURCE_CODE => [
@@ -375,7 +375,7 @@ public function failedValidationDataProvider(): array
      * @return array
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
-    public function failedValidationUpdateDataProvider(): array
+    public static function failedValidationUpdateDataProvider(): array
     {
         return [
             'null_' . SourceInterface::NAME => [

diff --git a/InventoryApi/Test/Api/StockRepository/GetListTest.php b/InventoryApi/Test/Api/StockRepository/GetListTest.php
@@ -19,8 +19,8 @@ class GetListTest extends WebapiAbstract
     /**#@+
      * Service constants
      */
-    const RESOURCE_PATH = '/V1/inventory/stocks';
-    const SERVICE_NAME = 'inventoryApiStockRepositoryV1';
+    private const RESOURCE_PATH = '/V1/inventory/stocks';
+    private const SERVICE_NAME = 'inventoryApiStockRepositoryV1';
     /**#@-*/
 
     /**
@@ -55,7 +55,7 @@ public function testGetList(array $searchCriteria, int $expectedTotalCount, arra
     /**
      * @return array
      */
-    public function dataProviderGetList(): array
+    public static function dataProviderGetList(): array
     {
         return [
             'filtering' => [

diff --git a/InventoryApi/Test/Api/StockRepository/ValidationTest.php b/InventoryApi/Test/Api/StockRepository/ValidationTest.php
@@ -18,8 +18,8 @@ class ValidationTest extends WebapiAbstract
     /**#@+
      * Service constants
      */
-    const RESOURCE_PATH = '/V1/inventory/stocks';
-    const SERVICE_NAME = 'inventoryApiStockRepositoryV1';
+    private const RESOURCE_PATH = '/V1/inventory/stocks';
+    private const SERVICE_NAME = 'inventoryApiStockRepositoryV1';
     /**#@-*/
 
     /**
@@ -56,7 +56,7 @@ public function testCreateWithMissedRequiredFields(string $field, array $expecte
     /**
      * @return array
      */
-    public function dataProviderRequiredFields(): array
+    public static function dataProviderRequiredFields(): array
     {
         return [
             'without_' . StockInterface::NAME => [
@@ -167,7 +167,7 @@ public function testFailedValidationOnUpdate(string $field, $value, array $expec
     /**
      * @return array
      */
-    public function failedValidationDataProvider(): array
+    public static function failedValidationDataProvider(): array
     {
         return [
             'empty_' . StockInterface::NAME => [

diff --git a/...ation/CatalogInventory/Api/StockRegistry/GetProductStockStatusBySkuOnDefaultStockTest.php b/...ation/CatalogInventory/Api/StockRegistry/GetProductStockStatusBySkuOnDefaultStockTest.php
@@ -69,7 +69,7 @@ public function testGetStatusIfScopeIdParameterIsPassed(string $sku, int $status
     /**
      * @return array
      */
-    public function getStockDataProvider(): array
+    public static function getStockDataProvider(): array
     {
         return [
             ['bundle-product-in-stock', 1],

diff --git a/...ntegration/CatalogInventory/Api/StockRegistry/GetProductStockStatusOnDefaultStockTest.php b/...ntegration/CatalogInventory/Api/StockRegistry/GetProductStockStatusOnDefaultStockTest.php
@@ -78,7 +78,7 @@ public function testGetStatusIfScopeIdParameterIsPassed(string $sku, int $status
     /**
      * @return array
      */
-    public function getStockDataProvider(): array
+    public static function getStockDataProvider(): array
     {
         return [
             ['bundle-product-in-stock', 1],

diff --git a/.../Integration/CatalogInventory/Api/StockRegistry/GetStockStatusBySkuOnDefaultStockTest.php b/.../Integration/CatalogInventory/Api/StockRegistry/GetStockStatusBySkuOnDefaultStockTest.php
@@ -68,7 +68,7 @@ public function testGetStatusIfScopeIdParameterIsPassed(string $sku, int $status
     /**
      * @return array
      */
-    public function getStockDataProvider(): array
+    public static function getStockDataProvider(): array
     {
         return [
             ['bundle-product-in-stock', 1],

diff --git a/.../Test/Integration/CatalogInventory/Api/StockRegistry/GetStockStatusOnDefaultStockTest.php b/.../Test/Integration/CatalogInventory/Api/StockRegistry/GetStockStatusOnDefaultStockTest.php
@@ -77,7 +77,7 @@ public function testGetStatusIfScopeIdParameterIsPassed(string $sku, int $status
     /**
      * @return array
      */
-    public function getStockDataProvider(): array
+    public static function getStockDataProvider(): array
     {
         return [
             ['bundle-product-in-stock', 1],

diff --git a/InventoryBundleProductIndexer/Test/Integration/Indexer/StockIndexerTest.php b/InventoryBundleProductIndexer/Test/Integration/Indexer/StockIndexerTest.php
@@ -153,7 +153,7 @@ public function testExecuteList(array $newSourceData, bool $expectedStockStatus)
         self::assertEquals($expectedStockStatus, (bool) $bundleStockItem[GetStockItemDataInterface::IS_SALABLE]);
     }
 
-    public function executeListDataProvider(): array
+    public static function executeListDataProvider(): array
     {
         return [
             [

diff --git a/InventoryCatalog/Test/Api/StockSourceLink/PreventAssignSourcesToDefaultStockTest.php b/InventoryCatalog/Test/Api/StockSourceLink/PreventAssignSourcesToDefaultStockTest.php
@@ -19,8 +19,8 @@ class PreventAssignSourcesToDefaultStockTest extends WebapiAbstract
     /**#@+
      * Service constants
      */
-    const RESOURCE_PATH_ASSIGN_SOURCES_TO_STOCK = '/V1/inventory/stock-source-links';
-    const SERVICE_NAME_ASSIGN_SOURCES_TO_STOCK = 'inventoryApiStockSourceLinksSaveV1';
+    private const RESOURCE_PATH_ASSIGN_SOURCES_TO_STOCK = '/V1/inventory/stock-source-links';
+    private const SERVICE_NAME_ASSIGN_SOURCES_TO_STOCK = 'inventoryApiStockSourceLinksSaveV1';
     /**#@-*/
 
     /**
@@ -87,7 +87,7 @@ public function testAssignSourcesToStockWithWrongParameters(
     /**
      * @return array
      */
-    public function dataProviderWrongParameters(): array
+    public static function dataProviderWrongParameters(): array
     {
         $defaultSourceProvider = Bootstrap::getObjectManager()->get(DefaultSourceProviderInterface::class);
         $defaultStockProvider = Bootstrap::getObjectManager()->get(DefaultStockProviderInterface::class);

diff --git a/InventoryCatalog/Test/Integration/Catalog/Block/Product/ListProduct/SortingTest.php b/InventoryCatalog/Test/Integration/Catalog/Block/Product/ListProduct/SortingTest.php
@@ -214,7 +214,7 @@ public function testProductListMoveOutOfStockToBottom(
      *
      * @return array
      */
-    public function productListWithShowOutOfStockSortOrderDataProvider(): array
+    public static function productListWithShowOutOfStockSortOrderDataProvider(): array
     {
         return [
             'default_order_price_asc' => [

diff --git a/...ation/CatalogInventory/Api/StockRegistry/GetProductStockStatusBySkuOnDefaultStockTest.php b/...ation/CatalogInventory/Api/StockRegistry/GetProductStockStatusBySkuOnDefaultStockTest.php
@@ -71,7 +71,7 @@ public function testGetStatusIfScopeIdParameterIsPassed(string $sku, int $status
     /**
      * @return array
      */
-    public function getStatusDataProvider(): array
+    public static function getStatusDataProvider(): array
     {
         return [
             ['SKU-1', 1],

diff --git a/...og/Test/Integration/CatalogInventory/Api/StockRegistry/GetProductStockStatusBySkuTest.php b/...og/Test/Integration/CatalogInventory/Api/StockRegistry/GetProductStockStatusBySkuTest.php
@@ -100,7 +100,7 @@ public function testGetStatusIfScopeIdParameterIsPassed(
     /**
      * @return array
      */
-    public function getStatusDataProvider(): array
+    public static function getStatusDataProvider(): array
     {
         return [
             ['store_for_eu_website', 'SKU-1', 1],

diff --git a/...ntegration/CatalogInventory/Api/StockRegistry/GetProductStockStatusOnDefaultStockTest.php b/...ntegration/CatalogInventory/Api/StockRegistry/GetProductStockStatusOnDefaultStockTest.php
@@ -80,7 +80,7 @@ public function testGetStatusIfScopeIdParameterIsPassed(string $sku, int $status
     /**
      * @return array
      */
-    public function getStatusDataProvider(): array
+    public static function getStatusDataProvider(): array
     {
         return [
             ['SKU-1', 1],

diff --git a/...Catalog/Test/Integration/CatalogInventory/Api/StockRegistry/GetProductStockStatusTest.php b/...Catalog/Test/Integration/CatalogInventory/Api/StockRegistry/GetProductStockStatusTest.php
@@ -109,7 +109,7 @@ public function testGetStatusIfScopeIdParameterIsPassed(
     /**
      * @return array
      */
-    public function getStatusDataProvider(): array
+    public static function getStatusDataProvider(): array
     {
         return [
             ['store_for_eu_website', 'SKU-1', 1],

diff --git a/...og/Test/Integration/CatalogInventory/Api/StockRegistry/GetStockStatusAsyncReindexTest.php b/...og/Test/Integration/CatalogInventory/Api/StockRegistry/GetStockStatusAsyncReindexTest.php
@@ -127,7 +127,7 @@ public function testGetStatusIfScopeIdParameterIsPassed(
     /**
      * @return array
      */
-    public function getStatusDataProvider(): array
+    public static function getStatusDataProvider(): array
     {
         return [
             ['store_for_eu_website', 'SKU-1', 1, 8.5],

diff --git a/.../Integration/CatalogInventory/Api/StockRegistry/GetStockStatusBySkuOnDefaultStockTest.php b/.../Integration/CatalogInventory/Api/StockRegistry/GetStockStatusBySkuOnDefaultStockTest.php
@@ -79,7 +79,7 @@ public function testGetStatusIfScopeIdParameterIsPassed(string $sku, int $status
     /**
      * @return array
      */
-    public function getStatusDataProvider(): array
+    public static function getStatusDataProvider(): array
     {
         return [
             ['SKU-1', 1, 5.5],

diff --git a/...ryCatalog/Test/Integration/CatalogInventory/Api/StockRegistry/GetStockStatusBySkuTest.php b/...ryCatalog/Test/Integration/CatalogInventory/Api/StockRegistry/GetStockStatusBySkuTest.php
@@ -106,7 +106,7 @@ public function testGetStatusIfScopeIdParameterIsPassed(
     /**
      * @return array
      */
-    public function getStatusDataProvider(): array
+    public static function getStatusDataProvider(): array
     {
         return [
             ['store_for_eu_website', 'SKU-1', 1, 8.5],

diff --git a/.../Test/Integration/CatalogInventory/Api/StockRegistry/GetStockStatusOnDefaultStockTest.php b/.../Test/Integration/CatalogInventory/Api/StockRegistry/GetStockStatusOnDefaultStockTest.php
@@ -81,7 +81,7 @@ public function testGetStatusIfScopeIdParameterIsPassed(string $sku, int $status
     /**
      * @return array
      */
-    public function getStatusDataProvider(): array
+    public static function getStatusDataProvider(): array
     {
         return [
             ['SKU-1', 1, 5.5],

diff --git a/InventoryCatalog/Test/Integration/CatalogInventory/Api/StockRegistry/GetStockStatusTest.php b/InventoryCatalog/Test/Integration/CatalogInventory/Api/StockRegistry/GetStockStatusTest.php
@@ -115,7 +115,7 @@ public function testGetStatusIfScopeIdParameterIsPassed(
     /**
      * @return array
      */
-    public function getStatusDataProvider(): array
+    public static function getStatusDataProvider(): array
     {
         return [
             ['store_for_eu_website', 'SKU-1', 1, 8.5],

diff --git a/...talog/Test/Integration/CatalogInventory/Helper/Stock/AddInStockFilterToCollectionTest.php b/...talog/Test/Integration/CatalogInventory/Helper/Stock/AddInStockFilterToCollectionTest.php
@@ -75,7 +75,7 @@ public function testAddInStockFilterToCollection(string $store, int $expectedSiz
     /**
      * @return array
      */
-    public function addInStockFilterToCollectionDataProvider(): array
+    public static function addInStockFilterToCollectionDataProvider(): array
     {
         return [
             ['store_for_eu_website', 3],

diff --git a/...ryCatalog/Test/Integration/CatalogInventory/Helper/Stock/AddStockStatusToProductsTest.php b/...ryCatalog/Test/Integration/CatalogInventory/Helper/Stock/AddStockStatusToProductsTest.php
@@ -79,7 +79,7 @@ public function testAddStockStatusToProducts(string $storeCode, array $productsD
     /**
      * @return array
      */
-    public function addStockStatusToProductsDataProvider(): array
+    public static function addStockStatusToProductsDataProvider(): array
     {
         return [
             'eu_website' => [

diff --git a/...ntoryCatalog/Test/Integration/CatalogInventory/Helper/Stock/AssignStatusToProductTest.php b/...ntoryCatalog/Test/Integration/CatalogInventory/Helper/Stock/AssignStatusToProductTest.php
@@ -109,7 +109,7 @@ public function testAssignStatusToProductIfStatusParameterIsPassed(string $store
     /**
      * @return array
      */
-    public function assignStatusToProductDataProvider(): array
+    public static function assignStatusToProductDataProvider(): array
     {
         return [
             'eu_website' => [

diff --git a/.../CatalogInventory/Model/ResourceModel/Stock/Status/AddIsInStockFilterToCollectionTest.php b/.../CatalogInventory/Model/ResourceModel/Stock/Status/AddIsInStockFilterToCollectionTest.php
@@ -78,7 +78,7 @@ public function testAddIsInStockFilterToCollection(string $store, int $expectedS
     /**
      * @return array
      */
-    public function addIsInStockFilterToCollectionDataProvider(): array
+    public static function addIsInStockFilterToCollectionDataProvider(): array
     {
         return [
             ['store_for_eu_website', 3],

diff --git a/...n/CatalogInventory/Model/ResourceModel/Stock/Status/AddSortByStockQtyToCollectionTest.php b/...n/CatalogInventory/Model/ResourceModel/Stock/Status/AddSortByStockQtyToCollectionTest.php
@@ -47,7 +47,7 @@ public function testExecute(string $storeCode, string $dir, array $expectedOrder
     /**
      * @return array
      */
-    public function executeDataProvider(): array
+    public static function executeDataProvider(): array
     {
         return [
             [

diff --git a/...Inventory/Model/ResourceModel/Stock/Status/AddStockDataToCollectionOnDefaultStockTest.php b/...Inventory/Model/ResourceModel/Stock/Status/AddStockDataToCollectionOnDefaultStockTest.php
@@ -50,7 +50,7 @@ public function testAddStockDataToCollection(int $expectedSize, bool $isFilterIn
     /**
      * @return array
      */
-    public function addStockDataToCollectionDataProvider(): array
+    public static function addStockDataToCollectionDataProvider(): array
     {
         return [
             [4, true],

diff --git a/...ration/CatalogInventory/Model/ResourceModel/Stock/Status/AddStockDataToCollectionTest.php b/...ration/CatalogInventory/Model/ResourceModel/Stock/Status/AddStockDataToCollectionTest.php
@@ -79,7 +79,7 @@ public function testAddStockDataToCollection(string $store, int $expectedSize, b
     /**
      * @return array
      */
-    public function addStockDataToCollectionDataProvider(): array
+    public static function addStockDataToCollectionDataProvider(): array
     {
         return [
             ['store_for_eu_website', 3, true],

diff --git a/...egration/CatalogInventory/Model/ResourceModel/Stock/Status/AddStockStatusToSelectTest.php b/...egration/CatalogInventory/Model/ResourceModel/Stock/Status/AddStockStatusToSelectTest.php
@@ -81,7 +81,7 @@ public function testAddStockStatusToSelect(
     /**
      * @return array
      */
-    public function addStockStatusToSelectDataProvider(): array
+    public static function addStockStatusToSelectDataProvider(): array
     {
         return [
             ['eu_website', 3, 3],

diff --git a/InventoryCatalog/Test/Integration/NegativeMinQtyTest.php b/InventoryCatalog/Test/Integration/NegativeMinQtyTest.php
@@ -106,7 +106,7 @@ public function testIsProductSalableForRequestedQtyWithBackordersEnabledAtProduc
      *
      * @return array
      */
-    public function isProductSalableForRequestedQtyWithBackordersEnabledAtProductLevelDataProvider(): array
+    public static function isProductSalableForRequestedQtyWithBackordersEnabledAtProductLevelDataProvider(): array
     {
         return [
             'salable_qty' => ['SKU-1', 10, -4.5, 13, true],