Skip to content

Commit 7234539

Browse files
committed
cosmetic difference in expected error message in PHP4 vs PHP5... as such, split 004.phpt into two tests;
git-svn-id: https://svn.php.net/repository/pear/packages/XML_Parser/trunk@287131 c90b9560-bf6c-de11-be94-00142212c4b1
1 parent 2d97add commit 7234539

File tree

4 files changed

+44
-20
lines changed

4 files changed

+44
-20
lines changed

package.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ Furthermore its now possible to split the parser from the handler object, so you
6868
<file role="test" name="002.phpt"/>
6969
<file role="test" name="003.phpt"/>
7070
<file role="test" name="004.phpt"/>
71+
<file role="test" name="004b.phpt"/>
7172
<file role="test" name="005.phpt"/>
7273
<file role="test" name="AllTests.php"/>
7374
<file role="test" name="bug-9328.phpt"/>

package2.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ Furthermore its now possible to split the parser from the handler object, so you
7373
<file baseinstalldir="XML" name="002.phpt" role="test" />
7474
<file baseinstalldir="XML" name="003.phpt" role="test" />
7575
<file baseinstalldir="XML" name="004.phpt" role="test" />
76+
<file baseinstalldir="XML" name="004b.phpt" role="test" />
7677
<file baseinstalldir="XML" name="005.phpt" role="test" />
7778
<file baseinstalldir="XML" name="AllTests.php" role="test" />
7879
<file baseinstalldir="XML" name="bug-9328.phpt" role="test" />

tests/004.phpt

Lines changed: 16 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,26 @@
11
--TEST--
2-
XML Parser: error class
2+
XML Parser: error class (PHP4 behavior)
33
--SKIPIF--
4-
<?php if (!extension_loaded("xml")) echo 'skip'; ?>
5-
--FILE--
6-
<?php // -*- C++ -*-
7-
//
8-
// Test for: XML/Parser.php
9-
// Parts tested: - parser error class
10-
//
11-
chdir (dirname(__FILE__));
12-
if (file_exists('../Parser.php')) {
13-
require_once "../Parser.php";
14-
} else {
15-
require_once "XML/Parser.php";
4+
<?php
5+
if (version_compare(PHP_VERSION, '5.0.0', 'ge')) {
6+
print 'skip - test only applies to PHP4';
7+
}
8+
if (!extension_loaded('xml')) {
9+
print 'skip - xml extension not available';
1610
}
17-
18-
print "new XML_Parser ";
11+
?>
12+
--FILE--
13+
<?php
14+
require_once 'XML/Parser.php';
15+
print 'New XML_Parser: ';
1916
var_dump(strtolower(get_class($p = new XML_Parser())));
2017
$e = $p->parseString("<?xml version='1.0' ?>\n<foo></bar>", true);
2118
if (PEAR::isError($e)) {
22-
printf("error message: %s\n", $e->getMessage());
19+
printf("Error message: %s" . PHP_EOL, $e->getMessage());
2320
} else {
24-
print "no error\n";
21+
print "No error" . PHP_EOL;
2522
}
26-
2723
?>
2824
--EXPECT--
29-
new XML_Parser string(10) "xml_parser"
30-
error message: XML_Parser: Mismatched tag at XML input line 2:12
25+
New XML_Parser: string(10) "xml_parser"
26+
Error message: XML_Parser: mismatched tag at XML input line 2:7

tests/004b.phpt

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
--TEST--
2+
XML Parser: error class (PHP5 behavior)
3+
--SKIPIF--
4+
<?php
5+
if (version_compare(PHP_VERSION, '5.0.0', 'lt')) {
6+
print 'skip - test only applies to PHP5';
7+
}
8+
if (!extension_loaded('xml')) {
9+
print 'skip - xml extension not available';
10+
}
11+
?>
12+
--FILE--
13+
<?php
14+
require_once 'XML/Parser.php';
15+
print 'New XML_Parser: ';
16+
var_dump(strtolower(get_class($p = new XML_Parser())));
17+
$e = $p->parseString("<?xml version='1.0' ?>\n<foo></bar>", true);
18+
if (PEAR::isError($e)) {
19+
printf("Error message: %s" . PHP_EOL, $e->getMessage());
20+
} else {
21+
print "No error" . PHP_EOL;
22+
}
23+
?>
24+
--EXPECT--
25+
New XML_Parser: string(10) "xml_parser"
26+
Error message: XML_Parser: Mismatched tag at XML input line 2:12

0 commit comments

Comments
 (0)