Make sure mbstring.internal_encoding deprecation is always thrown

It was not thrown if the setting was specified via -d at least.

diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c
index 4f698a7a473645a5725b5053d3a19dc1c78f21d6..19b7a28703d39d7033392ee91ad22d208adcc9d5 100644 (file)
--- a/ext/mbstring/mbstring.c
+++ b/ext/mbstring/mbstring.c
@@ -899,7 +899,7 @@ static int _php_mb_ini_mbstring_http_input_set(const char *new_value, size_t new
 /* {{{ static PHP_INI_MH(OnUpdate_mbstring_http_input) */
 static PHP_INI_MH(OnUpdate_mbstring_http_input)
 {
-       if (stage & (PHP_INI_STAGE_ACTIVATE | PHP_INI_STAGE_RUNTIME)) {
+       if (new_value) {
                php_error_docref("ref.mbstring", E_DEPRECATED, "Use of mbstring.http_input is deprecated");
        }
 
@@ -929,7 +929,7 @@ static int _php_mb_ini_mbstring_http_output_set(const char *new_value) {
 /* {{{ static PHP_INI_MH(OnUpdate_mbstring_http_output) */
 static PHP_INI_MH(OnUpdate_mbstring_http_output)
 {
-       if (stage & (PHP_INI_STAGE_ACTIVATE | PHP_INI_STAGE_RUNTIME)) {
+       if (new_value) {
                php_error_docref("ref.mbstring", E_DEPRECATED, "Use of mbstring.http_output is deprecated");
        }
 
@@ -973,7 +973,7 @@ static int _php_mb_ini_mbstring_internal_encoding_set(const char *new_value, siz
 /* {{{ static PHP_INI_MH(OnUpdate_mbstring_internal_encoding) */
 static PHP_INI_MH(OnUpdate_mbstring_internal_encoding)
 {
-       if (stage & (PHP_INI_STAGE_ACTIVATE | PHP_INI_STAGE_RUNTIME)) {
+       if (new_value) {
                php_error_docref("ref.mbstring", E_DEPRECATED, "Use of mbstring.internal_encoding is deprecated");
        }
 

diff --git a/ext/mbstring/tests/ini_language.phpt b/ext/mbstring/tests/ini_language.phpt
index 1dc94141fa07e6514853978551d0096a900cb7fd..a41d1b96725b64b248fdccaa0a9cef6c75d9a30b 100644 (file)
--- a/ext/mbstring/tests/ini_language.phpt
+++ b/ext/mbstring/tests/ini_language.phpt
@@ -3,11 +3,11 @@ mbstring.language bug
 --SKIPIF--
 <?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
 --INI--
-mbstring.internal_encoding=Shift_JIS
+internal_encoding=Shift_JIS
 mbstring.language=Japanese
 --FILE--
 <?php
-var_dump(ini_get('mbstring.internal_encoding'));
+var_dump(ini_get('internal_encoding'));
 var_dump(mb_internal_encoding());
 ?>
 --EXPECT--

diff --git a/ext/mbstring/tests/mb_get_info.phpt b/ext/mbstring/tests/mb_get_info.phpt
index 4b08b9943ff5bfce1c3e620c03a0ccba51ef0898..f1fbfa08fec3f446ca6fa24253f723fa412e79d1 100644 (file)
--- a/ext/mbstring/tests/mb_get_info.phpt
+++ b/ext/mbstring/tests/mb_get_info.phpt
@@ -23,6 +23,15 @@ foreach (array_keys($result) as $key) {
 }
 ?>
 --EXPECT--
+PHP Deprecated:  PHP Startup: Use of mbstring.http_input is deprecated in Unknown on line 0
+PHP Deprecated:  PHP Startup: Use of mbstring.http_output is deprecated in Unknown on line 0
+PHP Deprecated:  PHP Startup: Use of mbstring.internal_encoding is deprecated in Unknown on line 0
+
+Deprecated: PHP Startup: Use of mbstring.http_input is deprecated in Unknown on line 0
+
+Deprecated: PHP Startup: Use of mbstring.http_output is deprecated in Unknown on line 0
+
+Deprecated: PHP Startup: Use of mbstring.internal_encoding is deprecated in Unknown on line 0
 array(13) {
   ["internal_encoding"]=>
   string(5) "UTF-8"

diff --git a/ext/mbstring/tests/mb_internal_encoding_ini_basic2.phpt b/ext/mbstring/tests/mb_internal_encoding_ini_basic2.phpt
index af9322c8af57efdd8b9913b8e2a733ac6ddf06d6..39451dff341c1415124eb71a92e2ecb796fe1b87 100644 (file)
--- a/ext/mbstring/tests/mb_internal_encoding_ini_basic2.phpt
+++ b/ext/mbstring/tests/mb_internal_encoding_ini_basic2.phpt
@@ -20,6 +20,9 @@ echo ini_get('mbstring.internal_encoding')."\n";
 
 ?>
 --EXPECT--
+PHP Deprecated:  PHP Startup: Use of mbstring.internal_encoding is deprecated in Unknown on line 0
+
+Deprecated: PHP Startup: Use of mbstring.internal_encoding is deprecated in Unknown on line 0
 *** Testing INI mbstring.internal_encoding : basic functionality ***
 ISO-8859-7
 ISO-8859-7

diff --git a/ext/mbstring/tests/mb_output_handler_runtime_ini_alteration-01.phpt b/ext/mbstring/tests/mb_output_handler_runtime_ini_alteration-01.phpt
index b7d71f9d23dbee04dbfdf4fc262878f3f62bbd83..922dc14af219cecd93aee11a2afc6b182eb2db45 100644 (file)
--- a/ext/mbstring/tests/mb_output_handler_runtime_ini_alteration-01.phpt
+++ b/ext/mbstring/tests/mb_output_handler_runtime_ini_alteration-01.phpt
@@ -3,7 +3,7 @@ mb_output_handler() and mbstring.http_output_conv_mimetypes alteration in runtim
 --SKIPIF--
 <?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
 --INI--
-mbstring.internal_encoding=UTF-8
+internal_encoding=UTF-8
 mbstring.http_output_conv_mimetypes=plain
 --FILE--
 <?php

diff --git a/ext/mbstring/tests/mb_output_handler_runtime_ini_alteration-02.phpt b/ext/mbstring/tests/mb_output_handler_runtime_ini_alteration-02.phpt
index d8c21f406fb01ef3ca9908458f1ef9395fc37ebf..2f80819a1a660003f9ae5d5579ea300ac6eaec17 100644 (file)
--- a/ext/mbstring/tests/mb_output_handler_runtime_ini_alteration-02.phpt
+++ b/ext/mbstring/tests/mb_output_handler_runtime_ini_alteration-02.phpt
@@ -3,7 +3,7 @@ mb_output_handler() and mbstring.http_output_conv_mimetypes alteration in runtim
 --SKIPIF--
 <?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
 --INI--
-mbstring.internal_encoding=UTF-8
+internal_encoding=UTF-8
 mbstring.http_output_conv_mimetypes=html
 --FILE--
 <?php

diff --git a/ext/mbstring/tests/php_gr_jp_16242.phpt b/ext/mbstring/tests/php_gr_jp_16242.phpt
index f693cf8dd1a4c329eb5867fe4c74bfcacf639c18..32b92a820427da65cfaf5c17e2cd91725a599f4a 100644 (file)
--- a/ext/mbstring/tests/php_gr_jp_16242.phpt
+++ b/ext/mbstring/tests/php_gr_jp_16242.phpt
@@ -6,12 +6,12 @@ extension_loaded('mbstring') or die('skip mbstring not available');
 ?>
 --INI--
 mbstring.language=Japanese
-mbstring.internal_encoding=UTF-8
+internal_encoding=UTF-8
 --FILE--
 <?php
 
 var_dump(ini_get('mbstring.language'));
-var_dump(ini_get('mbstring.internal_encoding'));
+var_dump(ini_get('internal_encoding'));
 var_dump(mb_internal_encoding());
 
 ?>