Prevent SelfClosingSVGElements document filter from erroneously self-closing tags
#513
Conversation
This file contains hidden or 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
westonruter
commented
Mar 31, 2022
tests/Dom/DocumentTest.php
Outdated
| '<!DOCTYPE html><html>' . $head . '<body>' . PHP_EOL | ||
| . '<svg>' . PHP_EOL | ||
| . ' <g id="ok">' . PHP_EOL | ||
| . ' <path/>' . PHP_EOL |
Member
Author
There was a problem hiding this comment.
This is currently failing in assertSimilarMarkup:
1) AmpProject\Dom\DocumentTest::testSVGSelfClosingElements with data set "test g tag one path child and newlines" ('<!DOCTYPE html><html><head></.../html>', '<!DOCTYPE html><html><head><m.../html>')
Failed asserting that two arrays are equal.
--- Expected
+++ Actual
@@ @@
5 => '<body>'
6 => '<svg>'
7 => '<g id="ok">'
- 8 => '<path/>'
+ 8 => '<path>'
9 => '</g>'
10 => '</svg>'
11 => '</body>'
12 => '</html>'
)
Member
Author
There was a problem hiding this comment.
Addressed in cb091ed by using assertEqualMarkup instead of assertSimilarMarkup.
Member
Author
|
@schlessera Once this is merged, can a 0.11.0 release be made so we can include it in AMP plugin v2.2.2? |
westonruter
commented
Mar 31, 2022
|
|
||
| if (null === $regexPattern) { | ||
| $regexPattern = '#<(' . implode('|', self::SELF_CLOSING_TAGS) . ')((?>\s+[^/>]*))/?>(?!.*</\1>)#i'; | ||
| $regexPattern = '#<(' . implode('|', self::SELF_CLOSING_TAGS) . ')((?>\s*[^/>]*))/?>(?!.*</\1>)#is'; |
Member
Author
There was a problem hiding this comment.
Previously .* would stop processing once it got to the end of a line. Now it will continue on to the end of the document. So that is something to be wary of.
ediamin
approved these changes
Apr 1, 2022
schlessera
approved these changes
Apr 1, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #512
Ensures that
SelfClosingSVGElementswill properly process:<path/>as opposed to<path />).