Skip to content

Commit 0f2fadb

Browse files
authored
Merge pull request #2553 from WordPress/feature/update-minimum-wp-version
Update the `minimum_wp_version` to WP 6.5
2 parents 5428700 + a926a36 commit 0f2fadb

File tree

6 files changed

+18
-21
lines changed

6 files changed

+18
-21
lines changed

WordPress/Helpers/MinimumWPVersionTrait.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ trait MinimumWPVersionTrait {
7979
*
8080
* @var string WordPress version.
8181
*/
82-
private $default_minimum_wp_version = '6.2';
82+
private $default_minimum_wp_version = '6.5';
8383

8484
/**
8585
* Overrule the minimum supported WordPress version with a command-line/config value.

WordPress/Tests/WP/DeprecatedClassesUnitTest.inc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ $json = new Services_JSON;
2323
$json = new Services_JSON_Error;
2424
class Prefix_Menu_section extends WP_Privacy_Data_Export_Requests_Table {}
2525
WP_Privacy_Data_Removal_Requests_Table::foo();
26+
/* ============ WP 6.4 ============ */
27+
WP_Http_Curl::do_something();
28+
$streams = new WP_Http_Streams();
2629

2730
/*
2831
* Warning
2932
*/
30-
/* ============ WP 6.4 ============ */
31-
WP_Http_Curl::do_something();
32-
$streams = new WP_Http_Streams();

WordPress/Tests/WP/DeprecatedClassesUnitTest.php

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@ final class DeprecatedClassesUnitTest extends AbstractSniffUnitTest {
2828
*/
2929
public function getErrorList() {
3030
$start_line = 9;
31-
$end_line = 25;
31+
$end_line = 28;
3232
$errors = array_fill( $start_line, ( ( $end_line - $start_line ) + 1 ), 1 );
3333

3434
// Unset the lines related to version comments.
35-
unset( $errors[16], $errors[18], $errors[21] );
35+
unset( $errors[16], $errors[18], $errors[21], $errors[26] );
3636

3737
return $errors;
3838
}
@@ -43,9 +43,6 @@ public function getErrorList() {
4343
* @return array<int, int> Key is the line number, value is the number of expected warnings.
4444
*/
4545
public function getWarningList() {
46-
return array(
47-
31 => 1,
48-
32 => 1,
49-
);
46+
return array();
5047
}
5148
}

WordPress/Tests/WP/DeprecatedFunctionsUnitTest.inc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -380,10 +380,6 @@ install_global_terms();
380380
sync_category_tag_slugs();
381381
wp_get_attachment_thumb_file();
382382
wp_typography_get_css_variable_inline_style();
383-
384-
/*
385-
* Warning.
386-
*/
387383
/* ============ WP 6.2 ============ */
388384
_resolve_home_block_template();
389385
get_page_by_title();
@@ -422,6 +418,10 @@ the_block_template_skip_link();
422418
wp_admin_bar_header();
423419
wp_img_tag_add_decoding_attr();
424420
wp_update_https_detection_errors();
421+
422+
/*
423+
* Warning.
424+
*/
425425
/* ============ WP 6.5 ============ */
426426
block_core_file_ensure_interactivity_dependency();
427427
block_core_image_ensure_interactivity_dependency();

WordPress/Tests/WP/DeprecatedFunctionsUnitTest.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ final class DeprecatedFunctionsUnitTest extends AbstractSniffUnitTest {
2828
*/
2929
public function getErrorList() {
3030
$start_line = 8;
31-
$end_line = 382;
31+
$end_line = 420;
3232
$errors = array_fill( $start_line, ( ( $end_line - $start_line ) + 1 ), 1 );
3333

3434
// Unset the lines related to version comments.
@@ -77,7 +77,10 @@ public function getErrorList() {
7777
$errors[363],
7878
$errors[369],
7979
$errors[371],
80-
$errors[373]
80+
$errors[373],
81+
$errors[383],
82+
$errors[386],
83+
$errors[410]
8184
);
8285

8386
return $errors;
@@ -89,15 +92,12 @@ public function getErrorList() {
8992
* @return array<int, int> Key is the line number, value is the number of expected warnings.
9093
*/
9194
public function getWarningList() {
92-
$start_line = 388;
95+
$start_line = 426;
9396
$end_line = 443;
9497
$warnings = array_fill( $start_line, ( ( $end_line - $start_line ) + 1 ), 1 );
9598

9699
// Unset the lines related to version comments.
97100
unset(
98-
$warnings[390],
99-
$warnings[414],
100-
$warnings[425],
101101
$warnings[429],
102102
$warnings[432],
103103
$warnings[442]

WordPress/Tests/WP/DeprecatedParametersUnitTest.inc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,6 @@ wp_upload_bits( '', 'deprecated' );
9696
xfn_check( '', '', 'deprecated' );
9797
global_terms( $foo, 'deprecated' );
9898

99-
// All will give an WARNING as they have been deprecated after WP 6.2.
99+
// All will give an WARNING as they have been deprecated after WP 6.5.
100100
inject_ignored_hooked_blocks_metadata_attributes('', 'deprecated');
101101
wp_render_elements_support_styles('deprecated');

0 commit comments

Comments
 (0)