chregu Sat Nov 29 08:01:19 2003 EDT
Modified files:
/php-src/ext/xsl/tests prepare.inc xslt.xsl xslt011.phpt
xslt011.xml xslt011.xsl
Log:
fixed wrong check
Index: php-src/ext/xsl/tests/prepare.inc
diff -u php-src/ext/xsl/tests/prepare.inc:1.1 php-src/ext/xsl/tests/prepare.inc:1.2
--- php-src/ext/xsl/tests/prepare.inc:1.1 Mon Oct 27 03:46:55 2003
+++ php-src/ext/xsl/tests/prepare.inc Sat Nov 29 08:01:19 2003
@@ -12,7 +12,7 @@
exit;
}
$proc = new xsltprocessor;
-if(!$xsl) {
+if(!$proc) {
echo "Error while making xsltprocessor object\n";
exit;
}
Index: php-src/ext/xsl/tests/xslt.xsl
diff -u php-src/ext/xsl/tests/xslt.xsl:1.1 php-src/ext/xsl/tests/xslt.xsl:1.2
--- php-src/ext/xsl/tests/xslt.xsl:1.1 Mon Oct 27 03:46:55 2003
+++ php-src/ext/xsl/tests/xslt.xsl Sat Nov 29 08:01:19 2003
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Id: xslt.xsl,v 1.1 2003/10/27 08:46:55 chregu Exp $ -->
+<!-- $Id: xslt.xsl,v 1.2 2003/11/29 13:01:19 chregu Exp $ -->
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"; >
+
<xsl:output method="xml" encoding="iso-8859-1" indent="no"/>
<xsl:param name="foo" select="'bar'"/>
<xsl:template match="/">
Index: php-src/ext/xsl/tests/xslt011.phpt
diff -u php-src/ext/xsl/tests/xslt011.phpt:1.1 php-src/ext/xsl/tests/xslt011.phpt:1.2
--- php-src/ext/xsl/tests/xslt011.phpt:1.1 Fri Nov 28 17:08:16 2003
+++ php-src/ext/xsl/tests/xslt011.phpt Sat Nov 29 08:01:19 2003
@@ -5,6 +5,10 @@
--FILE--
<?php
print "Test 11: php:function Support\n";
+ Class foo {
+ function foo() {}
+ function __toString() { return "not a DomNode object";}
+ }
$dom = new domDocument();
$dom->load(dirname(__FILE__)."/xslt011.xsl");
@@ -13,7 +17,6 @@
$xml = new DomDocument();
$xml->load(dirname(__FILE__)."/xslt011.xml");
-
print $proc->transformToXml($xml);
function foobar($id ) {
if (is_array($id)) {
@@ -22,8 +25,23 @@
return $id;
}
}
+ function nodeSet($id = null) {
+ if ($id and is_array($id)) {
+ return $id[0];
+ } else {
+ $dom = new domdocument;
+ $dom->loadXML("<root>this is from an external DomDocument</root>");
+ return $dom->documentElement ;
+ }
+ }
+ function nonDomNode() {
+ return new foo();
+ }
--EXPECT--
Test 11: php:function Support
<?xml version="1.0"?>
foobar
foobar
+this is from an external DomDocument
+from the Input Document
+not a DomNode object
Index: php-src/ext/xsl/tests/xslt011.xml
diff -u php-src/ext/xsl/tests/xslt011.xml:1.1 php-src/ext/xsl/tests/xslt011.xml:1.2
--- php-src/ext/xsl/tests/xslt011.xml:1.1 Fri Nov 28 17:08:16 2003
+++ php-src/ext/xsl/tests/xslt011.xml Sat Nov 29 08:01:19 2003
@@ -1 +1 @@
-<doc id="foobar"></doc>
+<doc id="foobar">This is <i>from the Input Document</i></doc>
Index: php-src/ext/xsl/tests/xslt011.xsl
diff -u php-src/ext/xsl/tests/xslt011.xsl:1.1 php-src/ext/xsl/tests/xslt011.xsl:1.2
--- php-src/ext/xsl/tests/xslt011.xsl:1.1 Fri Nov 28 17:08:16 2003
+++ php-src/ext/xsl/tests/xslt011.xsl Sat Nov 29 08:01:19 2003
@@ -8,5 +8,14 @@
<xsl:text>
</xsl:text>
<xsl:value-of select="php:function('foobar', /doc/@id)"/>
+<xsl:text>
+</xsl:text>
+<xsl:value-of select="php:function('nodeSet')"/>
+<xsl:text>
+</xsl:text>
+<xsl:value-of select="php:function('nodeSet',/doc)/i"/>
+<xsl:text>
+</xsl:text>
+<xsl:value-of select="php:function('nonDomNode')"/>
</xsl:template>
</xsl:stylesheet>
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
