-
Notifications
You must be signed in to change notification settings - Fork 7.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- publicId could crash PHP if none was provided - notationName never worked The fields of this classs were untested. This new test file changes that. Closes GH-11779.
- Loading branch information
Showing
3 changed files
with
114 additions
and
9 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,100 @@ | ||
| --TEST-- | ||
| DOMEntity fields | ||
| --EXTENSIONS-- | ||
| dom | ||
| --FILE-- | ||
| <?php | ||
| $xmlString = <<<XML | ||
| <?xml version="1.0"?> | ||
| <!DOCTYPE test [ | ||
| <!ENTITY sampleInternalEntity "This is a sample entity value."> | ||
| <!ENTITY sampleExternalSystemWithNotationName SYSTEM "external.stuff" NDATA stuff> | ||
| <!ENTITY sampleExternalSystemWithoutNotationName SYSTEM "external.stuff" NDATA > | ||
| <!ENTITY sampleExternalPublicWithNotationName1 PUBLIC "public id" "external.stuff" NDATA stuff> | ||
| <!ENTITY sampleExternalPublicWithNotationName2 PUBLIC "" "external.stuff" NDATA stuff> | ||
| <!ENTITY sampleExternalPublicWithoutNotationName1 PUBLIC "public id" "external.stuff" NDATA > | ||
| <!ENTITY sampleExternalPublicWithoutNotationName2 PUBLIC "" "external.stuff" NDATA > | ||
| ]> | ||
| <root/> | ||
| XML; | ||
|
|
||
| $dom = new DOMDocument(); | ||
| $dom->loadXML($xmlString); | ||
|
|
||
| // Sort them, the iteration order isn't defined | ||
| $entities = iterator_to_array($dom->doctype->entities); | ||
| ksort($entities); | ||
|
|
||
| foreach ($entities as $entity) { | ||
| echo "Entity name: {$entity->nodeName}\n"; | ||
| echo "publicId: "; | ||
| var_dump($entity->publicId); | ||
| echo "systemId: "; | ||
| var_dump($entity->systemId); | ||
| echo "notationName: "; | ||
| var_dump($entity->notationName); | ||
| echo "actualEncoding: "; | ||
| var_dump($entity->actualEncoding); | ||
| echo "encoding: "; | ||
| var_dump($entity->encoding); | ||
| echo "version: "; | ||
| var_dump($entity->version); | ||
| echo "\n"; | ||
| } | ||
| ?> | ||
| --EXPECT-- | ||
| Entity name: sampleExternalPublicWithNotationName1 | ||
| publicId: string(9) "public id" | ||
| systemId: string(14) "external.stuff" | ||
| notationName: string(5) "stuff" | ||
| actualEncoding: NULL | ||
| encoding: NULL | ||
| version: NULL | ||
|
|
||
| Entity name: sampleExternalPublicWithNotationName2 | ||
| publicId: string(0) "" | ||
| systemId: string(14) "external.stuff" | ||
| notationName: string(5) "stuff" | ||
| actualEncoding: NULL | ||
| encoding: NULL | ||
| version: NULL | ||
|
|
||
| Entity name: sampleExternalPublicWithoutNotationName1 | ||
| publicId: string(9) "public id" | ||
| systemId: string(14) "external.stuff" | ||
| notationName: string(0) "" | ||
| actualEncoding: NULL | ||
| encoding: NULL | ||
| version: NULL | ||
|
|
||
| Entity name: sampleExternalPublicWithoutNotationName2 | ||
| publicId: string(0) "" | ||
| systemId: string(14) "external.stuff" | ||
| notationName: string(0) "" | ||
| actualEncoding: NULL | ||
| encoding: NULL | ||
| version: NULL | ||
|
|
||
| Entity name: sampleExternalSystemWithNotationName | ||
| publicId: NULL | ||
| systemId: string(14) "external.stuff" | ||
| notationName: string(5) "stuff" | ||
| actualEncoding: NULL | ||
| encoding: NULL | ||
| version: NULL | ||
|
|
||
| Entity name: sampleExternalSystemWithoutNotationName | ||
| publicId: NULL | ||
| systemId: string(14) "external.stuff" | ||
| notationName: string(0) "" | ||
| actualEncoding: NULL | ||
| encoding: NULL | ||
| version: NULL | ||
|
|
||
| Entity name: sampleInternalEntity | ||
| publicId: NULL | ||
| systemId: NULL | ||
| notationName: NULL | ||
| actualEncoding: NULL | ||
| encoding: NULL | ||
| version: NULL |