Merge pull request #5611 from magento-tsg/2.4-develop-php74-pr34

[TSG][PHP7.4] Fixes for 2.4 (pr34) (2.4-develop-php74)

Author: xmav

dev/tests/api-functional/framework/Magento/TestFramework/TestCase/WebapiAbstract.php

@@ -258,10 +258,10 @@ public static function getFixture($key)
      *
      * @param \Magento\Framework\Model\AbstractModel $model
      * @param bool $secure
-     * @return \Magento\TestFramework\TestCase\WebapiAbstract
+     * @return void
      * //phpcs:disable
      */
-    public static function callModelDelete($model, $secure = false)
+    public static function callModelDelete($model, $secure = false) : void
     {
         //phpcs:enable
         if ($model instanceof \Magento\Framework\Model\AbstractModel && $model->getId()) {
@@ -592,7 +592,11 @@ protected function checkSoapFault(
         $expectedWrappedErrors = [],
         $traceString = null
     ) {
-        $this->assertContains($expectedMessage, $soapFault->getMessage(), "Fault message is invalid.");
+        $this->assertStringContainsString(
+            $expectedMessage,
+            $soapFault->getMessage(),
+            "Fault message is invalid."
+        );
 
         $errorDetailsNode = 'GenericFault';
         $errorDetails = isset($soapFault->detail->$errorDetailsNode) ? $soapFault->detail->$errorDetailsNode : null;
@@ -611,7 +615,7 @@ protected function checkSoapFault(
                 ->getMode();
             if ($mode == \Magento\Framework\App\State::MODE_DEVELOPER) {
                 /** Developer mode changes tested behavior and it cannot properly be tested for now */
-                $this->assertContains(
+                $this->assertStringContainsString(
                     $traceString,
                     $errorDetails->$traceNode,
                     'Trace Information is incorrect.'

dev/tests/api-functional/testsuite/Magento/Analytics/Api/LinkProviderTest.php

@@ -67,7 +67,7 @@ public function testGetAll()
             try {
                 $this->_webApiCall($serviceInfo);
             } catch (\Exception $e) {
-                $this->assertContains(
+                $this->assertStringContainsString(
                     'Operation allowed only in HTTPS',
                     $e->getMessage()
                 );

dev/tests/api-functional/testsuite/Magento/Catalog/Api/AttributeSetManagementTest.php

@@ -185,7 +185,7 @@ public function testCreateThrowsExceptionIfAttributeSetWithGivenNameAlreadyExist
             $this->_webApiCall($this->createServiceInfo, $arguments);
             $this->fail("Expected exception");
         } catch (\SoapFault $e) {
-            $this->assertContains(
+            $this->assertStringContainsString(
                 $expectedMessage,
                 $e->getMessage(),
                 "SoapFault does not contain expected message."

dev/tests/api-functional/testsuite/Magento/Catalog/Api/CategoryLinkManagementTest.php

@@ -39,7 +39,7 @@ public function testInfoNoSuchEntityException()
         try {
             $this->getAssignedProducts(-1);
         } catch (\Exception $e) {
-            $this->assertContains('No such entity with %fieldName = %fieldValue', $e->getMessage());
+            $this->assertStringContainsString('No such entity with %fieldName = %fieldValue', $e->getMessage());
         }
     }
 

dev/tests/api-functional/testsuite/Magento/Catalog/Api/CategoryRepositoryTest.php

@@ -89,7 +89,7 @@ public function testInfoNoSuchEntityException()
         try {
             $this->getInfoCategory(-1);
         } catch (\Exception $e) {
-            $this->assertContains('No such entity with %fieldName = %fieldValue', $e->getMessage());
+            $this->assertStringContainsString('No such entity with %fieldName = %fieldValue', $e->getMessage());
         }
     }
 
@@ -168,7 +168,7 @@ public function testDeleteNoSuchEntityException()
         try {
             $this->deleteCategory(-1);
         } catch (\Exception $e) {
-            $this->assertContains('No such entity with %fieldName = %fieldValue', $e->getMessage());
+            $this->assertStringContainsString('No such entity with %fieldName = %fieldValue', $e->getMessage());
         }
     }
 

dev/tests/api-functional/testsuite/Magento/Catalog/Api/CostStorageTest.php

@@ -10,7 +10,7 @@
 use Magento\Framework\Webapi\Exception as HTTPExceptionCodes;
 
 /**
- * CostStorage test.
+ * Catalog Cost Storage API test.
  */
 class CostStorageTest extends WebapiAbstract
 {
@@ -58,7 +58,7 @@ public function testGet()
         $product = $productRepository->get(self::SIMPLE_PRODUCT_SKU);
 
         $this->assertNotEmpty($response);
-        $this->assertEquals($product->getCost(), $cost);
+        $this->assertEquals($cost, (int)$product->getCost());
     }
 
     /**
@@ -97,7 +97,7 @@ public function testUpdate()
         /** @var \Magento\Catalog\Api\Data\ProductInterface $product */
         $product = $productRepository->get(self::SIMPLE_PRODUCT_SKU);
         $this->assertEmpty($response);
-        $this->assertEquals($product->getCost(), $newCost);
+        $this->assertEquals($newCost, (int)$product->getCost());
     }
 
     /**

dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductAttributeManagementTest.php

@@ -63,7 +63,7 @@ public function testAssignAttributeWrongAttributeSet()
             $this->_webApiCall($this->getAssignServiceInfo(), $payload);
             $this->fail("Expected exception");
         } catch (\SoapFault $e) {
-            $this->assertContains(
+            $this->assertStringContainsString(
                 $expectedMessage,
                 $e->getMessage(),
                 "SoapFault does not contain expected message."
@@ -86,7 +86,7 @@ public function testAssignAttributeWrongAttributeGroup()
             $this->_webApiCall($this->getAssignServiceInfo(), $payload);
             $this->fail("Expected exception");
         } catch (\SoapFault $e) {
-            $this->assertContains(
+            $this->assertStringContainsString(
                 $expectedMessage,
                 $e->getMessage(),
                 "SoapFault does not contain expected message."
@@ -110,7 +110,7 @@ public function testAssignAttributeWrongAttribute()
             $this->_webApiCall($this->getAssignServiceInfo(), $payload);
             $this->fail("Expected exception");
         } catch (\SoapFault $e) {
-            $this->assertContains(
+            $this->assertStringContainsString(
                 $expectedMessage,
                 $e->getMessage(),
                 "SoapFault does not contain expected message."

dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductAttributeRepositoryTest.php

@@ -362,7 +362,7 @@ public function testDeleteNoSuchEntityException()
             $this->_webApiCall($serviceInfo, ['attributeCode' => $attributeCode]);
             $this->fail("Expected exception");
         } catch (\SoapFault $e) {
-            $this->assertContains(
+            $this->assertStringContainsString(
                 $expectedMessage,
                 $e->getMessage(),
                 "SoapFault does not contain expected message."

dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductCustomOptionTypeListTest.php

@@ -38,6 +38,6 @@ public function testGetTypes()
             'group' => __('Select'),
         ];
         $this->assertGreaterThanOrEqual(10, count($types));
-        $this->assertContains($excepted, $types);
+        $this->assertContainsEquals($excepted, $types);
     }
 }

dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductLinkTypeListTest.php

@@ -29,7 +29,7 @@ public function testGetItems()
         ];
         $actual = $this->_webApiCall($serviceInfo);
         $expectedItems = ['name' => 'related', 'code' => Link::LINK_TYPE_RELATED];
-        $this->assertContains($expectedItems, $actual);
+        $this->assertContainsEquals($expectedItems, $actual);
     }
 
     public function testGetItemAttributes()