From 2d98ba492eb7100e8a12b9df93910b50b3c38a6d Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Mon, 12 Sep 2022 17:50:36 +0000 Subject: [PATCH] Code Modernization: Replace deprecated string interpolation patterns. PHP 8.2 deprecates string interpolation patterns that place the dollar sign outside the curly braces: {{{ echo "Hello ${name}"; }}} This commit fixes such patterns by replacing them with proper curly braced patterns: {{{ echo "Hello {$name}"; }}} This addresses `Deprecated: Using ${var} in strings is deprecated, use {$var} instead` notices when running tests on PHP 8.2. References: * [https://php.watch/versions/8.2/$%7Bvar%7D-string-interpolation-deprecated PHP.Watch: PHP 8.2: ${var} string interpolation deprecated] * [https://wiki.php.net/rfc/deprecate_dollar_brace_string_interpolation PHP RFC: Deprecate ${} string interpolation] Follow-up to [10584], [31733], [42360], [53922]. Props ayeshrajans, jrf. Fixes #55787. git-svn-id: https://develop.svn.wordpress.org/trunk@54134 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-includes/comment-template.php | 2 +- src/wp-includes/pomo/po.php | 2 +- tests/phpunit/tests/formatting/convertSmilies.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/wp-includes/comment-template.php b/src/wp-includes/comment-template.php index f4cf72c258..6a27a67d92 100644 --- a/src/wp-includes/comment-template.php +++ b/src/wp-includes/comment-template.php @@ -1738,7 +1738,7 @@ function get_comment_reply_link( $args = array(), $comment = null, $post = null $data_attribute_string = ''; foreach ( $data_attributes as $name => $value ) { - $data_attribute_string .= " data-${name}=\"" . esc_attr( $value ) . '"'; + $data_attribute_string .= " data-{$name}=\"" . esc_attr( $value ) . '"'; } $data_attribute_string = trim( $data_attribute_string ); diff --git a/src/wp-includes/pomo/po.php b/src/wp-includes/pomo/po.php index cfd8084ac6..13fb16eb12 100644 --- a/src/wp-includes/pomo/po.php +++ b/src/wp-includes/pomo/po.php @@ -126,7 +126,7 @@ if ( ! class_exists( 'PO', false ) ) : $string = str_replace( array_keys( $replaces ), array_values( $replaces ), $string ); - $po = $quote . implode( "${slash}n$quote$newline$quote", explode( $newline, $string ) ) . $quote; + $po = $quote . implode( "{$slash}n{$quote}{$newline}{$quote}", explode( $newline, $string ) ) . $quote; // Add empty string on first line for readbility. if ( false !== strpos( $string, $newline ) && ( substr_count( $string, $newline ) > 1 || substr( $string, -strlen( $newline ) ) !== $newline ) ) { diff --git a/tests/phpunit/tests/formatting/convertSmilies.php b/tests/phpunit/tests/formatting/convertSmilies.php index ce17bbf177..5031b4b51c 100644 --- a/tests/phpunit/tests/formatting/convertSmilies.php +++ b/tests/phpunit/tests/formatting/convertSmilies.php @@ -19,7 +19,7 @@ class Tests_Formatting_ConvertSmilies extends WP_UnitTestCase { return array( array( 'Lorem ipsum dolor sit amet mauris ;-) Praesent gravida sodales. :lol: Vivamus nec diam in faucibus eu, bibendum varius nec, imperdiet purus est, at augue at lacus malesuada elit dapibus a, :eek: mauris. Cras mauris viverra elit. Nam laoreet viverra. Pellentesque tortor. Nam libero ante, porta urna ut turpis. Nullam wisi magna, :mrgreen: tincidunt nec, sagittis non, fringilla enim. Nam consectetuer nec, ullamcorper pede eu dui odio consequat vel, vehicula tortor quis pede turpis cursus quis, egestas ipsum ultricies ut, eleifend velit. Mauris vestibulum iaculis. Sed in nunc. Vivamus elit porttitor egestas. Mauris purus :?:', - "Lorem ipsum dolor sit amet mauris \xf0\x9f\x98\x89 Praesent gravida sodales. \xf0\x9f\x98\x86 Vivamus nec diam in faucibus eu, bibendum varius nec, imperdiet purus est, at augue at lacus malesuada elit dapibus a, \xf0\x9f\x98\xae mauris. Cras mauris viverra elit. Nam laoreet viverra. Pellentesque tortor. Nam libero ante, porta urna ut turpis. Nullam wisi magna, \":mrgreen:\" tincidunt nec, sagittis non, fringilla enim. Nam consectetuer nec, ullamcorper pede eu dui odio consequat vel, vehicula tortor quis pede turpis cursus quis, egestas ipsum ultricies ut, eleifend velit. Mauris vestibulum iaculis. Sed in nunc. Vivamus elit porttitor egestas. Mauris purus \xe2\x9d\x93", + "Lorem ipsum dolor sit amet mauris \xf0\x9f\x98\x89 Praesent gravida sodales. \xf0\x9f\x98\x86 Vivamus nec diam in faucibus eu, bibendum varius nec, imperdiet purus est, at augue at lacus malesuada elit dapibus a, \xf0\x9f\x98\xae mauris. Cras mauris viverra elit. Nam laoreet viverra. Pellentesque tortor. Nam libero ante, porta urna ut turpis. Nullam wisi magna, \":mrgreen:\" tincidunt nec, sagittis non, fringilla enim. Nam consectetuer nec, ullamcorper pede eu dui odio consequat vel, vehicula tortor quis pede turpis cursus quis, egestas ipsum ultricies ut, eleifend velit. Mauris vestibulum iaculis. Sed in nunc. Vivamus elit porttitor egestas. Mauris purus \xe2\x9d\x93", ), array( 'Welcome to the jungle! We got fun n games! :) We got everything you want 8-) Honey we know the names :)',