12 files changed, 105 insertions, 30 deletions
diff --git a/tests/basic/022.phpt b/tests/basic/022.phpt
new file mode 100644
index 000000000..61718f216
--- /dev/null
+++ b/tests/basic/022.phpt
@@ -0,0 +1,31 @@
+--TEST--
+Cookies test#1
+--COOKIE--
+cookie1=val1  ; cookie2=val2%20; cookie3=val 3.; cookie 4= value 4 %3B; cookie1=bogus; %20cookie1=ignore;+cookie1=ignore;cookie1;cookie  5=%20 value; cookie%206=þæö;cookie+7=;$cookie.8;cookie-9=1;;;- & % $cookie 10=10
+--FILE--
+<?php
+var_dump($_COOKIE);
+?>
+--EXPECT--
+array(10) {
+  ["cookie1"]=>
+  string(6) "val1  "
+  ["cookie2"]=>
+  string(5) "val2 "
+  ["cookie3"]=>
+  string(6) "val 3."
+  ["cookie_4"]=>
+  string(10) " value 4 ;"
+  ["cookie__5"]=>
+  string(7) "  value"
+  ["cookie_6"]=>
+  string(3) "þæö"
+  ["cookie_7"]=>
+  string(0) ""
+  ["$cookie_8"]=>
+  string(0) ""
+  ["cookie-9"]=>
+  string(1) "1"
+  ["-_&_%_$cookie_10"]=>
+  string(2) "10"
+}
diff --git a/tests/basic/023.phpt b/tests/basic/023.phpt
new file mode 100644
index 000000000..4eb698fa0
--- /dev/null
+++ b/tests/basic/023.phpt
@@ -0,0 +1,19 @@
+--TEST--
+Cookies test#2
+--INI--
+magic_quotes_gpc=0
+--COOKIE--
+c o o k i e=value; c o o k i e= v a l u e ;;c%20o+o k+i%20e=v;name="value","value",UEhQIQ==;UEhQIQ==foo
+--FILE--
+<?php
+var_dump($_COOKIE);
+?>
+--EXPECT--
+array(3) {
+  ["c_o_o_k_i_e"]=>
+  string(5) "value"
+  ["name"]=>
+  string(24) ""value","value",UEhQIQ=="
+  ["UEhQIQ"]=>
+  string(4) "=foo"
+}
diff --git a/tests/classes/abstract_static.phpt b/tests/classes/abstract_static.phpt
index f25d7cff4..bcebec599 100644
--- a/tests/classes/abstract_static.phpt
+++ b/tests/classes/abstract_static.phpt
@@ -31,6 +31,6 @@ echo "Done\n"; // shouldn't be displayed
 --EXPECTF--
 Call to function show()
 
-Strict Standards: Static function fail::func() should not be abstract in %stests/classes/abstract_static.php(%d) : eval()'d code on line %d
+Strict Standards: Static function fail::func() should not be abstract in %sabstract_static.php(%d) : eval()'d code on line %d
 
-Fatal error: Class fail contains 1 abstract method and must therefore be declared abstract or implement the remaining methods (fail::func) in %s/tests/classes/abstract_static.php(%d) : eval()'d code on line %d
+Fatal error: Class fail contains 1 abstract method and must therefore be declared abstract or implement the remaining methods (fail::func) in %sabstract_static.php(%d) : eval()'d code on line %d
diff --git a/tests/classes/array_access_003.phpt b/tests/classes/array_access_003.phpt
index 2d42665fc..3e631125e 100644
--- a/tests/classes/array_access_003.phpt
+++ b/tests/classes/array_access_003.phpt
@@ -53,4 +53,7 @@ object::offsetGet(2)
 int(1)
 object::offsetGet(2)
 
-Fatal error: Objects used as arrays in post/pre increment/decrement must return values by reference in %sarray_access_003.php on line %d
+Notice: Indirect modification of overloaded element of object has no effect in %sarray_access_003.php on line 39
+object::offsetGet(2)
+int(1)
+===DONE===
diff --git a/tests/classes/array_access_004.phpt b/tests/classes/array_access_004.phpt
index 17f5b7c40..787496707 100644
--- a/tests/classes/array_access_004.phpt
+++ b/tests/classes/array_access_004.phpt
@@ -51,4 +51,7 @@ object::offsetGet(2)
 int(1)
 object::offsetGet(2)
 
-Fatal error: Objects used as arrays in post/pre increment/decrement must return values by reference in %sarray_access_004.php on line %d
+Notice: Indirect modification of overloaded element of object has no effect in %sarray_access_004.php on line 39
+object::offsetGet(2)
+int(1)
+===DONE===
diff --git a/tests/classes/array_access_005.phpt b/tests/classes/array_access_005.phpt
index f248f2172..dcb873ff5 100755
--- a/tests/classes/array_access_005.phpt
+++ b/tests/classes/array_access_005.phpt
@@ -69,4 +69,9 @@ array(1) {
   string(6) "JoeFoo"
 }
 
