From 644d8cd6f12d102063e11c9276ae739580e990eb Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Mon, 29 Aug 2022 14:07:11 +0000 Subject: [PATCH] Code Modernization: Explicitly declare all properties in `POMO_Reader` et al. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Dynamic (non-explicitly declared) properties are deprecated as of PHP 8.2 and are expected to become a fatal error in PHP 9.0. There are a number of ways to mitigate this: * If it is an accidental typo for a declared property: fix the typo. * For known properties: declare them on the class. * For unknown properties: add the magic `__get()`, `__set()`, et al. methods to the class or let the class extend `stdClass` which has highly optimized versions of these magic methods built in. * For unknown ''use'' of dynamic properties, the `#[AllowDynamicProperties]` attribute can be added to the class. The attribute will automatically be inherited by child classes. In this case, the `$is_overloaded` property and the `$_f` property fall in the “known property” category. In both cases, these are being set in the `__construct()` method of the class they apply to. The `$_post` property appears to be a typo however. The `$_post` property looks to be unused, while there is an undeclared integer `$_pos` (“position”) property, which is used throughout the class and used by the child classes. Reference: [https://wiki.php.net/rfc/deprecate_dynamic_properties PHP RFC: Deprecate dynamic properties]. Follow-up to [11626], [12174], [53557], [53558], [53850], [53851], [53852], [53853], [53854], [53856], [53916], [53935], [53936], [53937], [53938], [53942], [53945], [53948], [53949], [53952], [53953]. Props jrf, antonvlasenko, costdev. See #56033. Built from https://develop.svn.wordpress.org/trunk@53954 git-svn-id: http://core.svn.wordpress.org/trunk@53513 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/pomo/streams.php | 10 +++++++++- wp-includes/version.php | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/wp-includes/pomo/streams.php b/wp-includes/pomo/streams.php index 6a971af065..4f836961f4 100644 --- a/wp-includes/pomo/streams.php +++ b/wp-includes/pomo/streams.php @@ -12,7 +12,8 @@ if ( ! class_exists( 'POMO_Reader', false ) ) : class POMO_Reader { public $endian = 'little'; - public $_post = ''; + public $_pos; + public $is_overloaded; /** * PHP5 constructor. @@ -152,6 +153,13 @@ endif; if ( ! class_exists( 'POMO_FileReader', false ) ) : class POMO_FileReader extends POMO_Reader { + /** + * File pointer resource. + * + * @var resource|false + */ + public $_f; + /** * @param string $filename */ diff --git a/wp-includes/version.php b/wp-includes/version.php index 2076307fdd..ca526e08ea 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -16,7 +16,7 @@ * * @global string $wp_version */ -$wp_version = '6.1-alpha-53953'; +$wp_version = '6.1-alpha-53954'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.