sergiotarxz
/
Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Build tools: Fix the `grunt format:php` build. 

Re-add variable that was removed on accident by [44359]. Also run `grunt format:php` to adjust the code style.
.--This line, and those below, will be ignored--

M    Gruntfile.js
M    src/index.php
M    src/wp-admin/index.php
M    src/wp-includes/class-wp-block-parser.php


git-svn-id: https://develop.svn.wordpress.org/trunk@44360 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Anton Timmermans 2018-12-24 13:44:05 +00:00
parent d2d7243e80
commit 68dd26a4c0
4 changed files with 72 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Gruntfile.js
View File

@ -25,7 +25,10 @@ module.exports = function(grunt) {
'wp-content/plugins/index.php', 'wp-content/plugins/index.php',
'wp-content/plugins/hello.php', 'wp-content/plugins/hello.php',
'wp-content/plugins/akismet/**' 'wp-content/plugins/akismet/**'
]; ],
changedFiles = {
php: []
};
if ( 'watch:phpunit' === grunt.cli.tasks[ 0 ] && ! phpUnitWatchGroup ) { if ( 'watch:phpunit' === grunt.cli.tasks[ 0 ] && ! phpUnitWatchGroup ) {
grunt.log.writeln(); grunt.log.writeln();

18
src/index.php
View File

@ -36,25 +36,25 @@ $die = sprintf(
'WordPress' 'WordPress'
) . '</p>'; ) . '</p>';
$die .= '<p>' . __( 'Before running any grunt tasks you need to make sure the dependencies are installed. You can install these by running '); $die .= '<p>' . __( 'Before running any grunt tasks you need to make sure the dependencies are installed. You can install these by running ' );
$die .= '<code style="color: green;">npm install</code>.</p>'; $die .= '<code style="color: green;">npm install</code>.</p>';
$die .= '<ul>'; $die .= '<ul>';
$die .= '<li>' . sprintf( $die .= '<li>' . sprintf(
/* translators: %s: WordPress */ /* translators: %s: WordPress */
__( 'To build %s while developing run:' ), __( 'To build %s while developing run:' ),
'WordPress' 'WordPress'
) . '<br /><br />'; ) . '<br /><br />';
$die .= '<code style="color: green;">grunt build --dev</code></li>'; $die .= '<code style="color: green;">grunt build --dev</code></li>';
$die .= '<li>' . sprintf( $die .= '<li>' . sprintf(
__( 'To build files automatically when changing the source files run:' ), __( 'To build files automatically when changing the source files run:' ),
'WordPress' 'WordPress'
) . '<br /><br />'; ) . '<br /><br />';
$die .= '<code style="color: green;">grunt watch</code></li>'; $die .= '<code style="color: green;">grunt watch</code></li>';
$die .= '<li>' . sprintf( $die .= '<li>' . sprintf(
__( 'To create a production build of %s run:' ), __( 'To create a production build of %s run:' ),
'WordPress' 'WordPress'
) . '<br /><br />'; ) . '<br /><br />';
$die .= '<code style="color: green;">grunt build</code></li>'; $die .= '<code style="color: green;">grunt build</code></li>';
$die .= '</ul>'; $die .= '</ul>';

26
src/wp-admin/index.php
View File

@ -36,25 +36,25 @@ $die = sprintf(
'WordPress' 'WordPress'
) . '</p>'; ) . '</p>';
$die .= '<p>' . __( 'Before running any grunt tasks you need to make sure the dependencies are installed. You can install these by running '); $die .= '<p>' . __( 'Before running any grunt tasks you need to make sure the dependencies are installed. You can install these by running ' );
$die .= '<code style="color: green;">npm install</code>.</p>'; $die .= '<code style="color: green;">npm install</code>.</p>';
$die .= '<ul>'; $die .= '<ul>';
$die .= '<li>' . sprintf( $die .= '<li>' . sprintf(
/* translators: %s: WordPress */ /* translators: %s: WordPress */
__( 'To build %s while developing run:' ), __( 'To build %s while developing run:' ),
'WordPress' 'WordPress'
) . '<br /><br />'; ) . '<br /><br />';
$die .= '<code style="color: green;">grunt build --dev</code></li>'; $die .= '<code style="color: green;">grunt build --dev</code></li>';
$die .= '<li>' . sprintf( $die .= '<li>' . sprintf(
__( 'To build files automatically when changing the source files run:' ), __( 'To build files automatically when changing the source files run:' ),
'WordPress' 'WordPress'
) . '<br /><br />'; ) . '<br /><br />';
$die .= '<code style="color: green;">grunt watch</code></li>'; $die .= '<code style="color: green;">grunt watch</code></li>';
$die .= '<li>' . sprintf( $die .= '<li>' . sprintf(
__( 'To create a production build of %s run:' ), __( 'To create a production build of %s run:' ),
'WordPress' 'WordPress'
) . '<br /><br />'; ) . '<br /><br />';
$die .= '<code style="color: green;">grunt build</code></li>'; $die .= '<code style="color: green;">grunt build</code></li>';
$die .= '</ul>'; $die .= '</ul>';
@ -62,9 +62,9 @@ $die .= '</ul>';
$die .= '<p>' . sprintf( $die .= '<p>' . sprintf(
/* translators: %1$s: NPM URL, %2$s: Grunt URL */ /* translators: %1$s: NPM URL, %2$s: Grunt URL */
__( 'This requires <a href="%1$s">NPM</a> and <a href="%2$s">Grunt</a>. <a href="%3$s">Read more about setting up your local development environment</a>.' ), __( 'This requires <a href="%1$s">NPM</a> and <a href="%2$s">Grunt</a>. <a href="%3$s">Read more about setting up your local development environment</a>.' ),
'https://www.npmjs.com/', 'https://www.npmjs.com/',
'https://gruntjs.com/', 'https://gruntjs.com/',
__( 'https://make.wordpress.org/core/handbook/tutorials/installing-wordpress-locally/' ) __( 'https://make.wordpress.org/core/handbook/tutorials/installing-wordpress-locally/' )
) . '</p>'; ) . '</p>';
wp_die( $die, __( 'WordPress &rsaquo; Error' ) ); wp_die( $die, __( 'WordPress &rsaquo; Error' ) );

