- Fixed tests

14 files changed, 12 insertions, 283 deletions

diff --git a/ext/date/tests/idate_variation7.phpt b/ext/date/tests/idate_variation7.phpt
index 9cd6f8edac..a5e3a2ee7d 100644
--- a/ext/date/tests/idate_variation7.phpt
+++ b/ext/date/tests/idate_variation7.phpt
@@ -24,7 +24,7 @@ var_dump( idate($format, $timestamp) );
 *** Testing idate() : usage variation ***
 
 Strict Standards: idate(): It is not safe to rely on the system's timezone settings.%s
-int(2008)
+int(2009)
 
 Strict Standards: idate(): It is not safe to rely on the system's timezone settings.%s
 int(2008)
diff --git a/ext/filter/tests/041.phpt b/ext/filter/tests/041.phpt
index 0a2e3f0a11..5cb6c2249e 100644
--- a/ext/filter/tests/041.phpt
+++ b/ext/filter/tests/041.phpt
@@ -19,12 +19,12 @@ var_dump(filter_input(INPUT_COOKIE, "xyz", FILTER_SANITIZE_SPECIAL_CHARS));
 ?>
 --EXPECT--
 array(3) {
-  ["abc"]=>
-  string(3) "dir"
-  ["def"]=>
-  string(4) "true"
-  ["xyz"]=>
-  string(17) ""foo bar""
+  [u"abc"]=>
+  unicode(3) "dir"
+  [u"def"]=>
+  unicode(4) "true"
+  [u"xyz"]=>
+  unicode(17) ""foo bar""
 }
 bool(true)
 string(3) "dir"
diff --git a/ext/posix/tests/posix_initgroups.phpt b/ext/posix/tests/posix_initgroups.phpt
index 6ffb202f3c..79dad8ecbe 100644
--- a/ext/posix/tests/posix_initgroups.phpt
+++ b/ext/posix/tests/posix_initgroups.phpt
@@ -13,6 +13,6 @@ var_dump(posix_initgroups(NULL, NULL));
 
 ?>
 --EXPECTF--
-Warning: posix_initgroups() expects parameter 2 to be long, string given in %s on line %d
+Warning: posix_initgroups() expects parameter 2 to be long, Unicode string given in %s on line %d
 bool(false)
 bool(false)
diff --git a/ext/session/tests/session_module_name_variation3.phpt b/ext/session/tests/session_module_name_variation3.phpt
index 11b6e57627..1306cf3ec7 100644
--- a/ext/session/tests/session_module_name_variation3.phpt
+++ b/ext/session/tests/session_module_name_variation3.phpt
@@ -38,17 +38,6 @@ ob_end_flush();
 ?>
 --EXPECTF--
 *** Testing session_module_name() : variation ***
-string(%d) "%s"
-string(4) "user"
-
-Fatal error: Uncaught exception 'Exception' with message 'Stop...!' in %s:%d
-Stack trace:
-#0 [internal function]: open('', 'PHPSESSID')
-#1 %s(%d): session_start()
-#2 {main}
-  thrown in %s on line %d
---UEXPECTF--
-*** Testing session_module_name() : variation ***
 unicode(5) "files"
 unicode(4) "user"
 
diff --git a/ext/session/tests/session_name_error.phpt b/ext/session/tests/session_name_error.phpt
index ca01e9bb59..d6cb78c746 100644
--- a/ext/session/tests/session_name_error.phpt
+++ b/ext/session/tests/session_name_error.phpt
@@ -98,83 +98,6 @@ ob_end_flush();
 *** Testing session_name() : error functionality ***
 
 -- Iteration 1 --
-string(9) "PHPSESSID"
-
--- Iteration 2 --
-string(1) "0"
-
--- Iteration 3 --
-string(1) "1"
-
--- Iteration 4 --
-string(5) "12345"
-
--- Iteration 5 --
-string(5) "-2345"
-
--- Iteration 6 --
-string(4) "10.5"
-
--- Iteration 7 --
-string(5) "-10.5"
-
--- Iteration 8 --
-string(12) "123456789000"
-
--- Iteration 9 --
-string(13) "1.23456789E-9"
-
--- Iteration 10 --
-string(3) "0.5"
-
--- Iteration 11 --
-string(0) ""
-
--- Iteration 12 --
-string(0) ""
-
--- Iteration 13 --
-string(1) "1"
-
--- Iteration 14 --
-string(0) ""
-
--- Iteration 15 --
-string(1) "1"
-
--- Iteration 16 --
-string(0) ""
-
--- Iteration 17 --
-string(0) ""
-
--- Iteration 18 --
-string(0) ""
-
--- Iteration 19 --
-string(7) "Nothing"
-
--- Iteration 20 --
-string(7) "Nothing"
-
--- Iteration 21 --
-string(12) "Hello World!"
-
--- Iteration 22 --
-string(12) "Hello World!"
-
--- Iteration 23 --
-string(0) ""
-
--- Iteration 24 --
-
-Warning: session_name() expects parameter 1 to be string, resource given in %s on line %d
-NULL
-Done
---UEXPECTF--
-*** Testing session_name() : error functionality ***
-
--- Iteration 1 --
 unicode(9) "PHPSESSID"
 
 -- Iteration 2 --
