Merge branch '11.5' into 12.4

* 11.5:
  Update ChangeLog
  Update ChangeLog

Author: sebastianbergmann

ChangeLog-12.4.md

@@ -4,6 +4,10 @@ All notable changes of the PHPUnit 12.4 release series are documented in this fi
 
 ## [12.4.5] - 2025-MM-DD
 
+### Changed
+
+* Updated list of deprecated PHP configuration settings for PHP 8.4, PHP 8.5, and PHP 8.6
+
 ### Fixed
 
 * [#6426](https://github.com/sebastianbergmann/phpunit/pull/6426): Fix migration of configuration without schema location

src/Util/GlobalState.php

@@ -146,6 +146,18 @@
             'mbstring.internal_encoding'   => true,
             'oci8.old_oci_close_semantics' => true,
         ],
+
+        '8.6' => [
+            'auto_detect_line_endings'     => true,
+            'filter.default'               => true,
+            'iconv.input_encoding'         => true,
+            'iconv.output_encoding'        => true,
+            'iconv.internal_encoding'      => true,
+            'mbstring.http_input'          => true,
+            'mbstring.http_output'         => true,
+            'mbstring.internal_encoding'   => true,
+            'oci8.old_oci_close_semantics' => true,
+        ],
     ];
 
     /**