Skip to content
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

Jump to bottom

Block supports: Restore root DOMDocument save #25028

Merged
merged 10 commits into from
Sep 7, 2020
Merged

Block supports: Restore root DOMDocument save #25028

merged 10 commits into from
Sep 7, 2020

Commits on Sep 7, 2020

  1. Revert "Save DOMDocument node instead of root + str_replace (#25020)" 

    This reverts commit 2473c1d.
    @sirreal
    sirreal committed Sep 7, 2020
    Configuration menu
    Copy the full SHA
    e196e5b View commit details
    Browse the repository at this point in the history

  2. Trim whitespace from saved DOMDocument HTML

    @sirreal
    sirreal committed Sep 7, 2020
    Configuration menu
    Copy the full SHA
    160750d View commit details
    Browse the repository at this point in the history

  3. Restore surrounding whitespace test

    @sirreal
    sirreal committed Sep 7, 2020
    Configuration menu
    Copy the full SHA
    dafd065 View commit details
    Browse the repository at this point in the history

  4. Add appended HTML test

    @sirreal
    sirreal committed Sep 7, 2020
    Configuration menu
    Copy the full SHA
    b92b7ef View commit details
    Browse the repository at this point in the history

  5. Concatenate body childNodes 

    It will be fragile to match exact strings to be removed from a saved
DOMDocument. It's already been observed that this introduces extraneous
newlines and other document normalization could change the strings we
expect to match.

Instead of matching some HTML strings to remove, concatenate the
children of the document body element in order to produce the expected
HTML.

Noted in #25028 (comment)
    @sirreal
    sirreal committed Sep 7, 2020
    Configuration menu
    Copy the full SHA
    502fc60 View commit details
    Browse the repository at this point in the history

  6. Access body element directly via id attribute

    @sirreal
    sirreal committed Sep 7, 2020
    Configuration menu
    Copy the full SHA
    9b8c367 View commit details
    Browse the repository at this point in the history

  7. Use ->documentElement->lastChild to get body

    @sirreal
    sirreal committed Sep 7, 2020
    Configuration menu
    Copy the full SHA
    de01660 View commit details
    Browse the repository at this point in the history

  8. Ensure block_root is a DOMElement

    @sirreal
    sirreal committed Sep 7, 2020
    Configuration menu
    Copy the full SHA
    e7b97fa View commit details
    Browse the repository at this point in the history

  9. Use DOMXpath to query children elements

    @sirreal
    sirreal committed Sep 7, 2020
    Configuration menu
    Copy the full SHA
    0dd6260 View commit details
    Browse the repository at this point in the history

  10. Add text-only render test

    @sirreal
    sirreal committed Sep 7, 2020
    Configuration menu
    Copy the full SHA
    be9c52c View commit details
    Browse the repository at this point in the history