Skip to content

[XMLProcessor] Tolerate standalone="true" #206

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: skip-dtd
Choose a base branch
from
+1 −19
Open

[XMLProcessor] Tolerate standalone="true" #206

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 1 addition & 11 deletions components/XML/Tests/W3CXMLConformanceTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,21 +59,11 @@ public function test_w3c_xml_test_case($test_id, $test_type, $test_file, $descri
}

if (in_array($test_id, [
"not-sa01",
"not-sa02",
"not-sa03",
"not-sa04",
"sa04",
"ibm-valid-P01-ibm01v01.xml",
"ibm-valid-P32-ibm32v01.xml",
"ibm-valid-P32-ibm32v02.xml",
"ibm-valid-P32-ibm32v03.xml",
"ibm-valid-P32-ibm32v04.xml",
"ibm-valid-P68-ibm68v02.xml",
"ibm-valid-P69-ibm69v01.xml",
"ibm-valid-P69-ibm69v02.xml",
])) {
$this->markTestSkipped("Skipping test case: {$test_id} – XMLProcessor does not support standalone documents");
$this->markTestSkipped("Skipping test case: {$test_id} – XMLProcessor does not support custom processing directive targets (e.g. <?music ... ?>)");
return;
}

Expand Down
8 changes: 0 additions & 8 deletions components/XML/class-xmlprocessor.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
* – XML 1.0
* – Well-formed
* – UTF-8 encoded
* – Not standalone (so can use external entities)
* – No external DTD subset expansion (external entities may exist but are not fetched).
*
* XML 1.1 is explicitly not a design goal here. Version 1.1 is
Expand Down Expand Up @@ -2073,13 +2072,6 @@ private function parse_next_tag() {
return false;
}

if ( null !== $this->get_qualified_attribute( 'standalone' )
&& 'YES' !== strtoupper( $this->get_qualified_attribute( 'standalone' ) )
) {
$this->bail( 'Standalone XML documents are not supported.', self::ERROR_UNSUPPORTED );
return false;
}

$at = $this->bytes_already_parsed;

// Skip whitespace.
Expand Down