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.

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

Update the minimum_wp_version to WP 5.8 #2121

Merged
merged 2 commits into from
Dec 4, 2022
Merged

Update the minimum_wp_version to WP 5.8 #2121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eba54de
Update the minimum_wp_version to WP 5.8
jrfnl Nov 26, 2022
d15462d
WP/DeprecatedFunctions: temporarily exclude one test on PHP 8.2
jrfnl Dec 4, 2022
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
8 changes: 4 additions & 4 deletions WordPress/Helpers/MinimumWPVersionTrait.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,15 +48,15 @@ trait MinimumWPVersionTrait {
* Example usage:
* <rule ref="WordPress.WP.DeprecatedClasses">
* <properties>
* <property name="minimum_wp_version" value="4.3"/>
* <property name="minimum_wp_version" value="4.9"/>
* </properties>
* </rule>
*
* Alternatively, the value can be passed in one go for all sniffs using it via
* the command line or by setting a `<config>` value in a custom phpcs.xml ruleset.
*
* CL: `phpcs --runtime-set minimum_wp_version 4.5`
* Ruleset: `<config name="minimum_wp_version" value="4.5"/>`
* CL: `phpcs --runtime-set minimum_wp_version 5.7`
* Ruleset: `<config name="minimum_wp_version" value="6.0"/>`
*
* @since 0.14.0 Previously the individual sniffs each contained this property.
* @since 3.0.0 - Moved from the Sniff class to this dedicated Trait.
Expand All @@ -68,7 +68,7 @@ trait MinimumWPVersionTrait {
*
* @var string WordPress version.
*/
public $minimum_wp_version = '5.1';
public $minimum_wp_version = '5.8';

/**
* Overrule the minimum supported WordPress version with a command-line/config value.
Expand Down
137 changes: 132 additions & 5 deletions WordPress/Sniffs/WP/DeprecatedFunctionsSniff.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -410,10 +410,6 @@ class DeprecatedFunctionsSniff extends AbstractFunctionRestrictionsSniff {
'alt' => 'wp_register_widget_control()',
'version' => '2.8.0',
),
'sanitize_url' => array(
'alt' => 'esc_url_raw()',
'version' => '2.8.0',
),
'the_author_aim' => array(
'alt' => 'the_author_meta(\'aim\')',
'version' => '2.8.0',
Expand Down Expand Up @@ -988,7 +984,7 @@ class DeprecatedFunctionsSniff extends AbstractFunctionRestrictionsSniff {
'version' => '3.5.0',
),
'wp_cache_reset' => array(
'alt' => 'WP_Object_Cache::reset()',
'alt' => 'wp_cache_switch_to_blog()',
'version' => '3.5.0',
),
'wp_create_thumbnail' => array(
Expand Down Expand Up @@ -1369,6 +1365,137 @@ class DeprecatedFunctionsSniff extends AbstractFunctionRestrictionsSniff {
'alt' => 'wp_get_user_request()',
'version' => '5.4.0',
),

// WP 5.5.0.
'_wp_register_meta_args_whitelist' => array(
'alt' => '_wp_register_meta_args_allowed_list()',
'version' => '5.5.0',
),
'add_option_whitelist' => array(
'alt' => 'add_allowed_options()',
'version' => '5.5.0',
),
'remove_option_whitelist' => array(
'alt' => 'remove_allowed_options()',
'version' => '5.5.0',
),
'wp_blacklist_check' => array(
'alt' => 'wp_check_comment_disallowed_list()',
'version' => '5.5.0',
),
'wp_make_content_images_responsive' => array(
'alt' => 'wp_filter_content_tags()',
'version' => '5.5.0',
),
'wp_unregister_GLOBALS' => array(
'alt' => '',
'version' => '5.5.0',
),

// WP 5.7.0.
'noindex' => array(
'alt' => 'wp_robots_noindex()',
'version' => '5.7.0',
),
'wp_no_robots' => array(
'alt' => 'wp_robots_no_robots()',
'version' => '5.7.0',
),
'wp_sensitive_page_meta' => array(
'alt' => 'wp_robots_sensitive_page()',
'version' => '5.7.0',
),

// WP 5.8.0.
'_excerpt_render_inner_columns_blocks' => array(
'alt' => '_excerpt_render_inner_blocks()',
'version' => '5.8.0',
),

// WP 5.9.0.
'readonly' => array(
'alt' => 'wp_readonly()',
'version' => '5.9.0',
),

// WP 5.9.1.
'wp_render_duotone_filter_preset' => array(
'alt' => 'wp_get_duotone_filter_property()',
'version' => '5.9.1',
),

// WP 6.0.0.
'image_attachment_fields_to_save' => array(
'alt' => '',
'version' => '6.0.0',
),
'wp_add_iframed_editor_assets_html' => array(
'alt' => '',
'version' => '6.0.0',
),
'wp_skip_border_serialization' => array(
'alt' => 'wp_should_skip_block_supports_serialization()',
'version' => '6.0.0',
),
'wp_skip_dimensions_serialization' => array(
'alt' => 'wp_should_skip_block_supports_serialization()',
'version' => '6.0.0',
),
'wp_skip_spacing_serialization' => array(
'alt' => 'wp_should_skip_block_supports_serialization()',
'version' => '6.0.0',
),

// WP 6.0.2.
'the_meta' => array(
'alt' => 'get_post_meta()',
'version' => '6.0.2',
),

// WP 6.0.3.
// Verified; see https://core.trac.wordpress.org/ticket/56791#comment:10.
'_filter_query_attachment_filenames' => array(
'alt' => 'add_filter( "wp_allow_query_attachment_by_filename", "__return_true" )',
'version' => '6.0.3',
),

// WP 6.1.0.
'_get_path_to_translation' => array(
'alt' => 'WP_Textdomain_Registry',
'version' => '6.1.0',
),
'_get_path_to_translation_from_lang_dir' => array(
'alt' => 'WP_Textdomain_Registry',
'version' => '6.1.0',
),
'_wp_multiple_block_styles' => array(
'alt' => '',
'version' => '6.1.0',
),
'global_terms' => array(
'alt' => '',
'version' => '6.1.0',
),
'global_terms_enabled' => array(
'alt' => '',
'version' => '6.1.0',
),
'install_global_terms' => array(
'alt' => '',
'version' => '6.1.0',
),
'sync_category_tag_slugs' => array(
'alt' => '',
'version' => '6.1.0',
),
'wp_get_attachment_thumb_file' => array(
'alt' => '',
'version' => '6.1.0',
),
'wp_typography_get_css_variable_inline_style' => array(
'alt' => 'wp_style_engine_get_styles()',
'version' => '6.1.0',
),
);

/**
Expand Down
4 changes: 0 additions & 4 deletions WordPress/Tests/WP/DeprecatedClassesUnitTest.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,5 @@ $a = (new WP_User_Search())->query();
/* ============ WP 4.9 ============ */
class Prefix_Menu_section extends Customize_New_Menu_Section {}
WP_Customize_New_Menu_Control::foo();

/*
* Warning.
*/
/* ============ WP 5.3 ============ */
$json = new Services_JSON;
8 changes: 5 additions & 3 deletions WordPress/Tests/WP/DeprecatedClassesUnitTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,12 @@ class DeprecatedClassesUnitTest extends AbstractSniffUnitTest {
* @return array <int line number> => <int number of errors>
*/
public function getErrorList() {
$errors = array_fill( 9, 10, 1 );
$start_line = 9;
$end_line = 20;
$errors = array_fill( $start_line, ( ( $end_line - $start_line ) + 1 ), 1 );

// Unset the lines related to version comments.
unset( $errors[16] );
unset( $errors[16], $errors[19] );

return $errors;
}
Expand All @@ -41,7 +43,7 @@ public function getErrorList() {
* @return array <int line number> => <int number of warnings>
*/
public function getWarningList() {
return array_fill( 24, 1, 1 );
return array();
}

}
47 changes: 42 additions & 5 deletions WordPress/Tests/WP/DeprecatedFunctionsUnitTest.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ get_the_author_yim();
js_escape();
register_sidebar_widget();
register_widget_control();
sanitize_url();
sanitize_url(); // Undeprecated as of WP 5.9. See #2031.
the_author_aim();
the_author_description();
the_author_email();
Expand Down Expand Up @@ -334,10 +334,6 @@ get_shortcut_link();
is_user_option_local();
wp_ajax_press_this_add_category();
wp_ajax_press_this_save_post();

/*
* Warning.
*/
/* ============ WP 5.1 ============ */
insert_blog();
install_blog();
Expand All @@ -347,3 +343,44 @@ _wp_privacy_requests_screen_options();
update_user_status();
/* ============ WP 5.4 ============ */
wp_get_user_request_data();
/* ============ WP 5.5 ============ */
_wp_register_meta_args_whitelist();
add_option_whitelist();
remove_option_whitelist();
wp_blacklist_check();
wp_make_content_images_responsive();
wp_unregister_GLOBALS();
/* ============ WP 5.7 ============ */
noindex();
wp_no_robots();
wp_sensitive_page_meta();

/*
* Warning.
*/
/* ============ WP 5.8 ============ */
_excerpt_render_inner_columns_blocks();
/* ============ WP 5.9 ============ */
readonly();
/* ============ WP 5.9.1 ============ */
wp_render_duotone_filter_preset();
/* ============ WP 6.0 ============ */
image_attachment_fields_to_save();
wp_add_iframed_editor_assets_html();
wp_skip_border_serialization();
wp_skip_dimensions_serialization();
wp_skip_spacing_serialization();
/* ============ WP 6.0.2 ============ */
the_meta();
/* ============ WP 6.0.3 ============ */
_filter_query_attachment_filenames();
/* ============ WP 6.1 ============ */
_get_path_to_translation();
_get_path_to_translation_from_lang_dir();
_wp_multiple_block_styles();
global_terms();
global_terms_enabled();
install_global_terms();
sync_category_tag_slugs();
wp_get_attachment_thumb_file();
wp_typography_get_css_variable_inline_style();
31 changes: 24 additions & 7 deletions WordPress/Tests/WP/DeprecatedFunctionsUnitTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,9 @@ class DeprecatedFunctionsUnitTest extends AbstractSniffUnitTest {
* @return array <int line number> => <int number of errors>
*/
public function getErrorList() {

$errors = array_fill( 8, 329, 1 );
$start_line = 8;
$end_line = 356;
$errors = array_fill( $start_line, ( ( $end_line - $start_line ) + 1 ), 1 );

// Unset the lines related to version comments.
unset(
Expand All @@ -43,6 +44,7 @@ public function getErrorList() {
$errors[73],
$errors[76],
$errors[80],
$errors[102], // Undeprecated function.
$errors[118],
$errors[125],
$errors[162],
Expand All @@ -63,7 +65,12 @@ public function getErrorList() {
$errors[319],
$errors[323],
$errors[330],
$errors[332]
$errors[332],
$errors[337],
$errors[340],
$errors[344],
$errors[346],
$errors[353]
);

return $errors;
Expand All @@ -75,15 +82,25 @@ public function getErrorList() {
* @return array <int line number> => <int number of warnings>
*/
public function getWarningList() {

$warnings = array_fill( 342, 8, 1 );
$start_line = 362;
$end_line = 386;
$warnings = array_fill( $start_line, ( ( $end_line - $start_line ) + 1 ), 1 );

// Unset the lines related to version comments.
unset(
$warnings[344],
$warnings[348]
$warnings[363],
$warnings[365],
$warnings[367],
$warnings[373],
$warnings[375],
$warnings[377]
);

// Temporarily until PHPCS supports PHP 8.2.
if ( PHP_VERSION_ID >= 80200 ) {
unset( $warnings[364] ); // Function call to readonly.
}

return $warnings;
}

Expand Down