Merge pull request #8790 from magento-gl/Hammer-2.4.7-Beta3-Delivery-22feb

Hammer 2.4.7 beta3 delivery 22feb

Author: sidolov

app/code/Magento/Directory/Test/Unit/Model/CurrencyTest.php

@@ -138,12 +138,16 @@ function (array $args) {
      */
     public function getOutputFormatDataProvider(): array
     {
+        $ar_DZ = "\u{062C}.\u{0645}.\u{200F}\u{00A0}%s";
+        if (version_compare(PHP_VERSION, '8.3', '>=')) {
+            $ar_DZ = "%s\u{00A0}\u{062C}.\u{0645}.\u{200F}";
+        }
         return [
             'en_US:USD' => ['en_US', 'USD', '$%s'],
             'en_US:PLN' => ['en_US', 'PLN', "PLN\u{00A0}%s"],
             'en_US:PKR' => ['en_US', 'PKR', "PKR\u{00A0}%s"],
             'af_ZA:VND' => ['af_ZA', 'VND', "\u{20AB}%s"],
-            'ar_DZ:EGP' => ['ar_DZ', 'EGP', "\u{062C}.\u{0645}.\u{200F}\u{00A0}%s"],
+            'ar_DZ:EGP' => ['ar_DZ', 'EGP', $ar_DZ],
             'ar_SA:USD' => ['ar_SA', 'USD', "%s\u{00A0}US$"],
             'ar_SA:LBP' => ['ar_SA', 'LBP', "%s\u{00A0}\u{0644}.\u{0644}.\u{200F}"],
             'fa_IR:USD' => ['fa_IR', 'USD', "\u{200E}$%s"],

dev/tests/integration/testsuite/Magento/GraphQl/App/GraphQlCustomerMutationsTest.php

@@ -32,6 +32,10 @@ class GraphQlCustomerMutationsTest extends \PHPUnit\Framework\TestCase
      */
     protected function setUp(): void
     {
+        if (!class_exists(GraphQlStateDiff::class)) {
+            $this->markTestSkipped('GraphQlStateDiff class is not available on this version of Magento.');
+        }
+
         $this->graphQlStateDiff = new GraphQlStateDiff();
         parent::setUp();
     }

dev/tests/integration/testsuite/Magento/Security/Model/ResourceModel/UserExpirationTest.php

@@ -51,6 +51,9 @@ public function testUserExpirationSave(string $locale): void
             \IntlDateFormatter::MEDIUM,
             \IntlDateFormatter::MEDIUM
         );
+        if (version_compare(PHP_VERSION, '8.3', '>=') && $locale === 'uk_UA') {
+            $expireDate = str_replace(' р.', ' р.', $expireDate);
+        }
         $userExpirationFactory = Bootstrap::getObjectManager()->get(UserExpirationFactory::class);
         $userExpiration = $userExpirationFactory->create();
         $userExpiration->setExpiresAt($expireDate);