From 6f761a6b7f4231b03a3bda1f7d6ec5e737a434dd Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Sun, 22 Feb 2026 12:55:55 +0100
Subject: [PATCH] Move intl php.ini settings to GHA to fix phpunit warnings

---
 .github/workflows/integration-tests.yml | 2 +-
 .github/workflows/intl-data-tests.yml   | 2 +-
 .github/workflows/psalm.yml             | 2 +-
 .github/workflows/unit-tests.yml        | 2 +-
 .github/workflows/windows.yml           | 2 ++
 phpunit.xml.dist                        | 2 --
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
index fc125de8b83..ba09b74c574 100644
--- a/.github/workflows/integration-tests.yml
+++ b/.github/workflows/integration-tests.yml
@@ -208,7 +208,7 @@ jobs:
         with:
           coverage: "none"
           extensions: "json,couchbase-3.2.2,memcached,mongodb-1.12.0,redis,rdkafka,xsl,ldap,relay"
-          ini-values: date.timezone=UTC,memory_limit=-1,default_socket_timeout=10,session.gc_probability=0,apc.enable_cli=1,zend.assertions=1
+          ini-values: date.timezone=UTC,memory_limit=-1,default_socket_timeout=10,session.gc_probability=0,apc.enable_cli=1,zend.assertions=1,intl.default_locale=en,intl.error_level=0
           php-version: "${{ matrix.php }}"
           tools: pecl
 
diff --git a/.github/workflows/intl-data-tests.yml b/.github/workflows/intl-data-tests.yml
index f51bb245896..53d8859d30f 100644
--- a/.github/workflows/intl-data-tests.yml
+++ b/.github/workflows/intl-data-tests.yml
@@ -56,7 +56,7 @@ jobs:
         with:
           coverage: "none"
           extensions: "zip,intl-${{env.SYMFONY_ICU_VERSION}}"
-          ini-values: "memory_limit=-1"
+          ini-values: memory_limit=-1,intl.default_locale=en,intl.error_level=0
           php-version: "8.1"
 
       - name: Install dependencies
diff --git a/.github/workflows/psalm.yml b/.github/workflows/psalm.yml
index 561e10dbf11..b42a2e9d75e 100644
--- a/.github/workflows/psalm.yml
+++ b/.github/workflows/psalm.yml
@@ -26,7 +26,7 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ env.php-version }}
-          ini-values: "memory_limit=-1"
+          ini-values: memory_limit=-1,intl.default_locale=en,intl.error_level=0
           coverage: none
 
       - name: Checkout target branch
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
index fe0a5d20349..c7ec1ee5a80 100644
--- a/.github/workflows/unit-tests.yml
+++ b/.github/workflows/unit-tests.yml
@@ -49,7 +49,7 @@ jobs:
         uses: shivammathur/setup-php@v2
         with:
           coverage: "none"
-          ini-values: date.timezone=UTC,memory_limit=-1,default_socket_timeout=10,session.gc_probability=0,apc.enable_cli=1,zend.assertions=1
+          ini-values: date.timezone=UTC,memory_limit=-1,default_socket_timeout=10,session.gc_probability=0,apc.enable_cli=1,zend.assertions=1,intl.default_locale=en,intl.error_level=0
           php-version: "${{ matrix.php }}"
           extensions: "${{ matrix.extensions || env.extensions }}"
           tools: flex
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 90ebd7a23f0..a98a35fa7a5 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -76,6 +76,8 @@ jobs:
           "extension=php_pdo_sqlite.dll" >> php.ini-max
           "extension=php_curl.dll" >> php.ini-max
           "extension=php_sodium.dll" >> php.ini-max
+          "intl.default_locale=en" >> php.ini-max
+          "intl.error_level=0" >> php.ini-max
           Copy php.ini-max php.ini
           cd ${{ github.workspace }}
           iwr -outf composer.phar https://getcomposer.org/download/latest-stable/composer.phar
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 584ee078b03..793f14edf10 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -10,8 +10,6 @@
 >
     <php>
         <ini name="error_reporting" value="-1" />
-        <ini name="intl.default_locale" value="en" />
-        <ini name="intl.error_level" value="0" />
         <ini name="memory_limit" value="-1" />
         <env name="DUMP_LIGHT_ARRAY" value="" />
         <env name="DUMP_STRING_LENGTH" value="" />