Merge remote-tracking branch 'origin/MC-20425' into 2.3-develop-pr82

zakdma · zakdma · commit e8f49b45a808 · 2019-10-30T12:33:01.000+02:00
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/attribute_set_based_on_default_without_country_of_manufacture.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/attribute_set_based_on_default_without_country_of_manufacture.php
@@ -41,7 +41,7 @@
         $groupAttributes,
         function ($attribute) use ($attributeCountryOfManufacture) {
             /** @var ProductAttributeInterface $attribute */
-            return $attribute->getAttributeId() != $attributeCountryOfManufacture->getAttributeId();
+            return (int)$attribute->getAttributeId() !== (int)$attributeCountryOfManufacture->getAttributeId();
         }
     );
     if (count($newAttributes) < count($groupAttributes)) {
diff --git a/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_country_of_manufacture.php b/dev/tests/integration/testsuite/Magento/Catalog/_files/product_simple_with_country_of_manufacture.php
@@ -29,7 +29,7 @@
     ->setPrice(10)
     ->setWeight(1)
     ->setCountryOfManufacture('AO')
-    ->setShortDescription("Short description")
+    ->setShortDescription('Short description')
     ->setTaxClassId(0)
     ->setDescription('Description')
     ->setMetaTitle('meta title')

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@`
`41`	`41`	`$groupAttributes,`
`42`	`42`	`function ($attribute) use ($attributeCountryOfManufacture) {`
`43`	`43`	`/** @var ProductAttributeInterface $attribute */`
`44`		`- return $attribute->getAttributeId() != $attributeCountryOfManufacture->getAttributeId();`
	`44`	`+ return (int)$attribute->getAttributeId() !== (int)$attributeCountryOfManufacture->getAttributeId();`
`45`	`45`	`}`
`46`	`46`	`);`
`47`	`47`	`if (count($newAttributes) < count($groupAttributes)) {`