iconv: deprecated iconv_set_encoding() and iconv_get_encoding()

Author: jorgsowa

ext/iconv/iconv.c

@@ -25,6 +25,7 @@
 #include "main/php_output.h"
 #include "SAPI.h"
 #include "php_ini.h"
+#include "zend_attributes.h"
 
 #include <stdlib.h>
 #include <errno.h>

ext/iconv/iconv.stub.php

@@ -47,8 +47,10 @@ function iconv_mime_decode_headers(string $headers, int $mode = 0, ?string $enco
 /** @refcount 1 */
 function iconv(string $from_encoding, string $to_encoding, string $string): string|false {}
 
+#[\Deprecated(since: '5.6', message: 'use internal_encoding, input_encoding, and output_encoding INI settings instead')]
 function iconv_set_encoding(string $type, string $encoding): bool {}
 
+#[\Deprecated(since: '5.6', message: 'use internal_encoding, input_encoding, and output_encoding INI settings instead')]
 /**
  * @return array<string, string>|string|false
  * @refcount 1

ext/iconv/iconv_arginfo.h

@@ -0,0 +1,48 @@
+--TEST--
+iconv encoding deprecated
+--EXTENSIONS--
+iconv
+--FILE--
+<?php
+
+iconv_set_encoding("internal_encoding", "UTF-8");
+iconv_set_encoding("output_encoding",   "UTF-8");
+iconv_set_encoding("input_encoding",    "UTF-8");
+
+var_dump( iconv_get_encoding('internal_encoding') );
+var_dump( iconv_get_encoding('output_encoding')   );
+var_dump( iconv_get_encoding('input_encoding')    );
+var_dump( iconv_get_encoding('all')               );
+
+?>
+--EXPECTF--
+Deprecated: Function iconv_set_encoding() is deprecated since 5.6, use internal_encoding, input_encoding, and output_encoding INI settings instead in %s on line %d
+
+Deprecated: iconv_set_encoding(): Use of iconv.internal_encoding is deprecated in %s on line %d
+
+Deprecated: Function iconv_set_encoding() is deprecated since 5.6, use internal_encoding, input_encoding, and output_encoding INI settings instead in %s on line %d
+
+Deprecated: iconv_set_encoding(): Use of iconv.output_encoding is deprecated in %s on line %d
+
+Deprecated: Function iconv_set_encoding() is deprecated since 5.6, use internal_encoding, input_encoding, and output_encoding INI settings instead in %s on line %d
+
+Deprecated: iconv_set_encoding(): Use of iconv.input_encoding is deprecated in %s on line %d
+
+Deprecated: Function iconv_get_encoding() is deprecated since 5.6, use internal_encoding, input_encoding, and output_encoding INI settings instead in %s on line %d
+string(5) "UTF-8"
+
+Deprecated: Function iconv_get_encoding() is deprecated since 5.6, use internal_encoding, input_encoding, and output_encoding INI settings instead in %s on line %d
+string(5) "UTF-8"
+
+Deprecated: Function iconv_get_encoding() is deprecated since 5.6, use internal_encoding, input_encoding, and output_encoding INI settings instead in %s on line %d
+string(5) "UTF-8"
+
+Deprecated: Function iconv_get_encoding() is deprecated since 5.6, use internal_encoding, input_encoding, and output_encoding INI settings instead in %s on line %d
+array(3) {
+  ["input_encoding"]=>
+  string(5) "UTF-8"
+  ["output_encoding"]=>
+  string(5) "UTF-8"
+  ["internal_encoding"]=>
+  string(5) "UTF-8"
+}

ext/iconv/tests/iconv_encoding_deprecated.phpt

@@ -10,11 +10,18 @@ var_dump(iconv_set_encoding("output_encoding", $a));
 var_dump(iconv_set_encoding("internal_encoding", $a));
 ?>
 --EXPECTF--
+
+Deprecated: Function iconv_set_encoding() is deprecated since 5.6, use internal_encoding, input_encoding, and output_encoding INI settings instead in %s on line %d
+
 Warning: iconv_set_encoding(): Encoding parameter exceeds the maximum allowed length of 64 characters in %s on line %d
 bool(false)
 
+Deprecated: Function iconv_set_encoding() is deprecated since 5.6, use internal_encoding, input_encoding, and output_encoding INI settings instead in %s on line %d
+
 Warning: iconv_set_encoding(): Encoding parameter exceeds the maximum allowed length of 64 characters in %s on line %d
 bool(false)
 
+Deprecated: Function iconv_set_encoding() is deprecated since 5.6, use internal_encoding, input_encoding, and output_encoding INI settings instead in %s on line %d
+
 Warning: iconv_set_encoding(): Encoding parameter exceeds the maximum allowed length of 64 characters in %s on line %d
 bool(false)