Skip to content
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.

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

Update the parameters name in WP_Block_List class to be consistent with ArrayAccess interface #5425

Closed
Closed
Changes from all commits
Commits
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
34 changes: 17 additions & 17 deletions src/wp-includes/class-wp-block-list.php
Original file line number Diff line number Diff line change
Expand Up @@ -63,59 +63,59 @@ public function __construct( $blocks, $available_context = array(), $registry =
}

/**
* Returns true if a block exists by the specified block index, or false
* Returns true if a block exists by the specified block offset, or false
* otherwise.
*
* @since 5.5.0
*
* @link https://www.php.net/manual/en/arrayaccess.offsetexists.php
*
* @param string $index Index of block to check.
* @param string $offset Offset of block to check for.
* @return bool Whether block exists.
*/
#[ReturnTypeWillChange]
public function offsetExists( $index ) {
return isset( $this->blocks[ $index ] );
public function offsetExists( $offset ) {
return isset( $this->blocks[ $offset ] );
}

/**
* Returns the value by the specified block index.
* Returns the value by the specified block offset.
*
* @since 5.5.0
*
* @link https://www.php.net/manual/en/arrayaccess.offsetget.php
*
* @param string $index Index of block value to retrieve.
* @param string $offset Offset of block value to retrieve.
* @return mixed|null Block value if exists, or null.
*/
#[ReturnTypeWillChange]
public function offsetGet( $index ) {
$block = $this->blocks[ $index ];
public function offsetGet( $offset ) {
$block = $this->blocks[ $offset ];

if ( isset( $block ) && is_array( $block ) ) {
$block = new WP_Block( $block, $this->available_context, $this->registry );
$this->blocks[ $index ] = $block;
$this->blocks[ $offset ] = $block;
}

return $block;
}

/**
* Assign a block value by the specified block index.
* Assign a block value by the specified block offset.
*
* @since 5.5.0
*
* @link https://www.php.net/manual/en/arrayaccess.offsetset.php
*
* @param string $index Index of block value to set.
* @param string $offset Offset of block value to set.
* @param mixed $value Block value.
*/
#[ReturnTypeWillChange]
public function offsetSet( $index, $value ) {
if ( is_null( $index ) ) {
public function offsetSet( $offset, $value ) {
if ( is_null( $offset ) ) {
$this->blocks[] = $value;
} else {
$this->blocks[ $index ] = $value;
$this->blocks[ $offset ] = $value;
}
}

Expand All @@ -126,11 +126,11 @@ public function offsetSet( $index, $value ) {
*
* @link https://www.php.net/manual/en/arrayaccess.offsetunset.php
*
* @param string $index Index of block value to unset.
* @param string $offset Offset of block value to unset.
*/
#[ReturnTypeWillChange]
public function offsetUnset( $index ) {
unset( $this->blocks[ $index ] );
public function offsetUnset( $offset ) {
unset( $this->blocks[ $offset ] );
}

/**
Expand Down
Loading