Skip to content

Split class-wp-block-parser.php to multiple files #4152

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

Closed
aristath wants to merge 13 commits into from
Closed

Split class-wp-block-parser.php to multiple files #4152

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
dfcd0da
Split class-wp-block-parser.php to multiple files
aristath Mar 1, 2023
d2e9292
phpcs.xml.dist update
aristath Mar 1, 2023
d83f5d1
dash
aristath Mar 1, 2023
21220f3
preserve original order
aristath Mar 1, 2023
954b7ef
Merge branch 'trunk' into fix/multiple-classes-in-file
spacedmonkey Jun 12, 2023
665a068
Merge branch 'trunk' into fix/multiple-classes-in-file
spacedmonkey Jun 13, 2023
c546fa7
Merge branch 'trunk' into fix/multiple-classes-in-file
spacedmonkey Jun 19, 2023
c53afb5
Merge branch 'trunk' into fix/multiple-classes-in-file
peterwilsoncc Jun 20, 2023
7b79ce2
Remove require in wp-settings.php.
spacedmonkey Jun 20, 2023
d0e581f
Update package to copy the correct file name.
spacedmonkey Jun 20, 2023
72edbeb
Update package
spacedmonkey Jun 26, 2023
c50b9f9
Update files.
spacedmonkey Jun 26, 2023
c9b9e83
Require additional block parser class files in wp-settings.
peterwilsoncc Jun 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update files.
  • Loading branch information
@spacedmonkey
spacedmonkey committed Jun 26, 2023
commit c50b9f9c57abf429dcd790d5293df37e61a4e39e
28 changes: 14 additions & 14 deletions src/wp-includes/class-wp-block-parser-block.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ class WP_Block_Parser_Block {
* @since 5.0.0
* @var string
*/
public $blockName;
public $blockName; // phpcs:ignore WordPress.NamingConventions.ValidVariableName

/**
* Optional set of attributes from block comment delimiters
Expand All @@ -40,7 +40,7 @@ class WP_Block_Parser_Block {
* @since 5.0.0
* @var WP_Block_Parser_Block[]
*/
public $innerBlocks;
public $innerBlocks; // phpcs:ignore WordPress.NamingConventions.ValidVariableName

/**
* Resultant HTML from inside block comment delimiters
Expand All @@ -51,7 +51,7 @@ class WP_Block_Parser_Block {
* @since 5.0.0
* @var string
*/
public $innerHTML;
public $innerHTML; // phpcs:ignore WordPress.NamingConventions.ValidVariableName

/**
* List of string fragments and null markers where inner blocks were found
Expand All @@ -65,7 +65,7 @@ class WP_Block_Parser_Block {
* @since 4.2.0
* @var array
*/
public $innerContent;
public $innerContent; // phpcs:ignore WordPress.NamingConventions.ValidVariableName

/**
* Constructor.
Expand All @@ -74,17 +74,17 @@ class WP_Block_Parser_Block {
*
* @since 5.0.0
*
* @param string $name Name of block.
* @param array $attrs Optional set of attributes from block comment delimiters.
* @param array $innerBlocks List of inner blocks (of this same class).
* @param string $innerHTML Resultant HTML from inside block comment delimiters after removing inner blocks.
* @param array $innerContent List of string fragments and null markers where inner blocks were found.
* @param string $name Name of block.
* @param array $attrs Optional set of attributes from block comment delimiters.
* @param array $inner_blocks List of inner blocks (of this same class).
* @param string $inner_html Resultant HTML from inside block comment delimiters after removing inner blocks.
* @param array $inner_content List of string fragments and null markers where inner blocks were found.
*/
public function __construct( $name, $attrs, $innerBlocks, $innerHTML, $innerContent ) {
$this->blockName = $name;
public function __construct( $name, $attrs, $inner_blocks, $inner_html, $inner_content ) {
$this->blockName = $name; // phpcs:ignore WordPress.NamingConventions.ValidVariableName
$this->attrs = $attrs;
$this->innerBlocks = $innerBlocks;
$this->innerHTML = $innerHTML;
$this->innerContent = $innerContent;
$this->innerBlocks = $inner_blocks; // phpcs:ignore WordPress.NamingConventions.ValidVariableName
$this->innerHTML = $inner_html; // phpcs:ignore WordPress.NamingConventions.ValidVariableName
$this->innerContent = $inner_content; // phpcs:ignore WordPress.NamingConventions.ValidVariableName
}
}
6 changes: 3 additions & 3 deletions src/wp-includes/class-wp-block-parser.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,11 +314,11 @@ public function next_token() {
* @internal
* @since 3.9.0
*
* @param string $innerHTML HTML content of block.
* @param string $inner_html HTML content of block.
* @return WP_Block_Parser_Block freeform block object.
*/
public function freeform( $innerHTML ) {
return new WP_Block_Parser_Block( null, $this->empty_attrs, array(), $innerHTML, array( $innerHTML ) );
public function freeform( $inner_html ) {
return new WP_Block_Parser_Block( null, $this->empty_attrs, array(), $inner_html, array( $inner_html ) );
}

/**
Expand Down