Merge pull request #5649 from magento-trigger/MC-33909

[Php 7.4] integration tests fix

Author: fascinosum

app/code/Magento/Sales/Controller/Adminhtml/Order/Creditmemo/Save.php

@@ -54,6 +54,7 @@ public function __construct(
 
     /**
      * Save creditmemo
+     *
      * We can save only new creditmemo. Existing creditmemos are not editable
      *
      * @return \Magento\Backend\Model\View\Result\Redirect|\Magento\Backend\Model\View\Result\Forward
@@ -104,7 +105,8 @@ public function execute()
                     \Magento\Sales\Api\CreditmemoManagementInterface::class
                 );
                 $creditmemo->getOrder()->setCustomerNoteNotify(!empty($data['send_email']));
-                $creditmemoManagement->refund($creditmemo, (bool)$data['do_offline']);
+                $doOffline = isset($data['do_offline']) ? (bool)$data['do_offline'] : false;
+                $creditmemoManagement->refund($creditmemo, $doOffline);
 
                 if (!empty($data['send_email'])) {
                     $this->creditmemoSender->send($creditmemo);

dev/tests/integration/testsuite/Magento/Catalog/Model/CategoryTreeTest.php

@@ -120,8 +120,8 @@ public function testGetParentIds()
         $this->assertEmpty($this->_model->getParentIds());
         $this->_model->unsetData();
         $this->_model->load(4);
-        $this->assertTrue(in_array(3, $this->_model->getParentIds()));
-        $this->assertFalse(in_array(4, $this->_model->getParentIds()));
+        $this->assertContainsEquals(3, $this->_model->getParentIds());
+        $this->assertNotContainsEquals(4, $this->_model->getParentIds());
     }
 
     public function testGetChildren()
@@ -173,9 +173,9 @@ public function testGetLevel()
     public function testGetAnchorsAbove()
     {
         $this->_model->load(4);
-        $this->assertTrue(in_array(3, $this->_model->getAnchorsAbove()));
+        $this->assertContainsEquals(3, $this->_model->getAnchorsAbove());
         $this->_model->load(5);
-        $this->assertTrue(in_array(4, $this->_model->getAnchorsAbove()));
+        $this->assertContainsEquals(4, $this->_model->getAnchorsAbove());
     }
 
     public function testGetParentCategories()

dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest.php

@@ -366,7 +366,7 @@ public function testSaveCustomOptions(string $importFile, string $sku, int $expe
         $actualOptions = $actualData['options'];
         sort($expectedOptions);
         sort($actualOptions);
-        $this->assertEquals($expectedOptions, $actualOptions);
+        $this->assertSame($expectedOptions, $actualOptions);
 
         // assert of options data
         $this->assertCount(count($expectedData['data']), $actualData['data']);

dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/_files/product_with_custom_options.csv

@@ -1,2 +1,2 @@
 sku,website_code,store_view_code,attribute_set_code,product_type,name,description,short_description,weight,product_online,visibility,product_websites,categories,price,special_price,special_price_from_date,special_price_to_date,tax_class_name,url_key,meta_title,meta_keywords,meta_description,base_image,base_image_label,small_image,small_image_label,thumbnail_image,thumbnail_image_label,additional_images,additional_image_labels,configurable_variation_labels,configurable_variations,bundle_price_type,bundle_sku_type,bundle_weight_type,bundle_values,downloadble_samples,downloadble_links,associated_skus,related_skus,crosssell_skus,upsell_skus,custom_options,additional_attributes,manage_stock,is_in_stock,qty,out_of_stock_qty,is_qty_decimal,allow_backorders,min_cart_qty,max_cart_qty,notify_on_stock_below,qty_increments,enable_qty_increments,is_decimal_divided,new_from_date,new_to_date,gift_message_available,created_at,updated_at,custom_design,custom_design_from,custom_design_to,custom_layout_update,page_layout,product_options_container,msrp_price,msrp_display_actual_price_type,map_enabled
-simple,base,,Default,simple,New Product,,,9,1,"Catalog, Search",base,,10,,,,Taxable Goods,new-product,,,,,,,,,,,,,,,,,,,,,,,,"name=Test Field Title,type=field,required=1,sku=1-text,price=0.000,price_type=fixed,max_characters=10|name=Test Date and Time Title,type=date_time,required=1,price=2.0000,sku=2-date|name=Test Select,type=drop_down,required=1,price=3.0000,option_title=Option 1,sku=3-1-select|name=Test Select,type=drop_down,required=1,price=3.0000,option_title=Option 2,sku=3-2-select|name=Test Radio,type=radio,required=1,price=3.0000,option_title=Option 1,sku=4-1-radio|name=Test Radio,type=radio,required=1,price=3.0000,option_title=Option 2,sku=4-2-radio",,1,1,999,0,0,0,1,10000,1,1,0,0,,,,,,,,,,,Block after Info Column,,,
+simple,base,,Default,simple,New Product,,,9,1,"Catalog, Search",base,,10,,,,Taxable Goods,new-product,,,,,,,,,,,,,,,,,,,,,,,,"name=Test Field Title,type=field,required=1,sku=1-text,price=0.000000,price_type=fixed,max_characters=10|name=Test Date and Time Title,type=date_time,required=1,price=2.000000,sku=2-date|name=Test Select,type=drop_down,required=1,price=3.000000,option_title=Option 1,sku=3-1-select|name=Test Select,type=drop_down,required=1,price=3.000000,option_title=Option 2,sku=3-2-select|name=Test Radio,type=radio,required=1,price=3.000000,option_title=Option 1,sku=4-1-radio|name=Test Radio,type=radio,required=1,price=3.000000,option_title=Option 2,sku=4-2-radio",,1,1,999,0,0,0,1,10000,1,1,0,0,,,,,,,,,,,Block after Info Column,,,

dev/tests/integration/testsuite/Magento/CatalogSearch/Model/Indexer/Fulltext/Action/FullTest.php

@@ -51,8 +51,8 @@ public function testGetIndexData()
         $productsIds = array_keys($result);
         foreach ($productsIds as $productId) {
             $product = $productRepository->getById($productId);
-            $this->assertContains($product->getVisibility(), $allowedVisibility);
-            $this->assertContains($product->getStatus(), $allowedStatuses);
+            $this->assertContainsEquals($product->getVisibility(), $allowedVisibility);
+            $this->assertContainsEquals($product->getStatus(), $allowedStatuses);
         }
 
         $expectedData = $this->getExpectedIndexData();

dev/tests/integration/testsuite/Magento/CatalogUrlRewrite/Observer/ProductProcessUrlRewriteSavingObserverTest.php

@@ -85,7 +85,7 @@ public function testUrlKeyHasChangedInGlobalContext()
         ];
         $actual = $this->getActualResults($productFilter);
         foreach ($expected as $row) {
-            $this->assertTrue(in_array($row, $actual));
+            $this->assertContainsEquals($row, $actual);
         }
 
         $product->setData('save_rewrites_history', true);
@@ -126,7 +126,7 @@ public function testUrlKeyHasChangedInGlobalContext()
 
         $actual = $this->getActualResults($productFilter);
         foreach ($expected as $row) {
-            $this->assertTrue(in_array($row, $actual));
+            $this->assertContainsEquals($row, $actual);
         }
     }
 
@@ -182,7 +182,7 @@ public function testUrlKeyHasChangedInStoreviewContextWithPermanentRedirection()
 
         $actual = $this->getActualResults($productFilter);
         foreach ($expected as $row) {
-            $this->assertTrue(in_array($row, $actual));
+            $this->assertContainsEquals($row, $actual);
         }
     }
 
@@ -231,7 +231,7 @@ public function testUrlKeyHasChangedInStoreviewContextWithoutPermanentRedirectio
 
         $actual = $this->getActualResults($productFilter);
         foreach ($expected as $row) {
-            $this->assertTrue(in_array($row, $actual));
+            $this->assertContainsEquals($row, $actual);
         }
     }
 }

dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/Index/SaveTest.php

@@ -159,11 +159,7 @@ public function testCreateCustomerErrors(array $postData, array $expectedData, a
         $customerFormData = $this->session->getCustomerFormData();
         $this->assertNotEmpty($customerFormData);
         unset($customerFormData['form_key']);
-        if (!empty($expectedData) && !empty($customerFormData)) {
-            $expectedData = array_shift($expectedData);
-            $customerFormData = array_shift($customerFormData);
-        }
-        $this->assertEmpty(array_diff_assoc($expectedData, $customerFormData));
+        $this->assertEquals($expectedData, $customerFormData);
         $this->assertRedirect($this->stringContains($this->baseControllerUrl . 'new/key/'));
     }
 
@@ -387,12 +383,9 @@ public function testCreateSameEmailFormatDateError(): void
         $customerFormData = $this->session->getCustomerFormData();
         $this->assertNotEmpty($customerFormData);
         unset($customerFormData['form_key']);
-        if (!empty($customerFormData)) {
-            $customerFormData = array_shift($customerFormData);
-            $postFormatted = array_shift($postFormatted);
-        }
-        $this->assertEmpty(
-            array_diff_assoc($postFormatted, $customerFormData),
+        $this->assertEquals(
+            $postFormatted,
+            $customerFormData,
             'Customer form data should be formatted'
         );
         $this->assertRedirect($this->stringContains($this->baseControllerUrl . 'new/key/'));

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

@@ -108,20 +108,6 @@ protected function setUp(): void
         );
     }
 
-    /**
-     * Test constructor
-     *
-     * @magentoDataFixture Magento/Customer/_files/import_export/customer_with_addresses.php
-     */
-    public function testConstruct()
-    {
-        $this->assertObjectHasAttribute('_entityTable', $this->_entityAdapter, 'Entity table must not be empty');
-        $this->assertObjectHasAttribute('errorMessageTemplates', $this->_entityAdapter, 'Templates must not be empty');
-        $this->assertObjectHasAttribute('_attributes', $this->_entityAdapter, 'Attributes must not be empty');
-        $this->assertObjectHasAttribute('_countryRegions', $this->_entityAdapter, 'Country regions must not be empty');
-        $this->assertObjectHasAttribute('_regions', $this->_entityAdapter, 'Regions must not be empty');
-    }
-
     /**
      * Test _saveAddressEntity
      *

dev/tests/integration/testsuite/Magento/Downloadable/Block/Account/LinkTest.php

@@ -47,7 +47,7 @@ public function testMyDownloadableProductLink(): void
         $block = $this->page->getLayout()->getBlock('customer-account-navigation-downloadable-products-link');
         $this->assertNotFalse($block);
         $html = $block->toHtml();
-        $this->assertContains('downloadable/customer/products', $html);
+        $this->assertStringContainsString('downloadable/customer/products', $html);
         $this->assertEquals('My Downloadable Products', strip_tags($html));
     }
 

dev/tests/integration/testsuite/Magento/Downloadable/Block/Customer/Products/ListProductsTest.php

@@ -82,7 +82,10 @@ protected function tearDown(): void
     public function testNoItems(): void
     {
         $html = $this->createBlock()->toHtml();
-        $this->assertContains((string)__('You have not purchased any downloadable products yet.'), strip_tags($html));
+        $this->assertStringContainsString(
+            (string)__('You have not purchased any downloadable products yet.'),
+            strip_tags($html)
+        );
     }
 
     /**