Merge branch 'ACP2E-3790' of https://github.com/adobe-commerce-tier-4/magento2ce into PR-04-03-2025

Author: chittima

app/code/Magento/Directory/etc/config.xml

@@ -1,15 +1,15 @@
 <?xml version="1.0"?>
 <!--
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2011 Adobe
+ * All Rights Reserved.
  */
 -->
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Store:etc/config.xsd">
     <default>
         <system>
             <currency>
-                <installed>AZN,AZM,AFN,ALL,DZD,AOA,ARS,AMD,AWG,AUD,BSD,BHD,BDT,BBD,BYN,BZD,BMD,BTN,BOB,BAM,BWP,BRL,GBP,BND,BGN,BUK,BIF,KHR,CAD,CVE,CZK,KYD,CLP,CNY,COP,KMF,CDF,CRC,HRK,CUP,DKK,DJF,DOP,XCD,EGP,SVC,GQE,ERN,EEK,ETB,EUR,FKP,FJD,GMD,GEK,GEL,GHS,GIP,GTQ,GNF,GYD,HTG,HNL,HKD,HUF,ISK,INR,IDR,IRR,IQD,ILS,JMD,JPY,JOD,KZT,KES,KWD,KGS,LAK,LVL,LBP,LSL,LRD,LYD,LTL,MOP,MKD,MGA,MWK,MYR,MVR,LSM,MRO,MUR,MXN,MDL,MNT,MAD,MZN,MMK,NAD,NPR,ANG,TRL,TRY,NZD,NIC,NIO,NGN,KPW,NOK,OMR,PKR,PAB,PGK,PYG,PEN,PHP,PLN,QAR,RHD,RON,ROL,RUB,RWF,SHP,STD,SAR,RSD,SCR,SLL,SGD,SKK,SBD,SOS,ZAR,KRW,LKR,SDG,SRD,SZL,SEK,CHF,SYP,TWD,TJS,TZS,THB,TOP,TTD,TND,TMM,USD,UGX,UAH,AED,UYU,UZS,VUV,VEB,VEF,VND,CHE,CHW,XOF,XPF,WST,YER,ZMK,ZWD</installed>
+                <installed>AZN,AZM,AFN,ALL,DZD,AOA,ARS,AMD,AWG,AUD,BSD,BHD,BDT,BBD,BYN,BZD,BMD,BTN,BOB,BAM,BWP,BRL,GBP,BND,BGN,BUK,BIF,KHR,CAD,CVE,CZK,KYD,CLP,CNY,COP,KMF,CDF,CRC,HRK,CUP,DKK,DJF,DOP,XCD,EGP,SVC,GQE,ERN,EEK,ETB,EUR,FKP,FJD,GMD,GEK,GEL,GHS,GIP,GTQ,GNF,GYD,HTG,HNL,HKD,HUF,ISK,INR,IDR,IRR,IQD,ILS,JMD,JPY,JOD,KZT,KES,KWD,KGS,LAK,LVL,LBP,LSL,LRD,LYD,LTL,MOP,MKD,MGA,MWK,MYR,MVR,LSM,MRO,MUR,MXN,MDL,MNT,MAD,MZN,MMK,NAD,NPR,ANG,XCG,TRL,TRY,NZD,NIC,NIO,NGN,KPW,NOK,OMR,PKR,PAB,PGK,PYG,PEN,PHP,PLN,QAR,RHD,RON,ROL,RUB,RWF,SHP,STD,SAR,RSD,SCR,SLL,SGD,SKK,SBD,SOS,ZAR,KRW,LKR,SDG,SRD,SZL,SEK,CHF,SYP,TWD,TJS,TZS,THB,TOP,TTD,TND,TMM,USD,UGX,UAH,AED,UYU,UZS,VUV,VEB,VEF,VND,CHE,CHW,XOF,XPF,WST,YER,ZMK,ZWD</installed>
             </currency>
         </system>
         <currency>

dev/tests/integration/testsuite/Magento/Framework/Locale/ConfigTest.php

@@ -8,12 +8,15 @@
 namespace Magento\Framework\Locale;
 
 use Magento\Config\Model\Config\Source\Locale\Currency;
+use Magento\Framework\App\Area;
 use Magento\TestFramework\Fixture\AppArea;
-use Magento\TestFramework\Fixture\AppIsolation;
-use Magento\TestFramework\Fixture\DbIsolation;
 use Magento\TestFramework\Helper\Bootstrap;
+use PHPUnit\Framework\Attributes\RequiresPhpExtension;
 use PHPUnit\Framework\TestCase;
 
+#[
+    AppArea(Area::AREA_ADMINHTML),
+]
 class ConfigTest extends TestCase
 {
     /**
@@ -31,11 +34,6 @@ protected function setUp(): void
         $this->currency = Bootstrap::getObjectManager()->get(Currency::class);
     }
 
-    #[
-        AppArea('adminhtml'),
-        DbIsolation(true),
-        AppIsolation(true),
-    ]
     public function testNicaraguanCurrenciesExistsBoth()
     {
         $options = $this->currency->toOptionArray();
@@ -46,4 +44,14 @@ public function testNicaraguanCurrenciesExistsBoth()
         $this->assertContains('NIO', $values);
         $this->assertContains('NIC', $values);
     }
+
+    #[
+        RequiresPhpExtension('intl', '>= 76'),
+    ]
+    public function testCaribbeanGuilderExists()
+    {
+        $options = $this->currency->toOptionArray();
+        $values = array_column($options, 'value');
+        $this->assertContains('XCG', $values);
+    }
 }

lib/internal/Magento/Framework/Locale/Config.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2011 Adobe
+ * All Rights Reserved.
  */
 namespace Magento\Framework\Locale;
 
@@ -219,6 +219,7 @@ class Config implements \Magento\Framework\Locale\ConfigInterface
         'NAD', /*Namibia Dollar*/
         'NPR', /*Nepalese Rupee*/
         'ANG', /*Netherlands Antillan Guilder*/
+        'XCG', /*Caribbean guilder*/
         'YTL', /*New Turkish Lira*/
         'NZD', /*New Zealand Dollar*/
         'NIC', /*Nicaraguan Cordoba (1988–1991)*/