From: Shein Alexey <shein@php.net>
Date: Fri, 2 Sep 2011 18:01:20 +0000 (+0000)
Subject: Synchronized fixed tests from 5.3 branch.
X-Git-Tag: php-5.5.0alpha1~1367
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=712628c47cf3bd7539a570ad442d4d9b8d9eef29;p=php

Synchronized fixed tests from 5.3 branch.
---

diff --git a/ext/xsl/tests/xsltprocessor_registerPHPFunctions-funcnostring.phpt b/ext/xsl/tests/xsltprocessor_registerPHPFunctions-funcnostring.phpt
index 90d9c68208..d5d99f9224 100644
--- a/ext/xsl/tests/xsltprocessor_registerPHPFunctions-funcnostring.phpt
+++ b/ext/xsl/tests/xsltprocessor_registerPHPFunctions-funcnostring.phpt
@@ -21,10 +21,17 @@ if(!$phpfuncxsl) {
 $proc->importStylesheet($phpfuncxsl);
 var_dump($proc->registerPHPFunctions());
 var_dump($proc->transformToXml($dom));
+?>
 --EXPECTF--
 NULL
 
 Warning: XSLTProcessor::transformToXml(): Handler name must be a string in %s on line %d
+
+Warning: XSLTProcessor::transformToXml(): xmlXPathCompiledEval: evaluation failed in %s on line %d
+
+Warning: XSLTProcessor::transformToXml(): runtime error: file %s line %d element value-of in %s on line %d
+
+Warning: XSLTProcessor::transformToXml(): XPath evaluation returned no result. in %s on line %d
 NULL
 --CREDITS--
 Christian Weiske, cweiske@php.net
diff --git a/ext/xsl/tests/xsltprocessor_registerPHPFunctions-funcundef.phpt b/ext/xsl/tests/xsltprocessor_registerPHPFunctions-funcundef.phpt
index a26c210333..a91e6459db 100644
--- a/ext/xsl/tests/xsltprocessor_registerPHPFunctions-funcundef.phpt
+++ b/ext/xsl/tests/xsltprocessor_registerPHPFunctions-funcundef.phpt
@@ -20,10 +20,17 @@ if(!$phpfuncxsl) {
 $proc->importStylesheet($phpfuncxsl);
 var_dump($proc->registerPHPFunctions());
 var_dump($proc->transformToXml($dom));
+?>
 --EXPECTF--
 NULL
 
 Warning: XSLTProcessor::transformToXml(): Unable to call handler undefinedfunc() in %s on line %d
+
+Warning: XSLTProcessor::transformToXml(): xmlXPathCompiledEval: evaluation failed in %s on line %d
+
+Warning: XSLTProcessor::transformToXml(): runtime error: file %s line %d element value-of in %s on line %d
+
+Warning: XSLTProcessor::transformToXml(): XPath evaluation returned no result. in %s on line %d
 NULL
 --CREDITS--
 Christian Weiske, cweiske@php.net