-Fatal error: Objects used as arrays in post/pre increment/decrement must return values by reference in %sarray_access_005.php on line %d
+Notice: Indirect modification of overloaded element of Peoples has no effect in %sarray_access_005.php on line 46
+string(6) "JoeFoo"
+
+Notice: Indirect modification of overloaded element of Peoples has no effect in %sarray_access_005.php on line 48
+string(6) "JoeFoo"
+===DONE===
diff --git a/tests/classes/array_access_008.phpt b/tests/classes/array_access_008.phpt
index 013038824..997988917 100755
--- a/tests/classes/array_access_008.phpt
+++ b/tests/classes/array_access_008.phpt
@@ -56,4 +56,12 @@ string(9) "FooBarBaz"
 ===ArrayOverloading===
 string(3) "Foo"
 
-Fatal error: Objects used as arrays in post/pre increment/decrement must return values by reference in %sarray_access_008.php on line %d
+Notice: Indirect modification of overloaded element of Peoples has no effect in %sarray_access_008.php on line 40
+string(3) "Foo"
+
+Notice: Indirect modification of overloaded element of Peoples has no effect in %sarray_access_008.php on line 42
+string(3) "Foo"
+
+Notice: Indirect modification of overloaded element of Peoples has no effect in %sarray_access_008.php on line 44
+string(3) "Foo"
+===DONE===
diff --git a/tests/classes/array_access_012.phpt b/tests/classes/array_access_012.phpt
index d7503ec05..8f85f296e 100755
--- a/tests/classes/array_access_012.phpt
+++ b/tests/classes/array_access_012.phpt
@@ -31,4 +31,6 @@ $data['element'] = &$test;
 <?php exit(0); ?>
 --EXPECTF--
 
-Fatal error: Objects used as arrays in post/pre increment/decrement must return values by reference in %sarray_access_012.php on line %d
+Notice: Indirect modification of overloaded element of ArrayAccessImpl has no effect in %sarray_access_012.php on line 24
+
+Fatal error: Cannot assign by reference to overloaded object in %sarray_access_012.php on line 24
diff --git a/tests/classes/bug27468.phpt b/tests/classes/bug27468.phpt
index 971273224..f7ec8b688 100644
--- a/tests/classes/bug27468.phpt
+++ b/tests/classes/bug27468.phpt
@@ -11,5 +11,7 @@ new foo();
 echo 'OK';
 ?>
 --EXPECTF--
+Notice: Undefined property:  foo::$x in %sbug27468.php on line 4
+
 Warning: Invalid argument supplied for foreach() in %sbug27468.php on line 4
 OK
diff --git a/tests/lang/bug24640.phpt b/tests/lang/bug24640.phpt
index eb208cf56..919b38e29 100755
--- a/tests/lang/bug24640.phpt
+++ b/tests/lang/bug24640.phpt
@@ -35,7 +35,7 @@ test(1.7e-1000);
 ?>
 ===DONE===
 <?php exit(0); ?>
---EXPECT--
+--EXPECTF--
 1.7E+300
 float(1.7E+300)
 1.7E+300
@@ -76,50 +76,50 @@ float(1.7E-81)
 1.7E-81
 1.7E-81
 ------
-INF
-float(INF)
-INF
-INF
+I%s
+float(I%s)
+I%s
+I%s
 ------
 1.69998107421E-319
 float(1.69998107421E-319)
 1.69998107421E-319
 1.69998107421E-319
 ------
-INF
-float(INF)
-INF
-INF
+I%s
+float(I%s)
+I%s
+I%s
 ------
 1.70007988734E-320
 float(1.70007988734E-320)
 1.70007988734E-320
 1.70007988734E-320
 ------
-INF
-float(INF)
-INF
-INF
+I%s
+float(I%s)
+I%s
+I%s
 ------
 1.69958582169E-321
 float(1.69958582169E-321)
 1.69958582169E-321
 1.69958582169E-321
 ------
-INF
-float(INF)
-INF
-INF
+I%s
+float(I%s)
+I%s
+I%s
 ------
 0
 float(0)
 0
 0
 ------
-INF
-float(INF)
-INF
-INF
+I%s
+float(I%s)
+I%s
+I%s
 ------
 0
 float(0)
diff --git a/tests/lang/bug27439.phpt b/tests/lang/bug27439.phpt
index 66798dc75..b12fd1ec6 100755
--- a/tests/lang/bug27439.phpt
+++ b/tests/lang/bug27439.phpt
@@ -65,6 +65,8 @@ echo "===DONE===";
 ?>
 --EXPECTF--
 123
+Notice: Undefined property:  test::$foobar in %s on line %d
+
 Warning: Invalid argument supplied for foreach() in %s on line %d
 
 Warning: Invalid argument supplied for foreach() in %s on line %d
diff --git a/tests/lang/bug30638.phpt b/tests/lang/bug30638.phpt
index 2574d132d..0ebe8d49d 100644
--- a/tests/lang/bug30638.phpt
+++ b/tests/lang/bug30638.phpt
@@ -1,9 +1,9 @@
 --TEST--
-Bug #30638 (localeconv returns wrong LC_NUMERIC settings)
+Bug #30638 (localeconv returns wrong LC_NUMERIC settings) (ok to fail on MacOS X)
 --SKIPIF--
 <?php  # try to activate a german locale
 if (setlocale(LC_NUMERIC, "de_DE", "de", "german", "ge") === FALSE) {
-	print "skip";
+	print "skip setlocale() failed";
 }
 ?>
 --FILE--