Merge remote-tracking branch 'origin/MC-33071-CE-14' into 2.4-develop-php74-pr34

Author: zakdma

dev/tests/api-functional/testsuite/Magento/GraphQl/Swatches/ProductSwatchDataTest.php

@@ -42,13 +42,13 @@ public function testTextSwatchDataValues()
 {
   products(filter: {sku: {eq: "$productSku"}}) {
     items {
-        ... on ConfigurableProduct{    
+        ... on ConfigurableProduct{
       configurable_options{
           values {
             swatch_data{
               value
             }
-          } 
+          }
         }
       }
     }
@@ -86,7 +86,7 @@ public function testVisualSwatchDataValues()
 {
   products(filter: {sku: {eq: "$productSku"}}) {
     items {
-        ... on ConfigurableProduct{    
+        ... on ConfigurableProduct{
       configurable_options{
           values {
             swatch_data{
@@ -95,7 +95,7 @@ public function testVisualSwatchDataValues()
                 thumbnail
               }
             }
-          } 
+          }
         }
       }
     }
@@ -115,7 +115,7 @@ public function testVisualSwatchDataValues()
         $option = $product['configurable_options'][0];
         $this->assertArrayHasKey('values', $option);
         $this->assertEquals($color, $option['values'][0]['swatch_data']['value']);
-        $this->assertContains(
+        $this->assertStringContainsString(
             $option['values'][1]['swatch_data']['value'],
             $this->swatchMediaHelper->getSwatchAttributeImage(Swatch::SWATCH_IMAGE_NAME, $imageName)
         );