Skip to content

Commit 1a3ddb4

Browse files
authored
Merge pull request #8790 from magento-gl/Hammer-2.4.7-Beta3-Delivery-22feb
Hammer 2.4.7 beta3 delivery 22feb
2 parents 10fc5bf + 1678351 commit 1a3ddb4

File tree

3 files changed

+12
-1
lines changed

3 files changed

+12
-1
lines changed

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,12 +138,16 @@ function (array $args) {
138138
*/
139139
public function getOutputFormatDataProvider(): array
140140
{
141+
$ar_DZ = "\u{062C}.\u{0645}.\u{200F}\u{00A0}%s";
142+
if (version_compare(PHP_VERSION, '8.3', '>=')) {
143+
$ar_DZ = "%s\u{00A0}\u{062C}.\u{0645}.\u{200F}";
144+
}
141145
return [
142146
'en_US:USD' => ['en_US', 'USD', '$%s'],
143147
'en_US:PLN' => ['en_US', 'PLN', "PLN\u{00A0}%s"],
144148
'en_US:PKR' => ['en_US', 'PKR', "PKR\u{00A0}%s"],
145149
'af_ZA:VND' => ['af_ZA', 'VND', "\u{20AB}%s"],
146-
'ar_DZ:EGP' => ['ar_DZ', 'EGP', "\u{062C}.\u{0645}.\u{200F}\u{00A0}%s"],
150+
'ar_DZ:EGP' => ['ar_DZ', 'EGP', $ar_DZ],
147151
'ar_SA:USD' => ['ar_SA', 'USD', "%s\u{00A0}US$"],
148152
'ar_SA:LBP' => ['ar_SA', 'LBP', "%s\u{00A0}\u{0644}.\u{0644}.\u{200F}"],
149153
'fa_IR:USD' => ['fa_IR', 'USD', "\u{200E}$%s"],

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,10 @@ class GraphQlCustomerMutationsTest extends \PHPUnit\Framework\TestCase
3232
*/
3333
protected function setUp(): void
3434
{
35+
if (!class_exists(GraphQlStateDiff::class)) {
36+
$this->markTestSkipped('GraphQlStateDiff class is not available on this version of Magento.');
37+
}
38+
3539
$this->graphQlStateDiff = new GraphQlStateDiff();
3640
parent::setUp();
3741
}

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,9 @@ public function testUserExpirationSave(string $locale): void
5151
\IntlDateFormatter::MEDIUM,
5252
\IntlDateFormatter::MEDIUM
5353
);
54+
if (version_compare(PHP_VERSION, '8.3', '>=') && $locale === 'uk_UA') {
55+
$expireDate = str_replace(' р.', ' р.', $expireDate);
56+
}
5457
$userExpirationFactory = Bootstrap::getObjectManager()->get(UserExpirationFactory::class);
5558
$userExpiration = $userExpirationFactory->create();
5659
$userExpiration->setExpiresAt($expireDate);

0 commit comments

Comments
 (0)