Merge branch '9.6' into 10.5

* 9.6:
  INI settings that are deprecated in PHP 8.3 are also deprecated in PHP 8.4 and PHP 8.5

Author: sebastianbergmann

src/Util/GlobalState.php

@@ -122,6 +122,30 @@ final class GlobalState
             'mbstring.internal_encoding'   => true,
             'oci8.old_oci_close_semantics' => true,
         ],
+
+        '8.4' => [
+            '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,
+        ],
+
+        '8.5' => [
+            '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,
+        ],
     ];
 
     /**