Skip to content

Conversation

@pharixces
Copy link
Contributor

When using newlines within htmltags the regular expression used doesn't account for newlines, this pull request aims to fix this issue.

Copy link
Member

@jschroed91 jschroed91 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Have a question for you here, I haven't though fully through it so curious on your thoughts

$text = str_replace("\xc2\xa0", ' ', $text);

preg_match_all('/<.+?>|[^<]+/mu', $text, $sentencesAndTags, PREG_SPLIT_NO_EMPTY);
preg_match_all('/<[^>]+?>|[^<]+/mu', $text, $sentencesAndTags, PREG_SPLIT_NO_EMPTY);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Alternatively we could add the s (PCRE_DOTALL) modifier so that the dot would match newlines as well.

However, this might seem more clear? Are there situations where this change would actually affect the outcome in a negative way?

I think it's technically allowed to have > within an attribute value of an HTML tag...

<div data-some-value="1 > 0">

that's technically valid I think?

So are we better off adding the s modifier to solve this instead?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've tested all regexes (current, mine, yours) with the example you provided and they all break the tag in the data-some-value contents. So this is currently a problem and i dont know how to fix this particular issue.

However, i do agree the dotall modifier is more clear, i will change the merge request to use that.

@pharixces pharixces requested a review from jschroed91 November 6, 2023 11:07
@jschroed91 jschroed91 merged commit acd361c into caxy:master Jan 22, 2025
christian-kolb pushed a commit to vera-contracts/php-htmldiff that referenced this pull request Mar 21, 2025
* Correctly match newlines in tags. * Revert regex to current implementation while adding the PCRE_DOTALL modifier. --------- Co-authored-by: Anne Zijlstra <a.zijlstra@iwink.nl>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

2 participants