stas Thu Sep 11 00:34:48 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard/tests/general_functions parse_ini_basic.data
parse_ini_basic.phpt
Log:
add some windows-style INI entries to tests
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/parse_ini_basic.data?r1=1.1.2.3&r2=1.1.2.4&diff_format=u
Index: php-src/ext/standard/tests/general_functions/parse_ini_basic.data
diff -u
php-src/ext/standard/tests/general_functions/parse_ini_basic.data:1.1.2.3
php-src/ext/standard/tests/general_functions/parse_ini_basic.data:1.1.2.4
--- php-src/ext/standard/tests/general_functions/parse_ini_basic.data:1.1.2.3
Mon Feb 4 20:45:20 2008
+++ php-src/ext/standard/tests/general_functions/parse_ini_basic.data Thu Sep
11 00:34:48 2008
@@ -1,129 +1,132 @@
-[basic]
-basicval = bar
-longval = 12345
-with.dot = fooobar
-boolon = on
-booltrue = true
-boolyes = yes
-booloff = off
-boolfalse = false
-boolnone = none
-boolno = no
-string = asdadfsdjkslkj [EMAIL PROTECTED] { }[ ]/%#¤
-sqstring = 'adsasdadasdasd'
-dqstring = "asdadfsdjkslkj [EMAIL PROTECTED] { } !^~|¥¥{[()/)&/% ¤ # #"
-php_constant = E_ALL
-user_constant = TEST_CONSTANT
-
-[basic with whitespace]
-basicval = bar
-longval = 12345
-with.dot = fooobar
-boolon = on
-booltrue = true
-boolyes = yes
-booloff = off
-boolfalse = false
-boolnone = none
-boolno = no
-sqstring = 'adsasdadasdasd'
-dqstring = "asdadfsdjkslkj [EMAIL
PROTECTED]()/)&/%#¤"
-php_constant = E_ALL
-
-[comments]
-; some comment
- ; some comment with whitespace
-somecomment = comment follows;[EMAIL PROTECTED] ; comment here
-;
-
-[variables]
-var1 = ${basicval}
-var2 = ${basicval}/foo
-var3 = foo/${basicval}
-var4 = foo/${basicval}/foo
-quoted_var1 = "${basicqval}"
-quoted_var2 = "${basicqval}/foo"
-quoted_var3 = "foo/${basicqval}"
-quoted_var4 = "foo/${basicqval}/foo"
-
-[offset values]
-foo1[] = "basic offset 1"
-foo1[ ] = "basic offset 2"
-foo2[123] = "long offset"
-foo3[abc] = "string offset"
-foo4[""] = "quoted offset 1"
-foo4[" "] = "quoted offset 2"
-foo4["sqfoobar"] = "quoted string offset"
-foo4['dqfoobar'] = "single quoted offset"
-foo6[${basicval}] = "variable"
-foo6[${basicval}/foo] = "variable with string 1"
-foo6[foo/${basicval}] = "variable with string 2"
-foo6[foo/${basicval}/foo] = "variable with string 3"
-foo7["${basicqval}"] = "quoted variable 1"
-foo7["${basicqval}/foo"] = "quoted variable 2"
-foo7["foo/${basicqval}"] = "quoted variable 3"
-foo7[ "foo/${basicqval}/foo" ] = "quoted variable 4"
-
-[non value]
-novalue_option1 =
-novalue_option2=
-novalue_option3 =
-novalue_option4=
-novalue_option4[] =
-novalue_option4[]=
-novalue_option4[]=
-
-["Quoted strings and variables in sections"]
-
-[${basicval}]
-[${basicval}/foo]
-[foo/${basicval}]
-[foo/${basicval}/foo]
-
-["${basicqval}"]
-["${basicqval}/foo"]
-["foo/${basicqval}"]
-["foo/${basicqval}/foo"]
-
-[PATH=${basicval}/no/quotes]
-; Invalid!
-;[PATH="${basicval}/path/quoted"]
-["PATH=${basicval}/all/quoted"]
-
-; This is test for bug #29306
-[01]
-e=e
-f=f
-[02]
-g=g
-h=h
-[1]
-a=a
-b=b
-[2]
-c=c
-d=d
-[0815]
-bla=bla
-
-;Test for bug #43923
-[bug #43923]
-curly1 = {
-curly2 = "{"
-curly3 = '{'
-
-;Test for bug #44019
-[bug #44019]
-concatenation_before = TEST_CONSTANT "+some_text_after"
-concatenation_middle = "some_text_before+" TEST_CONSTANT "+some_text_after"
-concatenation_after = "some_text_before+" TEST_CONSTANT
-concatenation_nows_before = TEST_CONSTANT"+some_text_after"
-concatenation_nows_middle = "some_text_before+"TEST_CONSTANT"+some_text_after"
-concatenation_nows_after = "some_text_before+"TEST_CONSTANT
-
-;Test for bug #43915
-[bug #43915]
-ini_with-hyphen = with hyphen and underscore
-ini.with-hyphen = dot and hyphen
-ini-with.hyphen = hyphen and dot
-
+[basic]
+basicval = bar
+longval = 12345
+with.dot = fooobar
+boolon = on
+booltrue = true
+boolyes = yes
+booloff = off
+boolfalse = false
+boolnone = none
+boolno = no
+string = asdadfsdjkslkj [EMAIL PROTECTED] { }[ ]/%#¤
+sqstring = 'adsasdadasdasd'
+dqstring = "asdadfsdjkslkj [EMAIL PROTECTED] { } !^~|¥¥{[()/)&/% ¤ # #"
+php_constant = E_ALL
+user_constant = TEST_CONSTANT
+
+[basic with whitespace]
+basicval = bar
+longval = 12345
+with.dot = fooobar
+boolon = on
+booltrue = true
+boolyes = yes
+booloff = off
+boolfalse = false
+boolnone = none
+boolno = no
+sqstring = 'adsasdadasdasd'
+dqstring = "asdadfsdjkslkj [EMAIL
PROTECTED]()/)&/%#¤"
+php_constant = E_ALL
+
+[comments]
+; some comment
+ ; some comment with whitespace
+somecomment = comment follows;[EMAIL PROTECTED] ; comment here
+;
+
+[variables]
+var1 = ${basicval}
+var2 = ${basicval}/foo
+var3 = foo/${basicval}
+var4 = foo/${basicval}/foo
+quoted_var1 = "${basicqval}"
+quoted_var2 = "${basicqval}/foo"
+quoted_var3 = "foo/${basicqval}"
+quoted_var4 = "foo/${basicqval}/foo"
+
+[offset values]
+foo1[] = "basic offset 1"
+foo1[ ] = "basic offset 2"
+foo2[123] = "long offset"
+foo3[abc] = "string offset"
+foo4[""] = "quoted offset 1"
+foo4[" "] = "quoted offset 2"
+foo4["sqfoobar"] = "quoted string offset"
+foo4['dqfoobar'] = "single quoted offset"
+foo6[${basicval}] = "variable"
+foo6[${basicval}/foo] = "variable with string 1"
+foo6[foo/${basicval}] = "variable with string 2"
+foo6[foo/${basicval}/foo] = "variable with string 3"
+foo7["${basicqval}"] = "quoted variable 1"
+foo7["${basicqval}/foo"] = "quoted variable 2"
+foo7["foo/${basicqval}"] = "quoted variable 3"
+foo7[ "foo/${basicqval}/foo" ] = "quoted variable 4"
+
+[non value]
+novalue_option1 =
+novalue_option2=
+novalue_option3 =
+novalue_option4=
+novalue_option4[] =
+novalue_option4[]=
+novalue_option4[]=
+
+["Quoted strings and variables in sections"]
+
+[${basicval}]
+[${basicval}/foo]
+[foo/${basicval}]
+[foo/${basicval}/foo]
+
+["${basicqval}"]
+["${basicqval}/foo"]
+["foo/${basicqval}"]
+["foo/${basicqval}/foo"]
+
+[PATH=${basicval}/no/quotes]
+; Invalid!
+;[PATH="${basicval}/path/quoted"]
+["PATH=${basicval}/all/quoted"]
+
+; This is test for bug #29306
+[01]
+e=e
+f=f
+[02]
+g=g
+h=h
+[1]
+a=a
+b=b
+[2]
+c=c
+d=d
+[0815]
+bla=bla
+
+;Test for bug #43923
+[bug #43923]
+curly1 = {
+curly2 = "{"
+curly3 = '{'
+
+;Test for bug #44019
+[bug #44019]
+concatenation_before = TEST_CONSTANT "+some_text_after"
+concatenation_middle = "some_text_before+" TEST_CONSTANT "+some_text_after"
+concatenation_after = "some_text_before+" TEST_CONSTANT
+concatenation_nows_before = TEST_CONSTANT"+some_text_after"
+concatenation_nows_middle = "some_text_before+"TEST_CONSTANT"+some_text_after"
+concatenation_nows_after = "some_text_before+"TEST_CONSTANT
+
+;Test for bug #43915
+[bug #43915]
+ini_with-hyphen = with hyphen and underscore
+ini.with-hyphen = dot and hyphen
+ini-with.hyphen = hyphen and dot
+
+[windows paths]
+winpath1="c:\some windows\path\test\new\r\quote \" here\single ' quote\some
more"
+winpath2="special case\"
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/general_functions/parse_ini_basic.phpt?r1=1.1.2.5&r2=1.1.2.6&diff_format=u
Index: php-src/ext/standard/tests/general_functions/parse_ini_basic.phpt
diff -u
php-src/ext/standard/tests/general_functions/parse_ini_basic.phpt:1.1.2.5
php-src/ext/standard/tests/general_functions/parse_ini_basic.phpt:1.1.2.6
--- php-src/ext/standard/tests/general_functions/parse_ini_basic.phpt:1.1.2.5
Mon Jul 21 12:23:38 2008
+++ php-src/ext/standard/tests/general_functions/parse_ini_basic.phpt Thu Sep
11 00:34:48 2008
@@ -15,7 +15,7 @@
echo "Done.\n";
?>
--EXPECTF--
-array(25) {
+array(26) {
["basic"]=>
array(15) {
["basicval"]=>
@@ -272,5 +272,12 @@
["ini-with.hyphen"]=>
string(14) "hyphen and dot"
}
+ ["windows paths"]=>
+ array(2) {
+ ["winpath1"]=>
+ string(69) "c:\some windows\path\test\new\r\quote " here\single '
quote\some more"
+ ["winpath2"]=>
+ string(13) "special case\"
+ }
}
Done.
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
