mirrored from git://develop.git.wordpress.org/
-
Notifications
You must be signed in to change notification settings - Fork 2.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
HTML API: Fix extensibility of
WP_HTML_Processor::next_token().
Break out logic from the `next_token()` method into a private method which may call itself recursively. This allows for subclasses to override the `next_token()` method and be assured that each call to `next_token()` corresponds with the consumption of one single token. This also parallels how `WP_HTML_Tag_Processor::next_token()` wraps a private `base_class_next_token()` method. Props westonruter, jonsurrell. Fixes #62269. git-svn-id: https://develop.svn.wordpress.org/trunk@59285 602fd350-edb4-49c9-b593-d223f7449a82
- Loading branch information
1 parent
7456ab6
commit 6573ea6
Showing
3 changed files
with
286 additions
and
6 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
88 changes: 88 additions & 0 deletions
88
tests/phpunit/data/html-api/html-xpath-generating-processor.php
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,88 @@ | ||
| <?php | ||
|
|
||
| class HTML_XPath_Generating_Processor extends WP_HTML_Processor { | ||
|
|
||
| /** | ||
| * List of tokens that have already been seen. | ||
| * | ||
| * @var array<string, int> | ||
| */ | ||
| public $token_seen_count = array(); | ||
|
|
||
| /** | ||
| * Previous depth. | ||
| * | ||
| * @var int | ||
| */ | ||
| private $previous_depth = 0; | ||
|
|
||
| /** | ||
| * Open stack indices. | ||
| * | ||
| * @since n.e.x.t | ||
| * @var array<int, array{tag_name: string, index: int}> | ||
| */ | ||
| private $open_stack_indices = array(); | ||
|
|
||
| /** | ||
| * Gets XPath for the current open tag. | ||
| * | ||
| * @return string XPath. | ||
| */ | ||
| public function get_xpath(): string { | ||
| $xpath = ''; | ||
| foreach ( $this->open_stack_indices as $level ) { | ||
| $xpath .= sprintf( '/*[%d][self::%s]', $level['index'] + 1, $level['tag_name'] ); | ||
| } | ||
| return $xpath; | ||
| } | ||
|
|
||
| /** | ||
| * Gets next token. | ||
| * | ||
| * @return bool Whether next token was matched. | ||
| */ | ||
| public function next_token(): bool { | ||
| $result = parent::next_token(); | ||
| $current_depth = $this->get_current_depth(); | ||
| $current_tag = $this->get_tag(); | ||
|
|
||
| $current_depth--; // Because HTML starts at depth 1. | ||
|
|
||
| if ( $this->get_token_type() === '#tag' ) { | ||
| $token_name = ( $this->is_tag_closer() ? '-' : '+' ) . $current_tag; | ||
| } else { | ||
| $token_name = $this->get_token_name(); | ||
| } | ||
|
|
||
| if ( ! isset( $this->token_seen_count[ $token_name ] ) ) { | ||
| $this->token_seen_count[ $token_name ] = 1; | ||
| } else { | ||
| ++$this->token_seen_count[ $token_name ]; | ||
| } | ||
|
|
||
| if ( $this->get_token_type() === '#tag' && ! $this->is_tag_closer() ) { | ||
| if ( $current_depth < $this->previous_depth ) { | ||
| array_splice( | ||
| $this->open_stack_indices, | ||
| $current_depth + 1 | ||
| ); | ||
| } | ||
|
|
||
| if ( ! isset( $this->open_stack_indices[ $current_depth ] ) ) { | ||
| $this->open_stack_indices[ $current_depth ] = array( | ||
| 'tag_name' => $current_tag, | ||
| 'index' => 0, | ||
| ); | ||
| } else { | ||
| $this->open_stack_indices[ $current_depth ]['tag_name'] = $current_tag; | ||
| ++$this->open_stack_indices[ $current_depth ]['index']; | ||
| } | ||
|
|
||
| $this->previous_depth = $current_depth; | ||
| } | ||
|
|
||
| return $result; | ||
| } | ||
|
|
||
| } |
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