Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-12-23 09:37:42 +01:00
Code Issues Projects Releases Wiki Activity

Code Modernization: Rename parameters that use reserved keywords in wp-admin/includes/class-wp-site-icon.php.

Browse Source 
While using reserved PHP keywords as parameter name labels is allowed, in the context of function calls using named parameters in PHP 8.0+, this will easily lead to confusion. To avoid that, it is recommended not to use reserved keywords as function parameter names.

This commit renames the `$object` variable to `$attachment` in `WP_Site_Icon::insert_attachment()` and updates the documentation accordingly.

Follow-up to [52946], [52996], [52997], [52998], [53003], [53014], [53029], [53039], [53116], [53117].

Props jrf, aristath, poena, justinahinon, SergeyBiryukov.
See #55327.
Built from https://develop.svn.wordpress.org/trunk@53137


git-svn-id: http://core.svn.wordpress.org/trunk@52726 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2022-04-11 14:21:09 +00:00
parent 8f35c61e7b
commit 3180ab2cef
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
wp-admin/includes/class-wp-site-icon.php
View File

@ -80,7 +80,7 @@ class WP_Site_Icon {
* *
* @param string $cropped Cropped image URL. * @param string $cropped Cropped image URL.
* @param int $parent_attachment_id Attachment ID of parent image. * @param int $parent_attachment_id Attachment ID of parent image.
* @return array Attachment object. * @return array An array with attachment object data.
*/ */
public function create_attachment_object( $cropped, $parent_attachment_id ) { public function create_attachment_object( $cropped, $parent_attachment_id ) {
$parent = get_post( $parent_attachment_id ); $parent = get_post( $parent_attachment_id );
@ -90,7 +90,7 @@ class WP_Site_Icon {
$size = wp_getimagesize( $cropped ); $size = wp_getimagesize( $cropped );
$image_type = ( $size ) ? $size['mime'] : 'image/jpeg'; $image_type = ( $size ) ? $size['mime'] : 'image/jpeg';
$object = array( $attachment = array(
'ID' => $parent_attachment_id, 'ID' => $parent_attachment_id,
'post_title' => wp_basename( $cropped ), 'post_title' => wp_basename( $cropped ),
'post_content' => $url, 'post_content' => $url,
@ -99,7 +99,7 @@ class WP_Site_Icon {
'context' => 'site-icon', 'context' => 'site-icon',
); );
return $object; return $attachment;
} }
/** /**
@ -107,12 +107,12 @@ class WP_Site_Icon {
* *
* @since 4.3.0 * @since 4.3.0
* *
* @param array $object Attachment object. * @param array $attachment An array with attachment object data.
* @param string $file File path of the attached image. * @param string $file File path of the attached image.
* @return int Attachment ID * @return int Attachment ID.
*/ */
public function insert_attachment( $object, $file ) { public function insert_attachment( $attachment, $file ) {
$attachment_id = wp_insert_attachment( $object, $file ); $attachment_id = wp_insert_attachment( $attachment, $file );
$metadata = wp_generate_attachment_metadata( $attachment_id, $file ); $metadata = wp_generate_attachment_metadata( $attachment_id, $file );
/** /**

2
wp-includes/version.php
View File

@ -16,7 +16,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '6.0-alpha-53136'; $wp_version = '6.0-alpha-53137';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.