Merge remote-tracking branch 'origin/2.4.6-develop' into AC-7681-v3

Author: glo35082

app/code/Magento/Catalog/Test/Unit/Model/CategoryTest.php

@@ -214,7 +214,7 @@ public function testMoveWhenCannotFindParentCategory(): void
     {
         $this->expectException('Magento\Framework\Exception\LocalizedException');
         $this->expectExceptionMessage('Sorry, but we can\'t find the new parent category you selected.');
-        $this->markTestIncomplete('MAGETWO-31165');
+        $this->markTestSkipped('MAGETWO-31165');
         $parentCategory = $this->createPartialMock(
             Category::class,
             ['getId', 'setStoreId', 'load']
@@ -260,7 +260,7 @@ public function testMoveWhenParentCategoryIsSameAsChildCategory(): void
         $this->expectExceptionMessage(
             'We can\'t move the category because the parent category name matches the child category name.'
         );
-        $this->markTestIncomplete('MAGETWO-31165');
+        $this->markTestSkipped('MAGETWO-31165');
         $parentCategory = $this->createPartialMock(
             Category::class,
             ['getId', 'setStoreId', 'load']

app/code/Magento/CatalogGraphQl/Model/Resolver/Products/Query/Search.php

@@ -186,7 +186,8 @@ private function buildSearchCriteria(array $args, ResolveInfo $info): SearchCrit
     {
         $productFields = (array)$info->getFieldSelection(1);
         $includeAggregations = isset($productFields['filters']) || isset($productFields['aggregations']);
-        $processedArgs = $this->argsSelection->process((string) $info->fieldName, $args);
+        $fieldName = $info->fieldName ?? "";
+        $processedArgs = $this->argsSelection->process((string) $fieldName, $args);
         $searchCriteria = $this->searchCriteriaBuilder->build($processedArgs, $includeAggregations);
 
         return $searchCriteria;

app/code/Magento/Fedex/Test/Unit/Model/Source/GenericTest.php

@@ -55,9 +55,8 @@ protected function setUp(): void
      * @return void
      * @dataProvider toOptionArrayDataProvider
      */
-    public function testToOptionArray($code, $methods, $result): void
+    public function testToOptionArray($methods, $result): void
     {
-        $this->model->code = $code;
         $this->shippingFedexMock->expects($this->once())
             ->method('getCode')
             ->willReturn($methods);
@@ -74,7 +73,6 @@ public function toOptionArrayDataProvider(): array
     {
         return [
             [
-                'method',
                 [
                     'FEDEX_GROUND' => __('Ground'),
                     'FIRST_OVERNIGHT' => __('First Overnight')
@@ -85,7 +83,6 @@ public function toOptionArrayDataProvider(): array
                 ]
             ],
             [
-                '',
                 false,
                 []
             ]

app/code/Magento/GraphQl/composer.json

@@ -9,7 +9,7 @@
         "magento/module-webapi": "*",
         "magento/module-new-relic-reporting": "*",
         "magento/module-authorization": "*",
-        "webonyx/graphql-php": "^14.11"
+        "webonyx/graphql-php": "^15.0"
     },
     "suggest": {
         "magento/module-graph-ql-cache": "*"

app/code/Magento/GroupedProduct/Test/Unit/Model/ProductTest.php

@@ -349,7 +349,7 @@ protected function setUp(): void
      */
     public function testGetProductLinks(): void
     {
-        $this->markTestIncomplete('Skipped due to https://jira.corp.x.com/browse/MAGETWO-36926');
+        $this->markTestSkipped('Skipped due to https://jira.corp.x.com/browse/MAGETWO-36926');
         $linkTypes = ['related' => 1, 'upsell' => 4, 'crosssell' => 5, 'associated' => 3];
         $this->linkTypeProviderMock->expects($this->once())->method('getLinkTypes')->willReturn($linkTypes);
 

app/code/Magento/ImportExport/Test/Unit/Helper/ReportTest.php

@@ -153,7 +153,7 @@ protected function setUp(): void
      */
     public function testGetExecutionTime()
     {
-        $this->markTestIncomplete('Invalid mocks used for DateTime object. Investigate later.');
+        $this->markTestSkipped('Invalid mocks used for DateTime object. Investigate later.');
 
         $startDate = '2000-01-01 01:01:01';
         $endDate = '2000-01-01 02:03:04';

app/code/Magento/ImportExport/Test/Unit/Model/Import/Source/ZipTest.php

@@ -42,7 +42,7 @@ protected function setUp(): void
      */
     public function testConstructorFileDestinationMatch($fileName, $expectedfileName): void
     {
-        $this->markTestIncomplete('The implementation of constructor has changed. Rewrite test to cover changes.');
+        $this->markTestSkipped('The implementation of constructor has changed. Rewrite test to cover changes.');
 
         $this->directory->method('getRelativePath')
             ->withConsecutive([$fileName], [$expectedfileName]);

app/code/Magento/Sales/Helper/Admin.php

@@ -166,7 +166,13 @@ public function escapeHtmlWithLinks($data, $allowedTags = null)
 
             $internalErrors = libxml_use_internal_errors(true);
 
-            $data = mb_convert_encoding($data, 'HTML-ENTITIES', 'UTF-8');
+            $convmap = [0x80, 0x10FFFF, 0, 0x1FFFFF];
+            $data = mb_encode_numericentity(
+                $data,
+                $convmap,
+                'UTF-8'
+            );
+
             $domDocument->loadHTML(
                 '<html><body id="' . $wrapperElementId . '">' . $data . '</body></html>'
             );
@@ -192,7 +198,17 @@ public function escapeHtmlWithLinks($data, $allowedTags = null)
                 }
             }
 
-            $result = mb_convert_encoding($domDocument->saveHTML(), 'UTF-8', 'HTML-ENTITIES');
+            $result = mb_decode_numericentity(
+                // phpcs:ignore Magento2.Functions.DiscouragedFunction
+                html_entity_decode(
+                    $domDocument->saveHTML(),
+                    ENT_QUOTES|ENT_SUBSTITUTE,
+                    'UTF-8'
+                ),
+                $convmap,
+                'UTF-8'
+            );
+
             preg_match('/<body id="' . $wrapperElementId . '">(.+)<\/body><\/html>$/si', $result, $matches);
             $data = !empty($matches) ? $matches[1] : '';
         }

composer.json

@@ -40,7 +40,7 @@
         "composer/composer": "^2.0, !=2.2.16",
         "elasticsearch/elasticsearch": "^7.17||^8.5",
         "ezyang/htmlpurifier": "^4.14",
-        "guzzlehttp/guzzle": "^7.4",
+        "guzzlehttp/guzzle": "^7.5",
         "laminas/laminas-captcha": "^2.12",
         "laminas/laminas-code": "^4.5",
         "laminas/laminas-db": "^2.15",
@@ -85,7 +85,7 @@
         "tedivm/jshrink": "^1.4",
         "tubalmartin/cssmin": "^4.1",
         "web-token/jwt-framework": "^3.1",
-        "webonyx/graphql-php": "^14.11",
+        "webonyx/graphql-php": "^15.0",
         "wikimedia/less.php": "^3.2"
     },
     "require-dev": {
@@ -98,7 +98,7 @@
         "magento/magento2-functional-testing-framework": "^4.0",
         "pdepend/pdepend": "^2.10",
         "phpmd/phpmd": "^2.12",
-        "phpstan/phpstan": "^1.7",
+        "phpstan/phpstan": "1.9.2",
         "phpunit/phpunit": "^9.5",
         "sebastian/phpcpd": "^6.0",
         "symfony/finder": "^5.4"