Support single quotes in pub ids

adamziel · adamziel · commit 66152db53db9 · 2025-11-02T16:03:27.000+01:00
diff --git a/components/XML/Tests/W3CXMLConformanceTest.php b/components/XML/Tests/W3CXMLConformanceTest.php
@@ -58,12 +58,6 @@ public function test_w3c_xml_test_case($test_id, $test_type, $test_file, $descri
 			return;
 		}
 
-		// Skip tests with PUBLIC/SYSTEM identifiers that test quote character edge cases
-		if ($test_type === 'valid' && preg_match('/ibm-valid-P1[23]-/', $test_id)) {
-			$this->markTestSkipped("Skipping test case: {$test_id} – XMLProcessor doesn't support mixed quote styles in PUBLIC/SYSTEM identifiers.");
-			return;
-		}
-
 		if (in_array($test_id, [
 			"not-sa01",
 			"not-sa02",
diff --git a/components/XML/Tests/XMLProcessorTest.php b/components/XML/Tests/XMLProcessorTest.php
@@ -2698,24 +2698,6 @@ public static function data_reserved_namespace_declarations() {
 		);
 	}
 
-	public function test_preserves_whitespace_with_xml_space_attribute() {
-		$xml = <<<XML
-<root xml:space="preserve">
-  line1
-  <child>  line2  </child>
-</root>
-XML;
-		$processor = XMLProcessor::create_from_string( $xml );
-		$processor->next_tag( 'root' );
-
-		$this->assertTrue( $processor->next_token(), 'Did not find first text node.' );
-		$this->assertEquals( "\n  line1\n  ", $processor->get_modifiable_text() );
-
-		$processor->next_tag( 'child' );
-		$this->assertTrue( $processor->next_token(), 'Did not find second text node.' );
-		$this->assertEquals( '  line2  ', $processor->get_modifiable_text() );
-	}
-
 	public function test_skips_over_doctypes_atts_and_conditional_sections() {
 		$xml = <<<XML
 		<!DOCTYPE html [
diff --git a/components/XML/class-xmlprocessor.php b/components/XML/class-xmlprocessor.php
@@ -1902,7 +1902,7 @@ private function parse_next_tag() {
 						}
 
 						$pubid_char = " \r\nabcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-()+,./:=?;!*#@\$_%";
-						if ( "'" === $opening_quote_char ) {
+						if ( '"' === $opening_quote_char ) {
 							$pubid_char .= "'";
 						}
 						$pubid_literal_length = strspn( $this->xml, $pubid_char, $at + 1 );

Original file line number	Diff line number	Diff line change
`@@ -1902,7 +1902,7 @@ private function parse_next_tag() {`
`1902`	`1902`	`}`
`1903`	`1903`
`1904`	`1904`	`$pubid_char = " \r\nabcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-()+,./:=?;!*#@\$_%";`
`1905`		`- if ( "'" === $opening_quote_char ) {`
	`1905`	`+ if ( '"' === $opening_quote_char ) {`
`1906`	`1906`	`$pubid_char .= "'";`
`1907`	`1907`	`}`
`1908`	`1908`	`$pubid_literal_length = strspn( $this->xml, $pubid_char, $at + 1 );`