unicode_semantics -> unicode.semantics

30 files changed, 37 insertions, 37 deletions

diff --git a/README.UNICODE b/README.UNICODE
index 0b2e197231..b5aca61fa9 100644
--- a/README.UNICODE
+++ b/README.UNICODE
@@ -240,7 +240,7 @@ Unicode at all and that no Unicode string can exist. It only affects certain
 aspects of the language, and Unicode strings can always be created
 programmatically.
 
-    unicode_semantics = On
+    unicode.semantics = On
 
  [TODO: list areas that are affected by this switch]
 
diff --git a/README.UNICODE-UPGRADES b/README.UNICODE-UPGRADES
index dba901992f..69173475cd 100644
--- a/README.UNICODE-UPGRADES
+++ b/README.UNICODE-UPGRADES
@@ -12,7 +12,7 @@ Working in Unicode World
 Strings
 -------
 
-A lot of internal functionality is controlled by the unicode_semantics
+A lot of internal functionality is controlled by the unicode.semantics
 switch. Its value is found in the Unicode globals variable, UG(unicode). It
 is either on or off for the entire request.
 
diff --git a/ext/simplexml/tests/000.phpt b/ext/simplexml/tests/000.phpt
index d11c271dac..7f9d87a592 100755
--- a/ext/simplexml/tests/000.phpt
+++ b/ext/simplexml/tests/000.phpt
@@ -22,7 +22,7 @@ test('sxe->elem1');
 test('sxe->elem1[0]');
 test('sxe->elem1[0]->elem2');
 test('sxe->elem1[0]->elem2->bla');
-if (!ini_get("unicode_semantics")) test('sxe->elem1[0]["attr1"]');
+if (!ini_get("unicode.semantics")) test('sxe->elem1[0]["attr1"]');
 test('sxe->elem1[0]->attr1');
 test('sxe->elem1[1]');
 test('sxe->elem1[2]');
diff --git a/ext/standard/tests/strings/strtr2.phpt b/ext/standard/tests/strings/strtr2.phpt
index 7dc7982aa3..f9f928d06a 100644
--- a/ext/standard/tests/strings/strtr2.phpt
+++ b/ext/standard/tests/strings/strtr2.phpt
@@ -1,7 +1,7 @@
 --TEST--
 strtr() function (with unicode chars and combining sequences)
 --SKIPIF--
-<?php if (!unicode_semantics()) die('skip unicode_semantics=off'); ?>
+<?php if (!unicode_semantics()) die('skip unicode.semantics=off'); ?>
 --FILE--
 <?php
 	declare(encoding="utf8");
diff --git a/ext/unicode/tests/iterator_001.phpt b/ext/unicode/tests/iterator_001.phpt
index 540e6a5b8e..1b8bc56157 100755
--- a/ext/unicode/tests/iterator_001.phpt
+++ b/ext/unicode/tests/iterator_001.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Unicode: Basic iterator tests
 --SKIPIF--
-<?php if (!unicode_semantics()) die('skip unicode_semantics=off'); ?>
+<?php if (!unicode_semantics()) die('skip unicode.semantics=off'); ?>
 --FILE--
 <?php
 
diff --git a/ext/unicode/tests/iterator_002.phpt b/ext/unicode/tests/iterator_002.phpt
index 1e3ce7447e..fc14cab0a4 100755
--- a/ext/unicode/tests/iterator_002.phpt
+++ b/ext/unicode/tests/iterator_002.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Unicode: Iterator and key()
 --SKIPIF--
-<?php if (!unicode_semantics()) die('skip unicode_semantics=off'); ?>
+<?php if (!unicode_semantics()) die('skip unicode.semantics=off'); ?>
 --FILE--
 <?php
 
diff --git a/php.ini-dist b/php.ini-dist
index f879d3b865..87d7449981 100644
--- a/php.ini-dist
+++ b/php.ini-dist
@@ -370,7 +370,7 @@ default_mimetype = "text/html"
 ; Unicode settings ;
 ;;;;;;;;;;;;;;;;;;;;
 
-unicode_semantics = off
+unicode.semantics = off
 unicode.runtime_encoding = iso-8859-1
 unicode.script_encoding = utf-8
 unicode.output_encoding = utf-8
diff --git a/php.ini-recommended b/php.ini-recommended
index 793d645c0d..3c5184441f 100644
--- a/php.ini-recommended
+++ b/php.ini-recommended
@@ -403,7 +403,7 @@ default_mimetype = "text/html"
 ; Unicode settings ;
 ;;;;;;;;;;;;;;;;;;;;
 
