From fb18767cf0062c2c3f3df9b31bd4c26daab1ac43 Mon Sep 17 00:00:00 2001
From: Christian Flothmann <christian.flothmann@qossmic.com>
Date: Fri, 24 Jan 2025 21:10:08 +0100
Subject: [PATCH] fix intl-extra tests

---
 .../Tests/Fixtures/format_date.test           |  6 ++--
 .../Tests/Fixtures/format_date_ICU72.test     | 28 +++++++++++++++++++
 .../Tests/Fixtures/format_date_php8.test      |  2 +-
 .../Fixtures/format_date_php8_ICU72.test      | 12 ++++++++
 4 files changed, 45 insertions(+), 3 deletions(-)
 create mode 100644 extra/intl-extra/Tests/Fixtures/format_date_ICU72.test
 create mode 100644 extra/intl-extra/Tests/Fixtures/format_date_php8_ICU72.test

diff --git a/extra/intl-extra/Tests/Fixtures/format_date.test b/extra/intl-extra/Tests/Fixtures/format_date.test
index 75844e1e4bb..a48c576e305 100644
--- a/extra/intl-extra/Tests/Fixtures/format_date.test
+++ b/extra/intl-extra/Tests/Fixtures/format_date.test
@@ -1,5 +1,7 @@
 --TEST--
 "format_date" filter
+--CONDITION--
+version_compare(Symfony\Component\Intl\Intl::getIcuVersion(), '72.1', '<')
 --TEMPLATE--
 {{ '2019-08-07 23:39:12'|format_datetime() }}
 {{ '2019-08-07 23:39:12'|format_datetime(locale='fr') }}
@@ -14,7 +16,7 @@
 --DATA--
 return [];
 --EXPECT--
-Aug 7, 2019, 11:39:12 PM
+Aug 7, 2019, 11:39:12 PM
 7 août 2019, 23:39:12
 23:39
 07/08/2019
@@ -23,4 +25,4 @@ mercredi 7 août 2019 à 23:39:12 temps universel coordonné
 
 Aug 7, 2019
 7 août 2019
-11:39:12 PM
+11:39:12 PM
diff --git a/extra/intl-extra/Tests/Fixtures/format_date_ICU72.test b/extra/intl-extra/Tests/Fixtures/format_date_ICU72.test
new file mode 100644
index 00000000000..ea427605df2
--- /dev/null
+++ b/extra/intl-extra/Tests/Fixtures/format_date_ICU72.test
@@ -0,0 +1,28 @@
+--TEST--
+"format_date" filter
+--CONDITION--
+version_compare(Symfony\Component\Intl\Intl::getIcuVersion(), '72.1', '>=')
+--TEMPLATE--
+{{ '2019-08-07 23:39:12'|format_datetime() }}
+{{ '2019-08-07 23:39:12'|format_datetime(locale='fr') }}
+{{ '2019-08-07 23:39:12'|format_datetime('none', 'short', locale='fr') }}
+{{ '2019-08-07 23:39:12'|format_datetime('short', 'none', locale='fr') }}
+{{ '2019-08-07 23:39:12'|format_datetime('full', 'full', locale='fr') }}
+{{ '2019-08-07 23:39:12'|format_datetime(pattern="hh 'oclock' a, zzzz") }}
+
+{{ '2019-08-07 23:39:12'|format_date }}
+{{ '2019-08-07 23:39:12'|format_date(locale='fr') }}
+{{ '2019-08-07 23:39:12'|format_time }}
+--DATA--
+return [];
+--EXPECT--
+Aug 7, 2019, 11:39:12 PM
+7 août 2019, 23:39:12
+23:39
+07/08/2019
+mercredi 7 août 2019 à 23:39:12 temps universel coordonné
+11 oclock PM, Coordinated Universal Time
+
+Aug 7, 2019
+7 août 2019
+11:39:12 PM
diff --git a/extra/intl-extra/Tests/Fixtures/format_date_php8.test b/extra/intl-extra/Tests/Fixtures/format_date_php8.test
index 67e0e6f4dbe..5d694e52ae1 100644
--- a/extra/intl-extra/Tests/Fixtures/format_date_php8.test
+++ b/extra/intl-extra/Tests/Fixtures/format_date_php8.test
@@ -1,7 +1,7 @@
 --TEST--
 "format_date" filter
 --CONDITION--
-PHP_VERSION_ID >= 80000
+PHP_VERSION_ID >= 80000 && version_compare(Symfony\Component\Intl\Intl::getIcuVersion(), '72.1', '<')
 --TEMPLATE--
 {{ 'today 23:39:12'|format_datetime('relative_short', 'none', locale='fr') }}
 {{ 'today 23:39:12'|format_datetime('relative_full', 'full', locale='fr') }}
diff --git a/extra/intl-extra/Tests/Fixtures/format_date_php8_ICU72.test b/extra/intl-extra/Tests/Fixtures/format_date_php8_ICU72.test
new file mode 100644
index 00000000000..3162ae54d93
--- /dev/null
+++ b/extra/intl-extra/Tests/Fixtures/format_date_php8_ICU72.test
@@ -0,0 +1,12 @@
+--TEST--
+"format_date" filter
+--CONDITION--
+PHP_VERSION_ID >= 80000 && version_compare(Symfony\Component\Intl\Intl::getIcuVersion(), '72.1', '>=')
+--TEMPLATE--
+{{ 'today 23:39:12'|format_datetime('relative_short', 'none', locale='fr') }}
+{{ 'today 23:39:12'|format_datetime('relative_full', 'full', locale='fr') }}
+--DATA--
+return [];
+--EXPECT--
+aujourd’hui
+aujourd’hui, 23:39:12 temps universel coordonné