[BlockMarkupProcessor] Preserve self-closing block style when rewriting URLs #191
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
adamziel
commented
Oct 10, 2025
| '<!-- wp:image {"sources": ["small.png", "large.png"] } /-->' | ||
| ); | ||
| $this->assertTrue( $p->next_token(), 'Failed to find the block opener' ); | ||
| $this->assertTrue( $p->next_block_attribute(), 'Failed to find the first block attribute' ); |
Collaborator
Author
There was a problem hiding this comment.
We only really have a single block attribute, I'll rename this method to something more sensible such as next_array_entry_in_current_block_attribute() or so in a follow-up PR.
adamziel
added a commit
to WordPress/wordpress-importer
that referenced
this pull request
Oct 10, 2025
Backports [php-toolkit PR 191](WordPress/php-toolkit#191): Before this PR, `BlockMarkupProcessor` (and `BlockMarkupUrlProcessor`) would lose the self-closing solidus when rewriting block attributes: ```php $p = new BlockMarkupUrlProcessor( '<!-- wp:navigation-link {"url": "https://w.org"} /-->' ); $p->next_url(); $p->set_url('https://new-site.org', WPURL::parse('https://new-site.org')); echo $p->__toString(); // <!-- wp:navigation-link {"url": "https://new-site.org"} --> ``` With this PR, the self-closing solidus is preserved: ```php $p = new BlockMarkupUrlProcessor( '<!-- wp:navigation-link {"url": "https://w.org"} /-->' ); $p->next_url(); $p->set_url('https://new-site.org', WPURL::parse('https://new-site.org')); echo $p->__toString(); // <!-- wp:navigation-link {"url": "https://new-site.org"} /--> ``` ## Testing instructions CI – the php-toolkit PR has its own tests and this WordPress importer PR also comes with an additional check to ensure self-closing blocks are preserved.
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.
Before this PR,
BlockMarkupProcessor(andBlockMarkupUrlProcessor) would lose the self-closing solidus when rewriting block attributes:With this PR, the self-closing solidus is preserved:
Testing instructions
CI – I've added two more test cases to prevent regressions.