diff --git a/ext/session/tests/session_name_variation1.phpt b/ext/session/tests/session_name_variation1.phpt
index 289d6ca3c7..930541e102 100644
--- a/ext/session/tests/session_name_variation1.phpt
+++ b/ext/session/tests/session_name_variation1.phpt
@@ -41,24 +41,6 @@ ob_end_flush();
 ?>
 --EXPECTF--
 *** Testing session_name() : variation ***
-string(9) "PHPSESSID"
-bool(true)
-string(0) ""
-bool(true)
-string(0) ""
-string(0) ""
-bool(true)
-string(1) "	"
-bool(true)
-string(1) "	"
-string(1) "	"
-bool(true)
-string(0) ""
-bool(true)
-string(0) ""
-Done
---UEXPECTF--
-*** Testing session_name() : variation ***
 unicode(9) "PHPSESSID"
 bool(true)
 unicode(0) ""
diff --git a/ext/session/tests/session_save_path_basic.phpt b/ext/session/tests/session_save_path_basic.phpt
index 47258f17a7..c7663f4a3e 100644
--- a/ext/session/tests/session_save_path_basic.phpt
+++ b/ext/session/tests/session_save_path_basic.phpt
@@ -29,12 +29,6 @@ ob_end_flush();
 ?>
 --EXPECTF--
 *** Testing session_save_path() : error functionality ***
-string(0) ""
-string(0) ""
-string(%d) "%s"
-Done
---UEXPECTF--
-*** Testing session_save_path() : error functionality ***
 unicode(0) ""
 unicode(0) ""
 unicode(%d) "%s"
diff --git a/ext/session/tests/session_save_path_error.phpt b/ext/session/tests/session_save_path_error.phpt
index 3e92597877..f2d19128e0 100644
--- a/ext/session/tests/session_save_path_error.phpt
+++ b/ext/session/tests/session_save_path_error.phpt
@@ -102,83 +102,6 @@ ob_end_flush();
 *** Testing session_save_path() : error functionality ***
 
 -- Iteration 1 --
-string(0) ""
-
--- Iteration 2 --
-string(1) "0"
-
--- Iteration 3 --
-string(1) "1"
-
--- Iteration 4 --
-string(5) "12345"
-
--- Iteration 5 --
-string(5) "-2345"
-
--- Iteration 6 --
-string(4) "10.5"
-
--- Iteration 7 --
-string(5) "-10.5"
-
--- Iteration 8 --
-string(12) "123456789000"
-
--- Iteration 9 --
-string(13) "1.23456789E-9"
-
--- Iteration 10 --
-string(3) "0.5"
-
--- Iteration 11 --
-string(0) ""
-
--- Iteration 12 --
-string(0) ""
-
--- Iteration 13 --
-string(1) "1"
-
--- Iteration 14 --
-string(0) ""
-
--- Iteration 15 --
-string(1) "1"
-
--- Iteration 16 --
-string(0) ""
-
--- Iteration 17 --
-string(0) ""
-
--- Iteration 18 --
-string(0) ""
-
--- Iteration 19 --
-string(7) "Nothing"
-
--- Iteration 20 --
-string(7) "Nothing"
-
--- Iteration 21 --
-string(12) "Hello World!"
-
--- Iteration 22 --
-string(12) "Hello World!"
-
--- Iteration 23 --
-string(0) ""
-
--- Iteration 24 --
-
-Warning: session_save_path() expects parameter 1 to be string, resource given in %s on line %d
-NULL
-Done
---UEXPECTF--
-*** Testing session_save_path() : error functionality ***
-
--- Iteration 1 --
 unicode(0) ""
 
 -- Iteration 2 --
diff --git a/ext/session/tests/session_save_path_variation1.phpt b/ext/session/tests/session_save_path_variation1.phpt
index b79902c347..a53a9b204d 100644
--- a/ext/session/tests/session_save_path_variation1.phpt
+++ b/ext/session/tests/session_save_path_variation1.phpt
@@ -33,16 +33,6 @@ ob_end_flush();
 ?>
 --EXPECTF--
 *** Testing session_save_path() : variation ***
-string(0) ""
-bool(true)
-string(0) ""
-string(0) ""
-string(%d) "%s"
-bool(true)
-string(%d) "%s"
-Done
---UEXPECTF--
-*** Testing session_save_path() : variation ***
 unicode(0) ""
 bool(true)
 unicode(0) ""