85
src/wp-includes/class-wp-block-parser.php
View File

@ -63,10 +63,10 @@ class WP_Block_Parser_Block {
public $innerContent; public $innerContent;
function __construct( $name, $attrs, $innerBlocks, $innerHTML, $innerContent ) { function __construct( $name, $attrs, $innerBlocks, $innerHTML, $innerContent ) {
$this->blockName = $name; $this->blockName = $name;
$this->attrs = $attrs; $this->attrs = $attrs;
$this->innerBlocks = $innerBlocks; $this->innerBlocks = $innerBlocks;
$this->innerHTML = $innerHTML; $this->innerHTML = $innerHTML;
$this->innerContent = $innerContent; $this->innerContent = $innerContent;
} }
} }
@ -269,15 +269,17 @@ class WP_Block_Parser {
*/ */
if ( 0 === $stack_depth ) { if ( 0 === $stack_depth ) {
if ( isset( $leading_html_start ) ) { if ( isset( $leading_html_start ) ) {
$this->output[] = (array) self::freeform( substr( $this->output[] = (array) self::freeform(
$this->document, substr(
$leading_html_start, $this->document,
$start_offset - $leading_html_start $leading_html_start,
) ); $start_offset - $leading_html_start
)
);
} }
$this->output[] = (array) new WP_Block_Parser_Block( $block_name, $attrs, array(), '', array() ); $this->output[] = (array) new WP_Block_Parser_Block( $block_name, $attrs, array(), '', array() );
$this->offset = $start_offset + $token_length; $this->offset = $start_offset + $token_length;
return true; return true;
} }
@ -292,13 +294,16 @@ class WP_Block_Parser {
case 'block-opener': case 'block-opener':
// track all newly-opened blocks on the stack // track all newly-opened blocks on the stack
array_push( $this->stack, new WP_Block_Parser_Frame( array_push(
new WP_Block_Parser_Block( $block_name, $attrs, array(), '', array() ), $this->stack,
$start_offset, new WP_Block_Parser_Frame(
$token_length, new WP_Block_Parser_Block( $block_name, $attrs, array(), '', array() ),
$start_offset + $token_length, $start_offset,
$leading_html_start $token_length,
) ); $start_offset + $token_length,
$leading_html_start
)
);
$this->offset = $start_offset + $token_length; $this->offset = $start_offset + $token_length;
return true; return true;
@ -329,11 +334,11 @@ class WP_Block_Parser {
* otherwise we're nested and we have to close out the current * otherwise we're nested and we have to close out the current
* block and add it as a new innerBlock to the parent * block and add it as a new innerBlock to the parent
*/ */
$stack_top = array_pop( $this->stack ); $stack_top = array_pop( $this->stack );
$html = substr( $this->document, $stack_top->prev_offset, $start_offset - $stack_top->prev_offset ); $html = substr( $this->document, $stack_top->prev_offset, $start_offset - $stack_top->prev_offset );
$stack_top->block->innerHTML .= $html; $stack_top->block->innerHTML .= $html;
$stack_top->block->innerContent[] = $html; $stack_top->block->innerContent[] = $html;
$stack_top->prev_offset = $start_offset + $token_length; $stack_top->prev_offset = $start_offset + $token_length;
$this->add_inner_block( $this->add_inner_block(
$stack_top->block, $stack_top->block,
@ -391,22 +396,22 @@ class WP_Block_Parser {
return array( 'no-more-tokens', null, null, null, null ); return array( 'no-more-tokens', null, null, null, null );
} }
list( $match, $started_at ) = $matches[ 0 ]; list( $match, $started_at ) = $matches[0];
$length = strlen( $match ); $length = strlen( $match );
$is_closer = isset( $matches[ 'closer' ] ) && -1 !== $matches[ 'closer' ][ 1 ]; $is_closer = isset( $matches['closer'] ) && -1 !== $matches['closer'][1];
$is_void = isset( $matches[ 'void' ] ) && -1 !== $matches[ 'void' ][ 1 ]; $is_void = isset( $matches['void'] ) && -1 !== $matches['void'][1];
$namespace = $matches[ 'namespace' ]; $namespace = $matches['namespace'];
$namespace = ( isset( $namespace ) && -1 !== $namespace[ 1 ] ) ? $namespace[ 0 ] : 'core/'; $namespace = ( isset( $namespace ) && -1 !== $namespace[1] ) ? $namespace[0] : 'core/';
$name = $namespace . $matches[ 'name' ][ 0 ]; $name = $namespace . $matches['name'][0];
$has_attrs = isset( $matches[ 'attrs' ] ) && -1 !== $matches[ 'attrs' ][ 1 ]; $has_attrs = isset( $matches['attrs'] ) && -1 !== $matches['attrs'][1];
/* /*
* Fun fact! It's not trivial in PHP to create "an empty associative array" since all arrays * Fun fact! It's not trivial in PHP to create "an empty associative array" since all arrays
* are associative arrays. If we use `array()` we get a JSON `[]` * are associative arrays. If we use `array()` we get a JSON `[]`
*/ */
$attrs = $has_attrs $attrs = $has_attrs
? json_decode( $matches[ 'attrs' ][ 0 ], /* as-associative */ true ) ? json_decode( $matches['attrs'][0], /* as-associative */ true )
: $this->empty_attrs; : $this->empty_attrs;
/* /*
@ -471,17 +476,17 @@ class WP_Block_Parser {
* @param int|null $last_offset last byte offset into document if continuing form earlier output * @param int|null $last_offset last byte offset into document if continuing form earlier output
*/ */
function add_inner_block( WP_Block_Parser_Block $block, $token_start, $token_length, $last_offset = null ) { function add_inner_block( WP_Block_Parser_Block $block, $token_start, $token_length, $last_offset = null ) {
$parent = $this->stack[ count( $this->stack ) - 1 ]; $parent = $this->stack[ count( $this->stack ) - 1 ];
$parent->block->innerBlocks[] = (array) $block; $parent->block->innerBlocks[] = (array) $block;
$html = substr( $this->document, $parent->prev_offset, $token_start - $parent->prev_offset ); $html = substr( $this->document, $parent->prev_offset, $token_start - $parent->prev_offset );
if ( ! empty( $html ) ) { if ( ! empty( $html ) ) {
$parent->block->innerHTML .= $html; $parent->block->innerHTML .= $html;
$parent->block->innerContent[] = $html; $parent->block->innerContent[] = $html;
} }
$parent->block->innerContent[] = null; $parent->block->innerContent[] = null;
$parent->prev_offset = $last_offset ? $last_offset : $token_start + $token_length; $parent->prev_offset = $last_offset ? $last_offset : $token_start + $token_length;
} }
/** /**
@ -500,16 +505,18 @@ class WP_Block_Parser {
: substr( $this->document, $prev_offset ); : substr( $this->document, $prev_offset );
if ( ! empty( $html ) ) { if ( ! empty( $html ) ) {
$stack_top->block->innerHTML .= $html; $stack_top->block->innerHTML .= $html;
$stack_top->block->innerContent[] = $html; $stack_top->block->innerContent[] = $html;
} }
if ( isset( $stack_top->leading_html_start ) ) { if ( isset( $stack_top->leading_html_start ) ) {
$this->output[] = (array) self::freeform( substr( $this->output[] = (array) self::freeform(
$this->document, substr(
$stack_top->leading_html_start, $this->document,
$stack_top->token_start - $stack_top->leading_html_start $stack_top->leading_html_start,
) ); $stack_top->token_start - $stack_top->leading_html_start
)
);
} }
$this->output[] = (array) $stack_top->block; $this->output[] = (array) $stack_top->block;