helly Tue Oct 29 16:57:50 2002 EDT
Modified files:
/php4/ext/xslt/tests xslt_process-001.phpt xslt_set_object.phpt
xslt_setopt.phpt
Log:
-add reason to --SKIPIF--
-add magic_quotes_runtime to --INI--
--use var_dump()
Index: php4/ext/xslt/tests/xslt_process-001.phpt
diff -u php4/ext/xslt/tests/xslt_process-001.phpt:1.1
php4/ext/xslt/tests/xslt_process-001.phpt:1.2
--- php4/ext/xslt/tests/xslt_process-001.phpt:1.1 Fri Oct 25 15:17:15 2002
+++ php4/ext/xslt/tests/xslt_process-001.phpt Tue Oct 29 16:57:50 2002
@@ -4,9 +4,11 @@
<?php
include("skipif.inc");
if(!function_exists('utf8_encode')) {
- die("skip\n");
+ die("skip function utf8_encode() not available");
}
?>
+--INI--
+magic_quotes_runtime=0
--FILE--
<?php
error_reporting(E_ALL);
Index: php4/ext/xslt/tests/xslt_set_object.phpt
diff -u php4/ext/xslt/tests/xslt_set_object.phpt:1.1
php4/ext/xslt/tests/xslt_set_object.phpt:1.2
--- php4/ext/xslt/tests/xslt_set_object.phpt:1.1 Fri Oct 25 15:17:15 2002
+++ php4/ext/xslt/tests/xslt_set_object.phpt Tue Oct 29 16:57:50 2002
@@ -4,9 +4,11 @@
<?php
include("skipif.inc");
if(!function_exists('xslt_set_object')) {
- die("skip\n");
+ die("skip function xslt_set_object() not available");
}
?>
+--INI--
+magic_quotes_runtime=0
--FILE--
<?php
error_reporting(E_ALL);
Index: php4/ext/xslt/tests/xslt_setopt.phpt
diff -u php4/ext/xslt/tests/xslt_setopt.phpt:1.1
php4/ext/xslt/tests/xslt_setopt.phpt:1.2
--- php4/ext/xslt/tests/xslt_setopt.phpt:1.1 Fri Oct 25 15:17:15 2002
+++ php4/ext/xslt/tests/xslt_setopt.phpt Tue Oct 29 16:57:50 2002
@@ -4,14 +4,16 @@
<?php
include("skipif.inc");
if(!function_exists('xslt_setopt')) {
- die("skip\n");
+ die("skip function xslt_setopt() is not available\n");
}
?>
+--INI--
+magic_quotes_runtime=0
--FILE--
<?php
error_reporting(E_ALL);
-$xmlfile = 'ext/xslt/tests/public.xml';
-$xslfile = 'ext/xslt/tests/args.xsl';
+$xmlfile = dirname(__FILE__).'/public.xml';
+$xslfile = dirname(__FILE__).'/args.xsl';
$xh = xslt_create();
// Tell Sablotron to process public entities
@@ -26,22 +28,33 @@
// DEBUG: print $xslstring;
xslt_setopt($xh, XSLT_SABOPT_PARSE_PUBLIC_ENTITIES | XSLT_SABOPT_DISABLE_ADDING_META);
-$result_nometa = xslt_process($xh, $xmlfile, 'arg:/_xsl', NULL, array('/_xsl' =>
$xslstring));
-// DEBUG: print "$result_nometa\n";
+var_dump(xslt_process($xh, $xmlfile, 'arg:/_xsl', NULL, array('/_xsl' =>
+$xslstring)));
+
xslt_setopt($xh, XSLT_SABOPT_PARSE_PUBLIC_ENTITIES);
-$result_meta = xslt_process($xh, $xmlfile, 'arg:/_xsl', NULL, array('/_xsl' =>
$xslstring));
+var_dump(xslt_process($xh, $xmlfile, 'arg:/_xsl', NULL, array('/_xsl' =>
+$xslstring)));
// DEBUG: print "$result_meta\n";
-/* Also test if they're equal. That would mean, that disable-adding-meta is set to off
- at compile time and our call to xslt_setopt failed to reset that */
-if($result_meta != $result_nometa && FALSE === stristr($result_nometa, '<meta
http-equiv="Content-Type"'))
-{
- print "OK\n";
-}
-
xslt_free($xh);
?>
--EXPECT--
PHP QA�
-OK
+string(95) "<html>
+ <head>
+ <title>foo</title>
+ </head>
+ <body>
+ <p>PHP QA�</p>
+ </body>
+</html>
+"
+string(172) "<html>
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+ <title>foo</title>
+ </head>
+ <body>
+ <p>PHP QA�</p>
+ </body>
+</html>
+"
\ No newline at end of file
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