-unicode_semantics = off
+unicode.semantics = off
 unicode.runtime_encoding = iso-8859-1 
 unicode.script_encoding = utf-8
 unicode.output_encoding = utf-8
diff --git a/run-tests.php b/run-tests.php
index b616fd484f..7d1b939d35 100755
--- a/run-tests.php
+++ b/run-tests.php
@@ -170,7 +170,7 @@ PHP_SAPI    : " , PHP_SAPI , "
 PHP_VERSION : " , phpversion() , "
 ZEND_VERSION: " , zend_version() , "
 PHP_OS      : " , PHP_OS , " - " , php_uname() , "
-UNICODE     : " , (ini_get("unicode_semantics") ? "ON" : "OFF") , "
+UNICODE     : " , (ini_get("unicode.semantics") ? "ON" : "OFF") , "
 INI actual  : " , realpath(get_cfg_var("cfg_file_path")) , "
 More .INIs  : " , (function_exists(\'php_ini_scanned_files\') ? str_replace("\n","", php_ini_scanned_files()) : "** not determined **"); ?>';
 	save_text($info_file, $php_info);
@@ -181,7 +181,7 @@ More .INIs  : " , (function_exists(\'php_ini_scanned_files\') ? str_replace("\n"
 	@unlink($info_file);
 	define('TESTED_PHP_VERSION', `$php -r 'echo PHP_VERSION;'`);
 
-	$unicode = `$php $pass_options $info_params -r 'echo ini_get("unicode_semantics");'`;
+	$unicode = `$php $pass_options $info_params -r 'echo ini_get("unicode.semantics");'`;
 	define('TESTED_UNICODE', strcasecmp($unicode,"on") == 0 || $unicode == 1);
 
 	// load list of enabled extensions
@@ -376,7 +376,7 @@ if (isset($argc) && $argc > 1) {
 					// break;
 				case 'u':
 					$unicode_testing = true;
-					$ini_overwrites[] = 'unicode_semantics=1';
+					$ini_overwrites[] = 'unicode.semantics=1';
 					$ini_overwrites[] = 'unicode.runtime_encoding=iso-8859-1';
 					$ini_overwrites[] = 'unicode.script_encoding=utf-8';
 					$ini_overwrites[] = 'unicode.output_encoding=utf-8';
@@ -430,13 +430,13 @@ Options:
     -d foo=bar  Pass -d option to the php binary (Define INI entry foo
                 with value 'bar').
 
-    -u          Test with unicode_semantics set on.
+    -u          Test with unicode.semantics set on.
 
     -U          Test in unicode and non unicode mode.
 
     -m          Test for memory leaks with Valgrind.
     
-    -N          Test with unicode_semantics set off.
+    -N          Test with unicode.semantics set off.
     
     -s <file>   Write output to <file>.
 
@@ -1163,7 +1163,7 @@ TEST $file
 	settings2array($ini_overwrites, $ini_settings);
 	// is this unicode/native per run-tests.php switch?
 	if ($unicode_and_native) {
-		$ini_settings["unicode_semantics"] = $unicode_semantics ? '1' : '0';
+		$ini_settings["unicode.semantics"] = $unicode_semantics ? '1' : '0';
 	}
 	// Any special ini settings 
 	// these may overwrite the test defaults...
@@ -1172,8 +1172,8 @@ TEST $file
 			$section_text['INI'] = str_replace('{PWD}', dirname($file), $section_text['INI']);
 		}
 		settings2array(preg_split( "/[\n\r]+/", $section_text['INI']), $ini_settings);
