Keeping up with ZE changes to the function struct, fixed tests

diff --git a/ext/tidy/tests/001.phpt b/ext/tidy/tests/001.phpt
index 4be56d0403320b9621528c09d4d1abcccf3e9cc7..17da6f9874e1d876f903d02bfeb9f549824b6629 100644 (file)
--- a/ext/tidy/tests/001.phpt
+++ b/ext/tidy/tests/001.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Check for tidy presence
 --SKIPIF--
-<?php if (!extension_loaded("Tidy")) print "skip"; ?>
+<?php if (!extension_loaded("tidy")) print "skip"; ?>
 --POST--
 --GET--
 --INI--

diff --git a/ext/tidy/tests/002.phpt b/ext/tidy/tests/002.phpt
index b3fccffb3f2cb7d30a2e90288423fe31576bd5c3..b28b28410add643fe6e37fd776c594f00d0e99e6 100644 (file)
--- a/ext/tidy/tests/002.phpt
+++ b/ext/tidy/tests/002.phpt
@@ -1,7 +1,7 @@
 --TEST--
 tidy_parse_string()
 --SKIPIF--
-<?php if (!extension_loaded("Tidy")) print "skip"; ?>
+<?php if (!extension_loaded("tidy")) print "skip"; ?>
 --POST--
 --GET--
 --INI--

diff --git a/ext/tidy/tests/003.phpt b/ext/tidy/tests/003.phpt
index fe0fefc6888a9c8e713c8488acd290bebfdb9a3e..289198c5382373b8391768e416e467e6d69aa1cb 100644 (file)
--- a/ext/tidy/tests/003.phpt
+++ b/ext/tidy/tests/003.phpt
@@ -1,7 +1,7 @@
 --TEST--
 tidy_clean_repair()
 --SKIPIF--
-<?php if (!extension_loaded("Tidy")) print "skip"; ?>
+<?php if (!extension_loaded("tidy")) print "skip"; ?>
 --POST--
 --GET--
 --INI--

diff --git a/ext/tidy/tests/004.phpt b/ext/tidy/tests/004.phpt
index 930a2093c762bf17d141fbe212da71c2a9c3fedb..299c191dc6bca5a6073bd7f2833f7f2e9bac69fc 100644 (file)
--- a/ext/tidy/tests/004.phpt
+++ b/ext/tidy/tests/004.phpt
@@ -1,7 +1,7 @@
 --TEST--
 tidy_diagnose()
 --SKIPIF--
-<?php if (!extension_loaded("Tidy")) print "skip"; ?>
+<?php if (!extension_loaded("tidy")) print "skip"; ?>
 --POST--
 --GET--
 --INI--

diff --git a/ext/tidy/tests/005.phpt b/ext/tidy/tests/005.phpt
index 828bc148ea8e832fa18eda097f2c79011d4b41fa..c1ee50713c3199cc8aba83ee562ae3dba5a6575a 100644 (file)
--- a/ext/tidy/tests/005.phpt
+++ b/ext/tidy/tests/005.phpt
@@ -1,7 +1,7 @@
 --TEST--
 tidy_parse_file()
 --SKIPIF--
-<?php if (!extension_loaded("Tidy")) print "skip"; ?>
+<?php if (!extension_loaded("tidy")) print "skip"; ?>
 --POST--
 --GET--
 --INI--

diff --git a/ext/tidy/tests/006.phpt b/ext/tidy/tests/006.phpt
index 2ea27d38f41391ec3b3467de226372cb79813f5d..37f3ebb899ae29b617ca651eba17ed4723238f2e 100644 (file)
--- a/ext/tidy/tests/006.phpt
+++ b/ext/tidy/tests/006.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Verbose tidy_get_error_buffer()
 --SKIPIF--
-<?php if (!extension_loaded("Tidy")) print "skip"; ?>
+<?php if (!extension_loaded("tidy")) print "skip"; ?>
 --POST--
 --GET--
 --INI--

diff --git a/ext/tidy/tests/007.phpt b/ext/tidy/tests/007.phpt
index 7fcbb8f39c3f6229457e508186d4682e9fe0ad8c..f81853a29e8618a461ca326f67af17cddad65e29 100644 (file)
--- a/ext/tidy/tests/007.phpt
+++ b/ext/tidy/tests/007.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Verbose tidy_setopt() / tidy_getopt()
 --SKIPIF--
-<?php if (!extension_loaded("Tidy")) print "skip"; ?>
+<?php if (!extension_loaded("tidy")) print "skip"; ?>
 --POST--
 --GET--
 --INI--

diff --git a/ext/tidy/tidy.c b/ext/tidy/tidy.c
index ee0e84556b30adaadfeb723285f0cad321129b09..cd5a3b0a7849d9c8cc4626d6edb8b74cc796b9a5 100644 (file)
--- a/ext/tidy/tidy.c
+++ b/ext/tidy/tidy.c
@@ -1332,7 +1332,7 @@ PHP_FUNCTION(tidy_get_body) {
 
        f = emalloc(sizeof(zend_internal_function));
        f->type = ZEND_OVERLOADED_FUNCTION;
-       f->arg_types = NULL;
+       //f->arg_types = NULL;
        f->scope = php_tidy_ce;
        f->fn_flags = 0;
        f->function_name = estrndup(method, method_len);