Merge remote-tracking branch 'origin/phpunit_deprecations' into Hammer-Plateform-Health-17July24

Author: glo71317

dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CreateCustomerAddressTest.php

@@ -807,7 +807,7 @@ public function testCreateCustomerAddressRegionCodeWithOutRegionIdForNoRegionReq
     /**
      * @return array
      */
-    public function invalidInputDataProvider()
+    public static function invalidInputDataProvider()
     {
         return [
             ['', 'Syntax Error: Expected Name, found )'],

dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CreateCustomerTest.php

@@ -78,7 +78,7 @@ public function testCreateCustomerAccountWithPassword(string $email)
     /**
      * @return array
      */
-    public function validEmailAddressDataProvider(): array
+    public static function validEmailAddressDataProvider(): array
     {
         return [
             ['new_customer@example.com'],
@@ -221,7 +221,7 @@ public function testCreateCustomerIfEmailIsNotValid(string $email)
     /**
      * @return array
      */
-    public function invalidEmailAddressDataProvider(): array
+    public static function invalidEmailAddressDataProvider(): array
     {
         return [
             ['plainaddress'],

dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/CreateCustomerV2Test.php

@@ -79,7 +79,7 @@ public function testCreateCustomerAccountWithPassword(string $email)
     /**
      * @return array
      */
-    public function validEmailAddressDataProvider(): array
+    public static function validEmailAddressDataProvider(): array
     {
         return [
             ['new_customer@example.com'],
@@ -222,7 +222,7 @@ public function testCreateCustomerIfEmailIsNotValid(string $email)
     /**
      * @return array
      */
-    public function invalidEmailAddressDataProvider(): array
+    public static function invalidEmailAddressDataProvider(): array
     {
         return [
             ['plainaddress'],

dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/GenerateCustomerTokenTest.php

@@ -116,7 +116,7 @@ public function testRegenerateCustomerToken(): void
     /**
      * @return array
      */
-    public function dataProviderInvalidCustomerInfo(): array
+    public static function dataProviderInvalidCustomerInfo(): array
     {
         return [
             'invalid_email' => [

dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/UpdateCustomerAddressTest.php

@@ -424,7 +424,7 @@ public function testUpdateCustomerAddressWithInvalidInput(string $input, string
     /**
      * @return array
      */
-    public function invalidInputDataProvider()
+    public static function invalidInputDataProvider()
     {
         return [
             ['', '"input" value must be specified'],

dev/tests/api-functional/testsuite/Magento/GraphQl/CustomerGraphQl/Model/Resolver/CustomerTest.php

@@ -618,7 +618,7 @@ public function testCustomerQueryingCustomerWithDifferentStoreHeaderDoesNotGener
         );
     }
 
-    public function invalidationMechanismProvider(): array
+    public static function invalidationMechanismProvider(): array
     {
         // provider is invoked before setUp() is called so need to init here
         $repo = Bootstrap::getObjectManager()->get(

dev/tests/integration/testsuite/Magento/CustomerImportExport/Model/Import/CustomerCompositeTest.php

@@ -200,31 +200,46 @@ public function testImportData(
      *
      * @return array
      */
-    public function importDataDataProvider()
+    public static function importDataDataProvider()
     {
         $filesDirectory = __DIR__ . '/_files/';
-        $sourceData = [
-            'delete_behavior' => [
-                '$behavior' => \Magento\ImportExport\Model\Import::BEHAVIOR_DELETE,
-                '$sourceFile' => $filesDirectory . self::DELETE_FILE_NAME,
-                '$dataBefore' => $this->_beforeImport,
-                '$dataAfter' => [],
-                '$updatedItemsCount' => 0,
-                '$createdItemsCount' => 0,
-                '$deletedItemsCount' => 1,
-                '$errors' => [],
+        $beforeImport = [
+            'betsyparker@example.com' => [
+                'addresses' => ['19107', '72701'],
+                'data' => ['firstname' => 'Betsy', 'lastname' => 'Parker'],
+            ],
+        ];
+        $afterImport = [
+            'betsyparker@example.com' => [
+                'addresses' => ['19107', '72701', '19108'],
+                'data' => ['firstname' => 'NotBetsy', 'lastname' => 'NotParker'],
             ],
+            'anthonyanealy@magento.com' => ['addresses' => ['72701', '92664']],
+            'loribbanks@magento.com' => ['addresses' => ['98801']],
+            'kellynilson@magento.com' => ['addresses' => []],
         ];
 
-        $sourceData['add_update_behavior'] = [
-            '$behavior' => \Magento\ImportExport\Model\Import::BEHAVIOR_ADD_UPDATE,
-            '$sourceFile' => $filesDirectory . self::UPDATE_FILE_NAME,
-            '$dataBefore' => $this->_beforeImport,
-            '$dataAfter' => $this->_afterImport,
-            '$updatedItemsCount' => 1,
-            '$createdItemsCount' => 3,
-            '$deletedItemsCount' => 0,
-            '$errors' => [],
+        $sourceData = [
+            'delete_behavior' => [
+                'behavior' => \Magento\ImportExport\Model\Import::BEHAVIOR_DELETE,
+                'sourceFile' => $filesDirectory . self::DELETE_FILE_NAME,
+                'dataBefore' => $beforeImport,
+                'dataAfter' => [],
+                'updatedItemsCount' => 0,
+                'createdItemsCount' => 0,
+                'deletedItemsCount' => 1,
+                'errors' => [],
+            ],
+            'add_update_behavior' => [
+                'behavior' => \Magento\ImportExport\Model\Import::BEHAVIOR_ADD_UPDATE,
+                'sourceFile' => $filesDirectory . self::UPDATE_FILE_NAME,
+                'dataBefore' => $beforeImport,
+                'dataAfter' => $afterImport,
+                'updatedItemsCount' => 1,
+                'createdItemsCount' => 3,
+                'deletedItemsCount' => 0,
+                'errors' => [],
+            ],
         ];
 
         return $sourceData;