-		if (isset($ini_settings["unicode_semantics"])) {
-			$unicode_test = strcasecmp($ini_settings["unicode_semantics"],"on") == 0 || $ini_settings["unicode_semantics"] == 1;
+		if (isset($ini_settings["unicode.semantics"])) {
+			$unicode_test = strcasecmp($ini_settings["unicode.semantics"],"on") == 0 || $ini_settings["unicode.semantics"] == 1;
 		} else {
 			$unicode_test = TESTED_UNICODE;
 		}
diff --git a/tests/unicode/autodetect-SCSU.phpt b/tests/unicode/autodetect-SCSU.phpt
index a3e3f45c0a..12213a81bd 100755
--- a/tests/unicode/autodetect-SCSU.phpt
+++ b/tests/unicode/autodetect-SCSU.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Script encoding autodetection (SCSU)
 --INI--
-unicode_semantics=on
+unicode.semantics=on
 unicode.output_encoding=CP866
 --FILE--
 <?php
diff --git a/tests/unicode/autodetect-UTF16BE.phpt b/tests/unicode/autodetect-UTF16BE.phpt
index 439276961d..f7a1d6bd3e 100755
--- a/tests/unicode/autodetect-UTF16BE.phpt
+++ b/tests/unicode/autodetect-UTF16BE.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Script encoding autodetection (UTF-16BE)
 --INI--
-unicode_semantics=on
+unicode.semantics=on
 unicode.output_encoding=CP866
 --FILE--
 <?php
diff --git a/tests/unicode/autodetect-UTF16LE.phpt b/tests/unicode/autodetect-UTF16LE.phpt
index 4daaf7cad7..4302029fee 100755
--- a/tests/unicode/autodetect-UTF16LE.phpt
+++ b/tests/unicode/autodetect-UTF16LE.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Script encoding autodetection (UTF-16LE)
 --INI--
-unicode_semantics=on
+unicode.semantics=on
 unicode.output_encoding=CP866
 --FILE--
 <?php
diff --git a/tests/unicode/autodetect-UTF32BE.phpt b/tests/unicode/autodetect-UTF32BE.phpt
index 39e62b5445..9378583f86 100755
--- a/tests/unicode/autodetect-UTF32BE.phpt
+++ b/tests/unicode/autodetect-UTF32BE.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Script encoding autodetection (UTF-32BE)
 --INI--
-unicode_semantics=on
+unicode.semantics=on
 unicode.output_encoding=CP866
 --FILE--
 <?php
diff --git a/tests/unicode/autodetect-UTF32LE.phpt b/tests/unicode/autodetect-UTF32LE.phpt
index b966b04b2a..a05711dfaa 100755
--- a/tests/unicode/autodetect-UTF32LE.phpt
+++ b/tests/unicode/autodetect-UTF32LE.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Script encoding autodetection (UTF-32LE)
 --INI--
-unicode_semantics=on
+unicode.semantics=on
 unicode.output_encoding=CP866
 --FILE--
 <?php
diff --git a/tests/unicode/autodetect-UTF7.phpt b/tests/unicode/autodetect-UTF7.phpt
index 89f8e6d305..26ba3966dd 100755
--- a/tests/unicode/autodetect-UTF7.phpt
+++ b/tests/unicode/autodetect-UTF7.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Script encoding autodetection (UTF7)
 --INI--
-unicode_semantics=on
+unicode.semantics=on
 unicode.output_encoding=CP866
 --FILE--
 <?php
diff --git a/tests/unicode/autodetect-UTF8.phpt b/tests/unicode/autodetect-UTF8.phpt
index 570f398b2b..29b561e9fb 100755
--- a/tests/unicode/autodetect-UTF8.phpt
+++ b/tests/unicode/autodetect-UTF8.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Script encoding autodetection (UTF8)
 --INI--
-unicode_semantics=on
+unicode.semantics=on
 unicode.output_encoding=CP866
 --FILE--
 <?php
diff --git a/tests/unicode/enc-HZ.phpt b/tests/unicode/enc-HZ.phpt
index 9b327a1ee8..25c082a7fa 100755
--- a/tests/unicode/enc-HZ.phpt
+++ b/tests/unicode/enc-HZ.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Script encoding (HZ)
 --INI--
-unicode_semantics=on
+unicode.semantics=on
 unicode.output_encoding=CP866
 --FILE--
 <?php
diff --git a/tests/unicode/enc-ISO-2022-KR.phpt b/tests/unicode/enc-ISO-2022-KR.phpt
index 94033f624e..3e94bd77c5 100755
--- a/tests/unicode/enc-ISO-2022-KR.phpt
+++ b/tests/unicode/enc-ISO-2022-KR.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Script encoding (ISO-2022-KR)
 --INI--
-unicode_semantics=on
+unicode.semantics=on
 unicode.output_encoding=CP866
 --FILE--
 <?php
diff --git a/tests/unicode/enc-JIS.phpt b/tests/unicode/enc-JIS.phpt
index 4bab19841a..3470a70aca 100755
--- a/tests/unicode/enc-JIS.phpt
+++ b/tests/unicode/enc-JIS.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Script encoding (JIS)
 --INI--
-unicode_semantics=on
+unicode.semantics=on
 unicode.output_encoding=CP866
 --FILE--
 <?php
diff --git a/tests/unicode/enc-SJIS.phpt b/tests/unicode/enc-SJIS.phpt
index bd190ee86a..9d8f5cf484 100755
--- a/tests/unicode/enc-SJIS.phpt
+++ b/tests/unicode/enc-SJIS.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Script encoding (SJIS)
 --INI--
-unicode_semantics=on
+unicode.semantics=on
 unicode.output_encoding=CP866
 --FILE--
 <?php
diff --git a/tests/unicode/encrt-HZ.phpt b/tests/unicode/encrt-HZ.phpt
index c0f3812361..2a85bc981b 100755
--- a/tests/unicode/encrt-HZ.phpt
+++ b/tests/unicode/encrt-HZ.phpt
@@ -1,7 +1,7 @@
 --TEST--
 declare script encoding (HZ)
 --INI--
-unicode_semantics=on
+unicode.semantics=on
 unicode.output_encoding=CP866
 --FILE--
 <?php
diff --git a/tests/unicode/encrt-ISO-2022-KR.phpt b/tests/unicode/encrt-ISO-2022-KR.phpt
index ebca20231a..bfc46e9aac 100755
--- a/tests/unicode/encrt-ISO-2022-KR.phpt
+++ b/tests/unicode/encrt-ISO-2022-KR.phpt
@@ -1,7 +1,7 @@
 --TEST--
 declare script encoding (ISO-2022-KR)
 --INI--
-unicode_semantics=on
+unicode.semantics=on
 unicode.output_encoding=CP866
 --FILE--
 <?php
diff --git a/tests/unicode/encrt-JIS.phpt b/tests/unicode/encrt-JIS.phpt
index 082c1caf18..3237e4e09a 100755
--- a/tests/unicode/encrt-JIS.phpt
+++ b/tests/unicode/encrt-JIS.phpt
@@ -1,7 +1,7 @@
 --TEST--
 declare script encoding (JIS)
 --INI--
-unicode_semantics=on
+unicode.semantics=on
 unicode.output_encoding=CP866
 --FILE--
 <?php
diff --git a/tests/unicode/encrt-SJIS.phpt b/tests/unicode/encrt-SJIS.phpt
index 918ddc910e..c6c7013789 100755
--- a/tests/unicode/encrt-SJIS.phpt
+++ b/tests/unicode/encrt-SJIS.phpt
@@ -1,7 +1,7 @@
 --TEST--
 declare script encoding (SJIS)
 --INI--
-unicode_semantics=on
+unicode.semantics=on
 unicode.output_encoding=CP866
 --FILE--
 <?php
diff --git a/tests/unicode/func/strpos.phpt b/tests/unicode/func/strpos.phpt
index 785ae73d76..9e152302d6 100644
--- a/tests/unicode/func/strpos.phpt
+++ b/tests/unicode/func/strpos.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Unicode: strpos() function test
 --INI--
-unicode_semantics=on
+unicode.semantics=on
 --FILE--
 <?php
 $a = "a™ᄒ\U020021z";
diff --git a/tests/unicode/func/strstr.phpt b/tests/unicode/func/strstr.phpt
index 38d8eb5e91..4eefb67250 100644
--- a/tests/unicode/func/strstr.phpt
+++ b/tests/unicode/func/strstr.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Unicode: strpos() function test
 --INI--
-unicode_semantics=on
+unicode.semantics=on
 --FILE--
 <?php
 $a = "a™ᄒ\U020021z";
diff --git a/tests/unicode/normalize_001.phpt b/tests/unicode/normalize_001.phpt
index 46b456fc4e..798237d9a6 100755
--- a/tests/unicode/normalize_001.phpt
+++ b/tests/unicode/normalize_001.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Unicode identifiers normalization (${})
 --INI--
-unicode_semantics=on
+unicode.semantics=on
 --FILE--
 <?php
 ${"\u212B"} = "ok\n";
diff --git a/tests/unicode/normalize_002.phpt b/tests/unicode/normalize_002.phpt
index ade41ec5fe..1901fdefcf 100755
--- a/tests/unicode/normalize_002.phpt
+++ b/tests/unicode/normalize_002.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Unicode identifiers normalization ($$)
 --INI--
-unicode_semantics=on
+unicode.semantics=on
 --FILE--
 <?php
 $a = "\u212B";
diff --git a/tests/unicode/normalize_003.phpt b/tests/unicode/normalize_003.phpt
index 21085acc24..bd686a4446 100755
--- a/tests/unicode/normalize_003.phpt
+++ b/tests/unicode/normalize_003.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Unicode identifiers normalization (indirect function call)
 --INI--
-unicode_semantics=on
+unicode.semantics=on
 --FILE--
 <?php
 declare(encoding = "ISO-8859-1");
diff --git a/tests/unicode/normalize_004.phpt b/tests/unicode/normalize_004.phpt
index 37f65ee940..35d8dca42f 100755
--- a/tests/unicode/normalize_004.phpt
+++ b/tests/unicode/normalize_004.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Unicode identifiers normalization ($GLOBALS[])
 --INI--
-unicode_semantics=on
+unicode.semantics=on
 --FILE--
 <?php
 $GLOBALS["\u212B"] = "ok\n";