Skip to content

Commit 9153ae9

Browse files
Merge branch '10.5' into 11.5
* 10.5: INI settings that are deprecated in PHP 8.3 are also deprecated in PHP 8.4 and PHP 8.5
2 parents 1c6cb5d + 084afe3 commit 9153ae9

File tree

1 file changed

+24
-0
lines changed

1 file changed

+24
-0
lines changed

src/Util/GlobalState.php

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,30 @@
123123
'mbstring.internal_encoding' => true,
124124
'oci8.old_oci_close_semantics' => true,
125125
],
126+
127+
'8.4' => [
128+
'auto_detect_line_endings' => true,
129+
'filter.default' => true,
130+
'iconv.input_encoding' => true,
131+
'iconv.output_encoding' => true,
132+
'iconv.internal_encoding' => true,
133+
'mbstring.http_input' => true,
134+
'mbstring.http_output' => true,
135+
'mbstring.internal_encoding' => true,
136+
'oci8.old_oci_close_semantics' => true,
137+
],
138+
139+
'8.5' => [
140+
'auto_detect_line_endings' => true,
141+
'filter.default' => true,
142+
'iconv.input_encoding' => true,
143+
'iconv.output_encoding' => true,
144+
'iconv.internal_encoding' => true,
145+
'mbstring.http_input' => true,
146+
'mbstring.http_output' => true,
147+
'mbstring.internal_encoding' => true,
148+
'oci8.old_oci_close_semantics' => true,
149+
],
126150
];
127151

128152
/**

0 commit comments

Comments
 (0)