Skip to content

Commit 3ef3f9d

Browse files
GaryJonesGaryJones
authored
Merge pull request #2652 from WordPress/feature/update-for-wp-6.9
2 parents 2e47aad + 5ffaf4a commit 3ef3f9d

12 files changed

+71
-18
lines changed

‎WordPress/Sniffs/NamingConventions/PrefixAllGlobalsSniff.php‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ final class PrefixAllGlobalsSniff extends AbstractFunctionParameterSniff {
149149
* Only overrulable constants are listed, i.e. those defined within core within
150150
* a `if ( ! defined() ) {}` wrapper.
151151
*
152-
* {@internal To be updated after every major release. Last updated for WordPress 6.8.1.}
152+
* {@internal To be updated after every major release. Last updated for WordPress 6.9.0-RC2.}
153153
*
154154
* @since 1.0.0
155155
* @since 3.0.0 Renamed from `$whitelisted_core_constants` to `$allowed_core_constants`.
@@ -203,7 +203,7 @@ final class PrefixAllGlobalsSniff extends AbstractFunctionParameterSniff {
203203
*
204204
* Note: deprecated functions should still be included in this list as plugins may support older WP versions.
205205
*
206-
* {@internal To be updated after every major release. Last updated for WordPress 6.8.1.}
206+
* {@internal To be updated after every major release. Last updated for WordPress 6.9.0-RC2.}
207207
*
208208
* @since 3.0.0.
209209
*
@@ -342,7 +342,11 @@ final class PrefixAllGlobalsSniff extends AbstractFunctionParameterSniff {
342342
'wp_cache_flush_group' => true,
343343
'wp_cache_flush_runtime' => true,
344344
'wp_cache_get_multiple' => true,
345+
'wp_cache_get_multiple_salted' => true,
346+
'wp_cache_get_salted' => true,
345347
'wp_cache_set_multiple' => true,
348+
'wp_cache_set_multiple_salted' => true,
349+
'wp_cache_set_salted' => true,
346350
'wp_cache_supports' => true,
347351
'wp_check_password' => true,
348352
'wp_clear_auth_cookie' => true,
@@ -392,7 +396,7 @@ final class PrefixAllGlobalsSniff extends AbstractFunctionParameterSniff {
392396
*
393397
* Note: deprecated classes should still be included in this list as plugins may support older WP versions.
394398
*
395-
* {@internal To be updated after every major release. Last updated for WordPress 6.8.1.}
399+
* {@internal To be updated after every major release. Last updated for WordPress 6.9.0-RC2.}
396400
*
397401
* @since 3.0.0.
398402
*
@@ -407,6 +411,7 @@ final class PrefixAllGlobalsSniff extends AbstractFunctionParameterSniff {
407411
'TwentyTwenty_Walker_Comment' => true,
408412
'TwentyTwenty_Walker_Page' => true,
409413
'Twenty_Twenty_One_Customize' => true,
414+
'WP_Block_Cloner' => true,
410415
'WP_User_Search' => true,
411416
'wp_atom_server' => true, // Deprecated.
412417
);

‎WordPress/Sniffs/NamingConventions/ValidPostTypeSlugSniff.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ final class ValidPostTypeSlugSniff extends AbstractFunctionParameterSniff {
6363
*
6464
* Source: {@link https://developer.wordpress.org/reference/functions/register_post_type/#reserved-post-types}
6565
*
66-
* {@internal To be updated after every major release. Last updated for WordPress 6.8.1.}
66+
* {@internal To be updated after every major release. Last updated for WordPress 6.9.0-RC2.}
6767
*
6868
* @since 2.2.0
6969
*

‎WordPress/Sniffs/WP/CapabilitiesSniff.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ final class CapabilitiesSniff extends AbstractFunctionParameterSniff {
173173
*
174174
* List is sorted alphabetically.
175175
*
176-
* {@internal To be updated after every major release. Last updated for WordPress 6.8.1.}
176+
* {@internal To be updated after every major release. Last updated for WordPress 6.9.0-RC2.}
177177
*
178178
* @since 3.0.0
179179
*

‎WordPress/Sniffs/WP/ClassNameCaseSniff.php‎

Lines changed: 30 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ final class ClassNameCaseSniff extends AbstractClassRestrictionsSniff {
2525
*
2626
* Note: this list will be enhanced in the class constructor.
2727
*
28-
* {@internal To be updated after every major release. Last updated for WordPress 6.8.1.}
28+
* {@internal To be updated after every major release. Last updated for WordPress 6.9.0-RC2.}
2929
*
3030
* @since 3.0.0
3131
*
@@ -115,6 +115,10 @@ final class ClassNameCaseSniff extends AbstractClassRestrictionsSniff {
115115
'Walker_Page',
116116
'Walker_PageDropdown',
117117
'WP',
118+
'WP_Abilities_Registry',
119+
'WP_Ability',
120+
'WP_Ability_Categories_Registry',
121+
'WP_Ability_Category',
118122
'WP_Admin_Bar',
119123
'WP_Ajax_Response',
120124
'WP_Ajax_Upgrader_Skin',
@@ -124,6 +128,7 @@ final class ClassNameCaseSniff extends AbstractClassRestrictionsSniff {
124128
'WP_Block',
125129
'WP_Block_Bindings_Registry',
126130
'WP_Block_Bindings_Source',
131+
'WP_Block_Cloner',
127132
'WP_Block_Editor_Context',
128133
'WP_Block_List',
129134
'WP_Block_Metadata_Registry',
@@ -132,6 +137,7 @@ final class ClassNameCaseSniff extends AbstractClassRestrictionsSniff {
132137
'WP_Block_Parser_Frame',
133138
'WP_Block_Pattern_Categories_Registry',
134139
'WP_Block_Patterns_Registry',
140+
'WP_Block_Processor',
135141
'WP_Block_Styles_Registry',
136142
'WP_Block_Supports',
137143
'WP_Block_Template',
@@ -269,6 +275,9 @@ final class ClassNameCaseSniff extends AbstractClassRestrictionsSniff {
269275
'WP_Privacy_Policy_Content',
270276
'WP_Privacy_Requests_Table',
271277
'WP_Query',
278+
'WP_REST_Abilities_V1_Categories_Controller',
279+
'WP_REST_Abilities_V1_List_Controller',
280+
'WP_REST_Abilities_V1_Run_Controller',
272281
'WP_REST_Application_Passwords_Controller',
273282
'WP_REST_Attachments_Controller',
274283
'WP_REST_Autosaves_Controller',
@@ -423,7 +432,7 @@ final class ClassNameCaseSniff extends AbstractClassRestrictionsSniff {
423432
*
424433
* Note: this list will be enhanced in the class constructor.
425434
*
426-
* {@internal To be updated after every major release. Last updated for WordPress 6.8.1.}
435+
* {@internal To be updated after every major release. Last updated for WordPress 6.9.0-RC2.}
427436
*
428437
* @since 3.0.0
429438
*
@@ -455,7 +464,7 @@ final class ClassNameCaseSniff extends AbstractClassRestrictionsSniff {
455464
*
456465
* Note: this list will be enhanced in the class constructor.
457466
*
458-
* {@internal To be updated after every major release. Last updated for WordPress 6.8.1.}
467+
* {@internal To be updated after every major release. Last updated for WordPress 6.9.0-RC2.}
459468
*
460469
* @since 3.1.0
461470
*
@@ -477,7 +486,7 @@ final class ClassNameCaseSniff extends AbstractClassRestrictionsSniff {
477486
*
478487
* Note: this list will be enhanced in the class constructor.
479488
*
480-
* {@internal To be updated after every major release. Last updated for WordPress 6.8.1.}
489+
* {@internal To be updated after every major release. Last updated for WordPress 6.9.0-RC2.}
481490
*
482491
* @since 3.0.0
483492
*
@@ -513,25 +522,32 @@ final class ClassNameCaseSniff extends AbstractClassRestrictionsSniff {
513522
*
514523
* Note: this list will be enhanced in the class constructor.
515524
*
516-
* {@internal To be updated after every major release. Last updated for WordPress 6.8.1.}
525+
* {@internal To be updated after every major release. Last updated for WordPress 6.9.0-RC2.}
517526
*
518527
* @since 3.0.0
519528
*
520529
* @var string[] The class names in their "proper" case.
521530
* The constructor will add the lowercased class name as a key to each entry.
522531
*/
523532
private $phpmailer_classes = array(
533+
// Classes.
534+
'PHPMailer\\PHPMailer\\DSNConfigurator',
524535
'PHPMailer\\PHPMailer\\Exception',
536+
'PHPMailer\\PHPMailer\\OAuth',
525537
'PHPMailer\\PHPMailer\\PHPMailer',
538+
'PHPMailer\\PHPMailer\\POP3',
526539
'PHPMailer\\PHPMailer\\SMTP',
540+
541+
// Interfaces.
542+
'PHPMailer\\PHPMailer\\OAuthTokenProvider',
527543
);
528544

529545
/**
530546
* List of all Requests classes included in WP Core.
531547
*
532548
* Note: this list will be enhanced in the class constructor.
533549
*
534-
* {@internal To be updated after every major release. Last updated for WordPress 6.8.1.}
550+
* {@internal To be updated after every major release. Last updated for WordPress 6.9.0-RC2.}
535551
*
536552
* @since 3.0.0
537553
*
@@ -675,7 +691,7 @@ final class ClassNameCaseSniff extends AbstractClassRestrictionsSniff {
675691
*
676692
* Note: this list will be enhanced in the class constructor.
677693
*
678-
* {@internal To be updated after every major release. Last updated for WordPress 6.8.1.}
694+
* {@internal To be updated after every major release. Last updated for WordPress 6.9.0-RC2.}
679695
*
680696
* @since 3.0.0
681697
*
@@ -690,6 +706,8 @@ final class ClassNameCaseSniff extends AbstractClassRestrictionsSniff {
690706
'SimplePie\Cache\Base',
691707
'SimplePie\Cache\DataCache',
692708
'SimplePie\Cache\NameFilter',
709+
'SimplePie\HTTP\Client',
710+
'SimplePie\HTTP\Response',
693711
'SimplePie\RegistryAware',
694712

695713
// Classes, SimplePie v1.
@@ -750,7 +768,12 @@ final class ClassNameCaseSniff extends AbstractClassRestrictionsSniff {
750768
'SimplePie\Exception',
751769
'SimplePie\File',
752770
'SimplePie\Gzdecode',
771+
'SimplePie\HTTP\ClientException',
772+
'SimplePie\HTTP\FileClient',
753773
'SimplePie\HTTP\Parser',
774+
'SimplePie\HTTP\Psr7Response',
775+
'SimplePie\HTTP\Psr18Client',
776+
'SimplePie\HTTP\RawTextResponse',
754777
'SimplePie\IRI',
755778
'SimplePie\Item',
756779
'SimplePie\Locator',

‎WordPress/Sniffs/WP/DeprecatedClassesSniff.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ final class DeprecatedClassesSniff extends AbstractClassRestrictionsSniff {
4141
*
4242
* Version numbers should be fully qualified.
4343
*
44-
* {@internal To be updated after every major release. Last updated for WordPress 6.8.1.}
44+
* {@internal To be updated after every major release. Last updated for WordPress 6.9.0-RC2.}
4545
*
4646
* @var array
4747
*/

‎WordPress/Sniffs/WP/DeprecatedFunctionsSniff.php‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ final class DeprecatedFunctionsSniff extends AbstractFunctionRestrictionsSniff {
4343
* To retrieve a function list for comparison, the following tool is available:
4444
* https://github.com/JDGrimes/wp-deprecated-code-scanner
4545
*
46-
* {@internal To be updated after every major release. Last updated for WordPress 6.8.1.}
46+
* {@internal To be updated after every major release. Last updated for WordPress 6.9.0-RC2.}
4747
*
4848
* @var array
4949
*/
@@ -1708,6 +1708,18 @@ final class DeprecatedFunctionsSniff extends AbstractFunctionRestrictionsSniff {
17081708
'alt' => 'wp_enqueue_classic_theme_styles()',
17091709
'version' => '6.8.0',
17101710
),
1711+
1712+
// WP 6.9.0.
1713+
// Note: the deprecation of the (polyfilled) `utf8_encode()` and `utf8_decode()` functions is deliberately
1714+
// not listed here as these are polyfills for the PHP native functions, not WP native functions.
1715+
'seems_utf8' => array(
1716+
'alt' => 'wp_is_valid_utf8()',
1717+
'version' => '6.9.0',
1718+
),
1719+
'wp_print_auto_sizes_contain_css_fix' => array(
1720+
'alt' => 'wp_enqueue_img_auto_sizes_contain_css_fix()',
1721+
'version' => '6.9.0',
1722+
),
17111723
);
17121724

17131725
/**

‎WordPress/Sniffs/WP/DeprecatedParameterValuesSniff.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ final class DeprecatedParameterValuesSniff extends AbstractFunctionParameterSnif
4343
* looking for `_deprecated_argument()`.
4444
* The list is sorted alphabetically by function name.
4545
*
46-
* {@internal To be updated after every major release. Last updated for WordPress 6.8.1.}
46+
* {@internal To be updated after every major release. Last updated for WordPress 6.9.0-RC2.}
4747
*
4848
* @since 1.0.0
4949
* @since 3.0.0 The format of the value has changed to support function calls

‎WordPress/Sniffs/WP/DeprecatedParametersSniff.php‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ final class DeprecatedParametersSniff extends AbstractFunctionParameterSniff {
5050
*
5151
* The functions are ordered alphabetically.
5252
*
53-
* {@internal To be updated after every major release. Last updated for WordPress 6.8.1.}
53+
* {@internal To be updated after every major release. Last updated for WordPress 6.9.0-RC2.}
5454
*
5555
* @since 0.12.0
5656
*
@@ -86,6 +86,13 @@ final class DeprecatedParametersSniff extends AbstractFunctionParameterSniff {
8686
'version' => '5.9.0',
8787
),
8888
),
89+
'_wp_can_use_pcre_u' => array(
90+
1 => array(
91+
'name' => 'set',
92+
'value' => null,
93+
'version' => '6.9.0',
94+
),
95+
),
8996
'_wp_post_revision_fields' => array(
9097
2 => array(
9198
'name' => 'deprecated',

‎WordPress/Tests/WP/DeprecatedFunctionsUnitTest.1.inc‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -441,3 +441,6 @@ wp_targeted_link_rel();
441441
wp_targeted_link_rel_callback();
442442
/* ============ WP 6.8 ============ */
443443
wp_add_editor_classic_theme_styles();
444+
/* ============ WP 6.9 ============ */
445+
seems_utf8();
446+
wp_print_auto_sizes_contain_css_fix();

‎WordPress/Tests/WP/DeprecatedFunctionsUnitTest.php‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,14 +110,15 @@ public function getWarningList( $testFile = '' ) {
110110
switch ( $testFile ) {
111111
case 'DeprecatedFunctionsUnitTest.1.inc':
112112
$start_line = 426;
113-
$end_line = 443;
113+
$end_line = 446;
114114
$warnings = array_fill( $start_line, ( ( $end_line - $start_line ) + 1 ), 1 );
115115

116116
// Unset the lines related to version comments.
117117
unset(
118118
$warnings[429],
119119
$warnings[432],
120-
$warnings[442]
120+
$warnings[442],
121+
$warnings[444]
121122
);
122123

123124
return $warnings;

0 commit comments

Comments
 (0)