diff --git a/dev/tests/integration/testsuite/Magento/Security/Model/ResourceModel/UserExpirationTest.php b/dev/tests/integration/testsuite/Magento/Security/Model/ResourceModel/UserExpirationTest.php index a65337440922..ec2182f14fbb 100644 --- a/dev/tests/integration/testsuite/Magento/Security/Model/ResourceModel/UserExpirationTest.php +++ b/dev/tests/integration/testsuite/Magento/Security/Model/ResourceModel/UserExpirationTest.php @@ -46,14 +46,15 @@ public function testUserExpirationSave(string $locale): void $timeZone = Bootstrap::getObjectManager()->get(TimezoneInterface::class); $localeResolver->setLocale($locale); $initialExpirationDate = $timeZone->date()->modify('+10 day'); - $expireDate = $timeZone->formatDateTime( - $initialExpirationDate, + + $formatter = new \IntlDateFormatter( + $locale, + \IntlDateFormatter::MEDIUM, \IntlDateFormatter::MEDIUM, - \IntlDateFormatter::MEDIUM + $timeZone->getConfigTimezone() ); - if (version_compare(PHP_VERSION, '8.3', '>=') && $locale === 'uk_UA') { - $expireDate = str_replace(' р.', ' р.', $expireDate); - } + $expireDate = $formatter->format($initialExpirationDate); + $userExpirationFactory = Bootstrap::getObjectManager()->get(UserExpirationFactory::class); $userExpiration = $userExpirationFactory->create(); $userExpiration->setExpiresAt($expireDate);