Finalize implementation

kocsismate · kocsismate · commit 401b9b9e092c · 2020-05-06T08:35:36.000+02:00
diff --git a/Zend/zend.c b/Zend/zend.c
@@ -158,7 +158,6 @@ static ZEND_INI_MH(OnUpdateAssertions) /* {{{ */
 
 ZEND_INI_BEGIN()
 	ZEND_INI_ENTRY("error_reporting",				NULL,		ZEND_INI_ALL,		OnUpdateErrorReporting)
-	STD_ZEND_INI_BOOLEAN("debug_locale_sensitive_float_casts",	"0",	ZEND_INI_ALL,		OnUpdateBool, debug_locale_sensitive_float_casts, zend_executor_globals, executor_globals)
 	STD_ZEND_INI_ENTRY("zend.assertions",				"1",    ZEND_INI_ALL,       OnUpdateAssertions,           assertions,   zend_executor_globals,  executor_globals)
 	ZEND_INI_ENTRY3_EX("zend.enable_gc",				"1",	ZEND_INI_ALL,		OnUpdateGCEnabled, NULL, NULL, NULL, zend_gc_enabled_displayer_cb)
  	STD_ZEND_INI_BOOLEAN("zend.multibyte", "0", ZEND_INI_PERDIR, OnUpdateBool, multibyte,      zend_compiler_globals, compiler_globals)
diff --git a/Zend/zend_globals.h b/Zend/zend_globals.h
@@ -237,7 +237,6 @@ struct _zend_executor_globals {
 	HashTable weakrefs;
 
 	zend_bool exception_ignore_args;
-	zend_bool debug_locale_sensitive_float_casts;
 
 	zend_get_gc_buffer get_gc_buffer;
 
diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c
@@ -642,15 +642,6 @@ ZEND_API void ZEND_FASTCALL _convert_to_string(zval *op) /* {{{ */
 
 			str = zend_strpprintf_unchecked(0, "%.*H", (int) EG(precision), dval);
 
-			if (EG(debug_locale_sensitive_float_casts)) {
-				zend_string *original_str = zend_strpprintf(0, "%.*G", (int) EG(precision), dval);
-
-				if (!zend_string_equals(str, original_str)) {
-					zend_error(E_WARNING, "Locale-independent float to string conversion");
-				}
-				zend_string_release(original_str);
-			}
-
 			ZVAL_NEW_STR(op, str);
 			break;
 		}
@@ -956,15 +947,6 @@ static zend_always_inline zend_string* __zval_get_string_func(zval *op, zend_boo
 		case IS_DOUBLE: {
 			zend_string *str = zend_strpprintf_unchecked(0, "%.*H", (int) EG(precision), Z_DVAL_P(op));
 
-			if (EG(debug_locale_sensitive_float_casts)) {
-				zend_string *original_str = zend_strpprintf(0, "%.*G", (int) EG(precision), Z_DVAL_P(op));
-
-				if (!zend_string_equals(str, original_str)) {
-					zend_error(E_WARNING, "Locale-independent float to string conversion");
-				}
-				zend_string_release(original_str);
-			}
-
 			return str;
 		}
 		case IS_ARRAY:
diff --git a/ext/standard/tests/strings/locale_independent_float_to_string.phpt b/ext/standard/tests/strings/locale_independent_float_to_string.phpt
@@ -2,13 +2,19 @@
 Test that floats are converted to string locale independently
 --SKIPIF--
 <?php
+
 if (!setlocale
     (LC_ALL,
     "german", "de", "de_DE", "de_DE.ISO8859-1", "de_DE.ISO_8859-1", "de_DE.UTF-8",
     "french", "fr", "fr_FR", "fr_FR.ISO8859-1", "fr_FR.ISO_8859-1", "fr_FR.UTF-8",
     )) {
-    die("skip locale needed for this test is not supported on this platform");
+    die("skip - locale needed for this test is not supported on this platform");
+}
+
+if (!extension_loaded("json")) {
+    print "skip - test requires the json extension";
 }
+
 ?>
 --FILE--
 <?php
diff --git a/ext/standard/tests/strings/locale_independent_float_to_string_debug_mode.phpt b/ext/standard/tests/strings/locale_independent_float_to_string_debug_mode.phpt
diff --git a/tests/basic/consistent_float_string_casts.phpt b/tests/basic/consistent_float_string_casts.phpt
