Merge pull request #8107 from magento-gl/AC-7850

AC-7850: [2.4.6-develop] Build Failures with PHP 8.2

Author: sidolov

composer.lock

@@ -16,6 +16,9 @@
  */
 class CookieManagerTest extends \Magento\TestFramework\TestCase\WebapiAbstract
 {
+    /**
+     * @var string
+     */
     private $cookieTesterUrl = 'testmoduleone/CookieTester';
 
     /** @var CurlClientWithCookies */
@@ -144,7 +147,10 @@ public function testDeleteCookie()
         if (isset($cookie['max-age'])) {
             $this->assertEquals(0, $cookie['max-age']);
         }
-        $this->assertEquals('Thu, 01-Jan-1970 00:00:01 GMT', $cookie['expires']);
+        $this->assertEquals(
+            date('D, j-M-o H:i:s T', strtotime('Thu, 01-Jan-1970 00:00:01 GMT')),
+            date('D, j-M-o H:i:s T', strtotime($cookie['expires']))
+        );
     }
 
     /**

dev/tests/api-functional/testsuite/Magento/Framework/Stdlib/CookieManagerTest.php

@@ -1746,6 +1746,7 @@ public function testFilteringForProductsFromMultipleCategories()
      */
     public function testFilterProductsBySingleCategoryId(string $fieldName, string $queryCategoryId)
     {
+        CacheCleaner::clean(['config']);
         if (is_numeric($queryCategoryId)) {
             $queryCategoryId = (int) $queryCategoryId;
         }

dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductSearchTest.php

@@ -280,13 +280,19 @@ public function testRequestToShip(
             'store',
             null
         );
+        $convmap = [0x80, 0x10FFFF, 0, 0x1FFFFF];
+        $content = mb_encode_numericentity(
+            file_get_contents(__DIR__ . '/../_files/response_shipping_label.xml'),
+            $convmap,
+            'UTF-8'
+        );
         //phpcs:disable Magento2.Functions.DiscouragedFunction
         $this->httpClient->nextResponses(
             [
                 new Response(
                     200,
                     [],
-                    utf8_encode(file_get_contents(__DIR__ . '/../_files/response_shipping_label.xml'))
+                    $content
                 )
             ]
         );

dev/tests/integration/testsuite/Magento/Dhl/Model/CarrierTest.php

@@ -4,10 +4,10 @@
  * See COPYING.txt for license details.
  */
 
-$this->_collection = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+$collection = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
     \Magento\SalesRule\Model\ResourceModel\Rule\Collection::class
 );
-$items = array_values($this->_collection->getItems());
+$items = array_values($collection->getItems());
 
 // type SPECIFIC with code
 $coupon = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\SalesRule\Model\Coupon::class);

dev/tests/integration/testsuite/Magento/SalesRule/_files/coupons.php

@@ -7,10 +7,10 @@
 
 Resolver::getInstance()->requireDataFixture('Magento/SalesRule/_files/rules_advanced.php');
 
-$this->_collection = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+$collection = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
     \Magento\SalesRule\Model\ResourceModel\Rule\Collection::class
 );
-$items = array_values($this->_collection->getItems());
+$items = array_values($collection->getItems());
 
 // type SPECIFIC with code
 $coupon = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\SalesRule\Model\Coupon::class);