Merge remote-tracking branch 'act4/ACP2E-4025' into PR_25_June_odubovyk

Author: o-dubovyk

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

@@ -138,16 +138,15 @@ function (array $args) {
      */
     public static 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}";
-        }
+        // Use dynamic detection for problematic locale/currency combinations!
+        $ar_DZ_EGP = self::getExpectedFormatForLocale('ar_DZ', 'EGP');
+
         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', $ar_DZ],
+            'ar_DZ:EGP' => ['ar_DZ', 'EGP', $ar_DZ_EGP],
             '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"],
@@ -162,6 +161,62 @@ public static function getOutputFormatDataProvider(): array
         ];
     }
 
+    /**
+     * Get expected format for a specific locale/currency combination
+     * This handles cases where intl extension version affects formatting
+     *
+     * @param string $locale
+     * @param string $currency
+     * @return string
+     */
+    private static function getExpectedFormatForLocale(string $locale, string $currency): string
+    {
+        // Define known problematic combinations and their expected formats
+        $problematicFormats = [
+            'ar_DZ:EGP' => [
+                'old' => "\u{062C}.\u{0645}.\u{200F}\u{00A0}%s",
+                'new' => "%s\u{00A0}\u{062C}.\u{0645}.\u{200F}"
+            ]
+        ];
+
+        $key = $locale . ':' . $currency;
+
+        if (isset($problematicFormats[$key])) {
+            // Check if we're using a newer intl version that changes formatting
+            if (self::isNewerIntlVersion()) {
+                return $problematicFormats[$key]['new'];
+            }
+            return $problematicFormats[$key]['old'];
+        }
+
+        // For non-problematic combinations, return a default format
+        // This could be enhanced with more specific formats as needed
+        return "%s";
+    }
+
+    /**
+     * Check if the current intl extension version uses newer formatting rules
+     *
+     * @return bool
+     */
+    private static function isNewerIntlVersion(): bool
+    {
+        // Check intl extension version
+        if (extension_loaded('intl')) {
+            $intlVersion = INTL_ICU_VERSION ?? '0.0.0';
+
+            // ICU 72+ (released around 2022) introduced changes to RTL formatting
+            // This is a more reliable indicator than PHP version
+            if (version_compare($intlVersion, '72.0', '>=')) {
+                return true;
+            }
+        }
+
+        // Fallback: Check PHP version as a rough indicator
+        // This is less reliable but provides some backward compatibility
+        return version_compare(PHP_VERSION, '8.3', '>=');
+    }
+
     /**
      * @dataProvider getFormatTxtNumberFormatterDataProvider
      * @param string $locale