diff --git a/ext/session/tests/session_set_save_handler_basic.phpt b/ext/session/tests/session_set_save_handler_basic.phpt
index 366f9dc80c..4893e61854 100644
--- a/ext/session/tests/session_set_save_handler_basic.phpt
+++ b/ext/session/tests/session_set_save_handler_basic.phpt
@@ -50,52 +50,6 @@ ob_end_flush();
 --EXPECTF--
 *** Testing session_set_save_handler() : basic functionality ***
 
-string(5) "files"
-
-Warning: session_module_name(): Cannot find named PHP session module () in %s on line %d
-bool(false)
-
-Warning: session_module_name(): Cannot find named PHP session module (blah) in %s on line %d
-bool(false)
-
-Warning: session_module_name(): Cannot find named PHP session module (foo) in %s on line %d
-bool(false)
-Open [%s,PHPSESSID]
-Read [%s,%s]
-array(3) {
-  ["Blah"]=>
-  string(12) "Hello World!"
-  ["Foo"]=>
-  bool(false)
-  ["Guff"]=>
-  int(1234567890)
-}
-Write [%s,%s,Blah|S:12:"Hello World!";Foo|b:0;Guff|i:1234567890;]
-Close [%s,PHPSESSID]
-array(3) {
-  ["Blah"]=>
-  string(12) "Hello World!"
-  ["Foo"]=>
-  bool(false)
-  ["Guff"]=>
-  int(1234567890)
-}
-Starting session again..!
-Open [%s,PHPSESSID]
-Read [%s,%s]
-array(3) {
-  ["Blah"]=>
-  string(12) "Hello World!"
-  ["Foo"]=>
-  bool(false)
-  ["Guff"]=>
-  int(1234567890)
-}
-Write [%s,%s,Blah|S:12:"Hello World!";Foo|b:0;Guff|i:1234567890;]
-Close [%s,PHPSESSID]
---UEXPECTF--
-*** Testing session_set_save_handler() : basic functionality ***
-
 unicode(5) "files"
 
 Warning: session_module_name(): Cannot find named PHP session module () in %s on line %d
diff --git a/ext/standard/tests/array/compact_variation1.phpt b/ext/standard/tests/array/compact_variation1.phpt
index c41126e732..712ea738fd 100644
--- a/ext/standard/tests/array/compact_variation1.phpt
+++ b/ext/standard/tests/array/compact_variation1.phpt
@@ -34,33 +34,6 @@ echo "Done";
 
 Warning: compact(): recursion detected in %s on line %d
 array(1) {
-  ["a"]=>
-  int(1)
-}
-
-Warning: compact(): recursion detected in %s on line %d
-
-Warning: compact(): recursion detected in %s on line %d
-
-Warning: compact(): recursion detected in %s on line %d
-
-Warning: compact(): recursion detected in %s on line %d
-array(2) {
-  ["a"]=>
-  int(1)
-  ["b"]=>
-  int(2)
-}
-array(1) {
-  ["c"]=>
-  int(3)
-}
-Done
---UEXPECTF--
-*** Testing compact() : usage variations  - arrays containg references ***
-
-Warning: compact(): recursion detected in %s on line %d
-array(1) {
   [u"a"]=>
   int(1)
 }
@@ -82,4 +55,4 @@ array(1) {
   [u"c"]=>
   int(3)
 }
-Done
\ No newline at end of file
+Done
diff --git a/tests/basic/022.phpt b/tests/basic/022.phpt
index b3cdadd571..9f2155759e 100644
--- a/tests/basic/022.phpt
+++ b/tests/basic/022.phpt
@@ -6,7 +6,7 @@ cookie1=val1  ; cookie2=val2%20; cookie3=val 3.; cookie 4= value 4 %3B; cookie1=
 <?php
 var_dump($_COOKIE);
 ?>
---EXPECT--
+--EXPECTF--
 array(10) {
   [u"cookie1"]=>
   unicode(0) ""
diff --git a/tests/lang/bug44654.phpt b/tests/lang/bug44654.phpt
index 7e7f973d9d..be714e8acc 100755
--- a/tests/lang/bug44654.phpt
+++ b/tests/lang/bug44654.phpt
@@ -5,4 +5,4 @@ Bug #44654 (syntax error for #)
 <?php if (1) { ?>#<?php } ?>
 #<?php echo 1; ?>
 --EXPECT--
-##1
+#1##1
diff --git a/tests/lang/comments.phpt b/tests/lang/comments.phpt
index 365beffdd7..ca8b1d2aba 100644
--- a/tests/lang/comments.phpt
+++ b/tests/lang/comments.phpt
@@ -17,6 +17,7 @@ echo "\n";
 
 ?>
 --EXPECT--
+#teste
 #teste2
 #ola
 uhm # ah