Commit:    dcf0b71c98497555ffb666ab419dc5d882ea0958
Author:    Nikita Popov <ni...@php.net>         Thu, 28 Mar 2013 18:35:46 +0100
Parents:   b1a6a1703910d77ef7932cd4b03a36a4dbabc917
Branches:  PHP-5.5 master

Link:       
http://git.php.net/?p=php-src.git;a=commitdiff;h=dcf0b71c98497555ffb666ab419dc5d882ea0958

Log:
Fix tests after addition of ^ (xor) operator to ini

Changed paths:
  M  ext/standard/tests/file/parse_ini_file.phpt
  M  ext/standard/tests/general_functions/parse_ini_string_001.phpt


Diff:
diff --git a/ext/standard/tests/file/parse_ini_file.phpt 
b/ext/standard/tests/file/parse_ini_file.phpt
index dab07e5..db14c7a 100644
--- a/ext/standard/tests/file/parse_ini_file.phpt
+++ b/ext/standard/tests/file/parse_ini_file.phpt
@@ -57,15 +57,15 @@ Non_alpha4 = %
 Non_alpha5 = <>
 Non_alpha6 = @
 Non_alpha7 = #
-Non_alpha8 = ^
-Non_alpha9 = -
-Non_alpha10 = :
-Non_alpha11 = ?
-Non_alpha12 = /
-Non_alpha13 = \
+Non_alpha8 = -
+Non_alpha9 = :
+Non_alpha10 = ?
+Non_alpha11 = /
+Non_alpha12 = \
 ;These chars have a special meaning when used in the value,
 ;  hence parser throws an error
-;Non_alpha14 = & 
+;Non_alpha13 = & 
+;Non_alpha14 = ^
 ;Non_alpha15 = {}
 ;Non_alpha16 = |
 ;Non_alpha17 = ~
@@ -249,12 +249,11 @@ Array
     [Non_alpha5] => <>
     [Non_alpha6] => @
     [Non_alpha7] => #
-    [Non_alpha8] => ^
-    [Non_alpha9] => -
-    [Non_alpha10] => :
-    [Non_alpha11] => ?
-    [Non_alpha12] => /
-    [Non_alpha13] => \
+    [Non_alpha8] => -
+    [Non_alpha9] => :
+    [Non_alpha10] => ?
+    [Non_alpha11] => /
+    [Non_alpha12] => \
     [Non_alpha1_quotes] => ;
     [Non_alpha2_quotes] => +
     [Non_alpha3_quotes] => *
@@ -385,12 +384,11 @@ Array
             [Non_alpha5] => <>
             [Non_alpha6] => @
             [Non_alpha7] => #
-            [Non_alpha8] => ^
-            [Non_alpha9] => -
-            [Non_alpha10] => :
-            [Non_alpha11] => ?
-            [Non_alpha12] => /
-            [Non_alpha13] => \
+            [Non_alpha8] => -
+            [Non_alpha9] => :
+            [Non_alpha10] => ?
+            [Non_alpha11] => /
+            [Non_alpha12] => \
             [Non_alpha1_quotes] => ;
             [Non_alpha2_quotes] => +
             [Non_alpha3_quotes] => *
diff --git a/ext/standard/tests/general_functions/parse_ini_string_001.phpt 
b/ext/standard/tests/general_functions/parse_ini_string_001.phpt
index e135210..c5e70cb 100644
--- a/ext/standard/tests/general_functions/parse_ini_string_001.phpt
+++ b/ext/standard/tests/general_functions/parse_ini_string_001.phpt
@@ -55,15 +55,15 @@ Non_alpha4 = %
 Non_alpha5 = <>
 Non_alpha6 = @
 Non_alpha7 = #
-Non_alpha8 = ^
-Non_alpha9 = -
-Non_alpha10 = :
-Non_alpha11 = ?
-Non_alpha12 = /
-Non_alpha13 = \
+Non_alpha8 = -
+Non_alpha9 = :
+Non_alpha10 = ?
+Non_alpha11 = /
+Non_alpha12 = \
 ;These chars have a special meaning when used in the value,
 ;  hence parser throws an error
-;Non_alpha14 = & 
+;Non_alpha13 = & 
+;Non_alpha14 = ^
 ;Non_alpha15 = {}
 ;Non_alpha16 = |
 ;Non_alpha17 = ~
@@ -239,12 +239,11 @@ Array
     [Non_alpha5] => <>
     [Non_alpha6] => @
     [Non_alpha7] => #
-    [Non_alpha8] => ^
-    [Non_alpha9] => -
-    [Non_alpha10] => :
-    [Non_alpha11] => ?
-    [Non_alpha12] => /
-    [Non_alpha13] => \
+    [Non_alpha8] => -
+    [Non_alpha9] => :
+    [Non_alpha10] => ?
+    [Non_alpha11] => /
+    [Non_alpha12] => \
     [Non_alpha1_quotes] => ;
     [Non_alpha2_quotes] => +
     [Non_alpha3_quotes] => *
@@ -375,12 +374,11 @@ Array
             [Non_alpha5] => <>
             [Non_alpha6] => @
             [Non_alpha7] => #
-            [Non_alpha8] => ^
-            [Non_alpha9] => -
-            [Non_alpha10] => :
-            [Non_alpha11] => ?
-            [Non_alpha12] => /
-            [Non_alpha13] => \
+            [Non_alpha8] => -
+            [Non_alpha9] => :
+            [Non_alpha10] => ?
+            [Non_alpha11] => /
+            [Non_alpha12] => \
             [Non_alpha1_quotes] => ;
             [Non_alpha2_quotes] => +
             [Non_alpha3_quotes] => *


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to