--- pr-38.wordpress.master.PSR2.Methods.FunctionCallSignature.diff 2024-01-17 14:43:38.464684561 +0000 +++ pr-38.wordpress.whitespace-incompatibility.PSR2.Methods.FunctionCallSignature.diff 2024-01-17 14:59:16.923867562 +0000 @@ -83536,7 +83536,7 @@ } diff --git a/wp-admin/includes/class-pclzip.php b/wp-admin/includes/class-pclzip.php -index 963f31178c..108549d0f6 100644 +index 963f31178c..25379c1972 100644 --- a/wp-admin/includes/class-pclzip.php +++ b/wp-admin/includes/class-pclzip.php @@ -27,7 +27,7 @@ @@ -83746,8 +83746,8 @@ - "Invalid number / type of arguments"); + PclZip::privErrorLog( + PCLZIP_ERR_INVALID_PARAMETER, -+ "Invalid number / type of arguments" -+ ); ++ "Invalid number / type of arguments" ++ ); return 0; } } @@ -83761,10 +83761,10 @@ - $v_supported_attributes); + $v_result = $this->privFileDescrParseAtt( + $v_entry, -+ $v_filedescr_list[], -+ $v_options, -+ $v_supported_attributes -+ ); ++ $v_filedescr_list[], ++ $v_options, ++ $v_supported_attributes ++ ); if ($v_result != 1) { return 0; } @@ -83802,10 +83802,10 @@ - $v_supported_attributes); + $v_result = $this->privFileDescrParseAtt( + $v_entry, -+ $v_filedescr_list[], -+ $v_options, -+ $v_supported_attributes -+ ); ++ $v_filedescr_list[], ++ $v_options, ++ $v_supported_attributes ++ ); if ($v_result != 1) { return 0; } @@ -83898,12 +83898,12 @@ + $v_arg_list, + $v_size, + $v_options, -+ array (PCLZIP_OPT_BY_NAME => 'optional', ++ array (PCLZIP_OPT_BY_NAME => 'optional', PCLZIP_OPT_BY_EREG => 'optional', PCLZIP_OPT_BY_PREG => 'optional', - PCLZIP_OPT_BY_INDEX => 'optional' )); -+ PCLZIP_OPT_BY_INDEX => 'optional' ) -+ ); ++ PCLZIP_OPT_BY_INDEX => 'optional' ) ++ ); if ($v_result != 1) { return 0; } @@ -83948,9 +83948,9 @@ - .$p_options_list[$i]."'"); + PclZip::privErrorLog( + PCLZIP_ERR_INVALID_PARAMETER, -+ "Unknown parameter '" -+ .$p_options_list[$i]."'" -+ ); ++ "Unknown parameter '" ++ .$p_options_list[$i]."'" ++ ); // ----- Return return PclZip::errorCode(); @@ -83962,8 +83962,8 @@ - "Unknown parameter '".$v_key."'"); + PclZip::privErrorLog( + PCLZIP_ERR_INVALID_PARAMETER, -+ "Unknown parameter '".$v_key."'" -+ ); ++ "Unknown parameter '".$v_key."'" ++ ); // ----- Return return PclZip::errorCode(); @@ -84098,11 +84098,11 @@ - "Filename '".$v_header['stored_filename']."' is " + PclZip::privErrorLog( + PCLZIP_ERR_UNSUPPORTED_COMPRESSION, -+ "Filename '".$v_header['stored_filename']."' is " ++ "Filename '".$v_header['stored_filename']."' is " ."compressed by an unsupported compression " - ."method (".$v_header['compression'].") "); -+ ."method (".$v_header['compression'].") " -+ ); ++ ."method (".$v_header['compression'].") " ++ ); return PclZip::errorCode(); } @@ -84114,11 +84114,11 @@ - "Unsupported encryption for " + PclZip::privErrorLog( + PCLZIP_ERR_UNSUPPORTED_ENCRYPTION, -+ "Unsupported encryption for " ++ "Unsupported encryption for " ." filename '".$v_header['stored_filename'] - ."'"); -+ ."'" -+ ); ++ ."'" ++ ); return PclZip::errorCode(); } @@ -84130,8 +84130,8 @@ - $p_file_list[$v_nb_extracted++]); + $v_result = $this->privConvertHeader2FileInfo( + $v_header, -+ $p_file_list[$v_nb_extracted++] -+ ); ++ $p_file_list[$v_nb_extracted++] ++ ); if ($v_result != 1) { $this->privCloseFd(); $this->privSwapBackMagicQuotes(); @@ -84145,11 +84145,11 @@ - $p_options); + $v_result1 = $this->privExtractFile( + $v_header, -+ $p_path, ++ $p_path, + $p_remove_path, -+ $p_remove_all_path, -+ $p_options -+ ); ++ $p_remove_all_path, ++ $p_options ++ ); if ($v_result1 < 1) { $this->privCloseFd(); $this->privSwapBackMagicQuotes(); @@ -84161,8 +84161,8 @@ - $p_entry['filename']); + = PclZipUtilPathInclusion( + $p_options[PCLZIP_OPT_EXTRACT_DIR_RESTRICTION], -+ $p_entry['filename'] -+ ); ++ $p_entry['filename'] ++ ); if ($v_inclusion == 0) { - PclZip::privErrorLog(PCLZIP_ERR_DIRECTORY_RESTRICTION, @@ -84230,9 +84230,9 @@ - .' Some trailing bytes exists after the archive.'); + PclZip::privErrorLog( + PCLZIP_ERR_BAD_FORMAT, -+ 'The central dir is not at the end of the archive.' -+ .' Some trailing bytes exists after the archive.' -+ ); ++ 'The central dir is not at the end of the archive.' ++ .' Some trailing bytes exists after the archive.' ++ ); // ----- Return return PclZip::errorCode(); @@ -320781,7 +320781,7 @@ } diff --git a/wp-includes/ID3/module.audio-video.matroska.php b/wp-includes/ID3/module.audio-video.matroska.php -index eb5febf433..fd447fc344 100644 +index eb5febf433..b4481b8878 100644 --- a/wp-includes/ID3/module.audio-video.matroska.php +++ b/wp-includes/ID3/module.audio-video.matroska.php @@ -1047,7 +1047,8 @@ class getid3_matroska extends getid3_handler @@ -320789,7 +320789,7 @@ $attachedfile_entry['FileName'], $attachedfile_entry['data_offset'], - $attachedfile_entry['data_length']); -+ $attachedfile_entry['data_length'] ++ $attachedfile_entry['data_length'] + ); $this->current_offset = $sub_subelement['end']; @@ -320844,7 +320844,7 @@ case 3: // 14-bit little-endian $fhBS .= substr(getid3_lib::BigEndian2Bin(strrev(substr($DTSheader, $word_offset, 2))), 2, 14); diff --git a/wp-includes/ID3/module.audio.flac.php b/wp-includes/ID3/module.audio.flac.php -index 014061da94..d1b96ea4df 100644 +index 014061da94..f507d625f3 100644 --- a/wp-includes/ID3/module.audio.flac.php +++ b/wp-includes/ID3/module.audio.flac.php @@ -423,7 +423,8 @@ class getid3_flac extends getid3_handler @@ -320852,13 +320852,13 @@ $this->ftell(), $picture['datalength'], - $picture['image_mime']); -+ $picture['image_mime'] ++ $picture['image_mime'] + ); } $info['flac']['PICTURE'][] = $picture; diff --git a/wp-includes/ID3/module.audio.mp3.php b/wp-includes/ID3/module.audio.mp3.php -index 0d8fee3e5d..bca1016aa2 100644 +index 0d8fee3e5d..a1873fd917 100644 --- a/wp-includes/ID3/module.audio.mp3.php +++ b/wp-includes/ID3/module.audio.mp3.php @@ -1358,7 +1358,8 @@ class getid3_mp3 extends getid3_handler @@ -320866,7 +320866,7 @@ $LongMPEGlayerLookup[$head4], $LongMPEGpaddingLookup[$head4], - $LongMPEGfrequencyLookup[$head4]); -+ $LongMPEGfrequencyLookup[$head4] ++ $LongMPEGfrequencyLookup[$head4] + ); } if ($MPEGaudioHeaderLengthCache[$head4] > 4) { @@ -322619,7 +322619,7 @@ return true; } diff --git a/wp-includes/atomlib.php b/wp-includes/atomlib.php -index 90f6282243..0dc60416bd 100644 +index 90f6282243..281145681d 100644 --- a/wp-includes/atomlib.php +++ b/wp-includes/atomlib.php @@ -147,8 +147,8 @@ class AtomParser { @@ -322652,13 +322652,12 @@ function xml_escape($content) { - return str_replace(array('&','"',"'",'<','>'), -- array('&','"',''','<','>'), -- $content ); + return str_replace( + array('&','"',"'",'<','>'), -+ array('&','"',''','<','>'), -+ $content -+ ); + array('&','"',''','<','>'), +- $content ); ++ $content ++ ); } } diff --git a/wp-includes/author-template.php b/wp-includes/author-template.php @@ -484676,7 +484675,7 @@ -unset( $filter, $action ); +unset($filter, $action); diff --git a/wp-includes/deprecated.php b/wp-includes/deprecated.php -index e63708f91b..c0496fd5e8 100644 +index e63708f91b..7344caf2a9 100644 --- a/wp-includes/deprecated.php +++ b/wp-includes/deprecated.php @@ -23,7 +23,7 @@ @@ -484908,7 +484907,7 @@ + 'hide_empty', + 'use_desc_for_title', + 'children', -+ 'child_of', ++ 'child_of', + 'categories', + 'recurse', + 'feed', @@ -576135,7 +576134,7 @@ +_deprecated_file(basename(__FILE__), '2.1.0', WPINC . '/rss.php'); require_once ABSPATH . WPINC . '/rss.php'; diff --git a/wp-includes/rss.php b/wp-includes/rss.php -index 6d8941ab38..f09972ba58 100644 +index 6d8941ab38..b83c195d54 100644 --- a/wp-includes/rss.php +++ b/wp-includes/rss.php @@ -16,7 +16,7 @@ @@ -576292,28 +576291,28 @@ if ( $this->initem ) { $this->concat( - $this->current_item[ $this->current_namespace ][ $el ], $text); -+ $this->current_item[ $this->current_namespace ][ $el ], ++ $this->current_item[ $this->current_namespace ][ $el ], + $text + ); } elseif ($this->inchannel) { $this->concat( - $this->channel[ $this->current_namespace][ $el ], $text ); -+ $this->channel[ $this->current_namespace][ $el ], ++ $this->channel[ $this->current_namespace][ $el ], + $text + ); } elseif ($this->intextinput) { $this->concat( - $this->textinput[ $this->current_namespace][ $el ], $text ); -+ $this->textinput[ $this->current_namespace][ $el ], ++ $this->textinput[ $this->current_namespace][ $el ], + $text + ); } elseif ($this->inimage) { $this->concat( - $this->image[ $this->current_namespace ][ $el ], $text ); -+ $this->image[ $this->current_namespace ][ $el ], ++ $this->image[ $this->current_namespace ][ $el ], + $text + ); } @@ -576322,28 +576321,28 @@ if ( $this->initem ) { $this->concat( - $this->current_item[ $el ], $text); -+ $this->current_item[ $el ], ++ $this->current_item[ $el ], + $text + ); } elseif ($this->intextinput) { $this->concat( - $this->textinput[ $el ], $text ); -+ $this->textinput[ $el ], ++ $this->textinput[ $el ], + $text + ); } elseif ($this->inimage) { $this->concat( - $this->image[ $el ], $text ); -+ $this->image[ $el ], ++ $this->image[ $el ], + $text + ); } elseif ($this->inchannel) { $this->concat( - $this->channel[ $el ], $text ); -+ $this->channel[ $el ], ++ $this->channel[ $el ], + $text + ); }