<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[60703] trunk: Code Modernization: Address no-op function deprecations in PHP 8.5.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/60703">60703</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/60703","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2025-09-03 12:16:17 +0000 (Wed, 03 Sep 2025)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Code Modernization: Address no-op function deprecations in PHP 8.5.
Several PHP functions that have not been doing anything since PHP 8.0/8.1, specifically:
* `finfo_close()` since the `ext/fileinfo` migration in PHP 8.1
* `xml_parser_free()` since the `ext/xml` migration in PHP 8.0
* `curl_close()` since the `ext/curl` migration in PHP 8.0
* `curl_share_close()` since the `ext/curl` migration in PHP 8.0
* `imagedestroy()` since the `ext/gd` migration in PHP 8.0
will be deprecated in PHP 8.5 and will thus be throwing warnings.
This commit adds conditional checks to only call these functions on the relevant PHP versions.
Reference: [https://wiki.php.net/rfc/deprecations_php_8_5#deprecate_no-op_functions_from_the_resource_to_object_conversion PHP RFC: Deprecations for PHP 8.5: Deprecate no-op functions from the resource to object conversion].
Props TobiasBg, SergeyBiryukov.
See <a href="https://core.trac.wordpress.org/ticket/63061">#63061</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesimageeditphp">trunk/src/wp-admin/includes/image-edit.php</a></li>
<li><a href="#trunksrcwpadminlinkparseopmlphp">trunk/src/wp-admin/link-parse-opml.php</a></li>
<li><a href="#trunksrcwpincludesIXRclassIXRmessagephp">trunk/src/wp-includes/IXR/class-IXR-message.php</a></li>
<li><a href="#trunksrcwpincludesatomlibphp">trunk/src/wp-includes/atomlib.php</a></li>
<li><a href="#trunksrcwpincludesclasswphttpcurlphp">trunk/src/wp-includes/class-wp-http-curl.php</a></li>
<li><a href="#trunksrcwpincludesclasswpimageeditorgdphp">trunk/src/wp-includes/class-wp-image-editor-gd.php</a></li>
<li><a href="#trunksrcwpincludesfeedphp">trunk/src/wp-includes/feed.php</a></li>
<li><a href="#trunksrcwpincludesfunctionsphp">trunk/src/wp-includes/functions.php</a></li>
<li><a href="#trunksrcwpincludesrssphp">trunk/src/wp-includes/rss.php</a></li>
<li><a href="#trunktestsphpunitincludesutilsphp">trunk/tests/phpunit/includes/utils.php</a></li>
<li><a href="#trunktestsphpunittestsimagefunctionsphp">trunk/tests/phpunit/tests/image/functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesimageeditphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/image-edit.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/image-edit.php 2025-09-02 23:51:40 UTC (rev 60702)
+++ trunk/src/wp-admin/includes/image-edit.php 2025-09-03 12:16:17 UTC (rev 60703)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -545,7 +545,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $rotated = imagerotate( $img, $angle, 0 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_gd_image( $rotated ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- imagedestroy( $img );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( PHP_VERSION_ID < 80000 ) { // imagedestroy() has no effect as of PHP 8.0.
+ imagedestroy( $img );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $img = $rotated;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -580,7 +583,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $sh = $horz ? -$h : $h;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( imagecopyresampled( $dst, $img, 0, 0, $sx, $sy, $w, $h, $sw, $sh ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- imagedestroy( $img );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( PHP_VERSION_ID < 80000 ) { // imagedestroy() has no effect as of PHP 8.0.
+ imagedestroy( $img );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $img = $dst;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -606,7 +612,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_gd_image( $dst ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( imagecopy( $dst, $img, 0, 0, $x, $y, $w, $h ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- imagedestroy( $img );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( PHP_VERSION_ID < 80000 ) { // imagedestroy() has no effect as of PHP 8.0.
+ imagedestroy( $img );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $img = $dst;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpadminlinkparseopmlphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/link-parse-opml.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/link-parse-opml.php 2025-09-02 23:51:40 UTC (rev 60702)
+++ trunk/src/wp-admin/link-parse-opml.php 2025-09-03 12:16:17 UTC (rev 60703)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -96,6 +96,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// Free up memory used by the XML parser.
-xml_parser_free( $xml_parser );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( PHP_VERSION_ID < 80000 ) { // xml_parser_free() has no effect as of PHP 8.0.
+ // Free up memory used by the XML parser.
+ xml_parser_free( $xml_parser );
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> unset( $xml_parser );
</span></span></pre></div>
<a id="trunksrcwpincludesIXRclassIXRmessagephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/IXR/class-IXR-message.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/IXR/class-IXR-message.php 2025-09-02 23:51:40 UTC (rev 60702)
+++ trunk/src/wp-includes/IXR/class-IXR-message.php 2025-09-03 12:16:17 UTC (rev 60703)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -119,7 +119,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->message = substr($this->message, $chunk_size);
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if (!xml_parse($this->_parser, $part, $final)) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- xml_parser_free($this->_parser);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if (PHP_VERSION_ID < 80000) { // xml_parser_free() has no effect as of PHP 8.0.
+ xml_parser_free($this->_parser);
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> unset($this->_parser);
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -129,7 +132,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } while (true);
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- xml_parser_free($this->_parser);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if (PHP_VERSION_ID < 80000) { // xml_parser_free() has no effect as of PHP 8.0.
+ xml_parser_free($this->_parser);
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> unset($this->_parser);
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Grab the error messages, if any
</span></span></pre></div>
<a id="trunksrcwpincludesatomlibphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/atomlib.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/atomlib.php 2025-09-02 23:51:40 UTC (rev 60702)
+++ trunk/src/wp-includes/atomlib.php 2025-09-03 12:16:17 UTC (rev 60703)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -184,7 +184,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> fclose($fp);
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- xml_parser_free($parser);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if (PHP_VERSION_ID < 80000) { // xml_parser_free() has no effect as of PHP 8.0.
+ xml_parser_free($parser);
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> unset($parser);
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> restore_error_handler();
</span></span></pre></div>
<a id="trunksrcwpincludesclasswphttpcurlphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-http-curl.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-http-curl.php 2025-09-02 23:51:40 UTC (rev 60702)
+++ trunk/src/wp-includes/class-wp-http-curl.php 2025-09-03 12:16:17 UTC (rev 60703)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -240,16 +240,27 @@
</span><span class="cx" style="display: block; padding: 0 10px"> curl_exec( $handle );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $curl_error = curl_error( $handle );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $curl_error ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- curl_close( $handle );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( PHP_VERSION_ID < 80000 ) { // curl_close() has no effect as of PHP 8.0.
+ curl_close( $handle );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error( 'http_request_failed', $curl_error );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( in_array( curl_getinfo( $handle, CURLINFO_HTTP_CODE ), array( 301, 302 ), true ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- curl_close( $handle );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( PHP_VERSION_ID < 80000 ) { // curl_close() has no effect as of PHP 8.0.
+ curl_close( $handle );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error( 'http_request_failed', __( 'Too many redirects.' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- curl_close( $handle );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( PHP_VERSION_ID < 80000 ) { // curl_close() has no effect as of PHP 8.0.
+ curl_close( $handle );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'headers' => array(),
</span><span class="cx" style="display: block; padding: 0 10px"> 'body' => '',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -278,28 +289,45 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( CURLE_WRITE_ERROR /* 23 */ === $curl_error ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $this->max_body_length || $this->max_body_length !== $bytes_written_total ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $parsed_args['stream'] ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- curl_close( $handle );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( PHP_VERSION_ID < 80000 ) { // curl_close() has no effect as of PHP 8.0.
+ curl_close( $handle );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> fclose( $this->stream_handle );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error( 'http_request_failed', __( 'Failed to write request to temporary file.' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- curl_close( $handle );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( PHP_VERSION_ID < 80000 ) { // curl_close() has no effect as of PHP 8.0.
+ curl_close( $handle );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error( 'http_request_failed', curl_error( $handle ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $curl_error = curl_error( $handle );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $curl_error ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- curl_close( $handle );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( PHP_VERSION_ID < 80000 ) { // curl_close() has no effect as of PHP 8.0.
+ curl_close( $handle );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error( 'http_request_failed', $curl_error );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( in_array( curl_getinfo( $handle, CURLINFO_HTTP_CODE ), array( 301, 302 ), true ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- curl_close( $handle );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( PHP_VERSION_ID < 80000 ) { // curl_close() has no effect as of PHP 8.0.
+ curl_close( $handle );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> return new WP_Error( 'http_request_failed', __( 'Too many redirects.' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- curl_close( $handle );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( PHP_VERSION_ID < 80000 ) { // curl_close() has no effect as of PHP 8.0.
+ curl_close( $handle );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $parsed_args['stream'] ) {
</span><span class="cx" style="display: block; padding: 0 10px"> fclose( $this->stream_handle );
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpimageeditorgdphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-image-editor-gd.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-image-editor-gd.php 2025-09-02 23:51:40 UTC (rev 60702)
+++ trunk/src/wp-includes/class-wp-image-editor-gd.php 2025-09-03 12:16:17 UTC (rev 60703)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -23,8 +23,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function __destruct() {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $this->image ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // We don't need the original in memory anymore.
- imagedestroy( $this->image );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( PHP_VERSION_ID < 80000 ) { // imagedestroy() has no effect as of PHP 8.0.
+ // We don't need the original in memory anymore.
+ imagedestroy( $this->image );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -188,8 +190,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $resized = $this->_resize( $max_w, $max_h, $crop );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_gd_image( $resized ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- imagedestroy( $this->image );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( PHP_VERSION_ID < 80000 ) { // imagedestroy() has no effect as of PHP 8.0.
+ imagedestroy( $this->image );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->image = $resized;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> return true;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( is_wp_error( $resized ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -324,7 +330,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $saved = $resized;
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $saved = $this->_save( $resized );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- imagedestroy( $resized );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ if ( PHP_VERSION_ID < 80000 ) { // imagedestroy() has no effect as of PHP 8.0.
+ imagedestroy( $resized );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->size = $orig_size;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -382,9 +391,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> imagecopyresampled( $dst, $this->image, 0, 0, (int) $src_x, (int) $src_y, (int) $dst_w, (int) $dst_h, (int) $src_w, (int) $src_h );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_gd_image( $dst ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- imagedestroy( $this->image );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( PHP_VERSION_ID < 80000 ) { // imagedestroy() has no effect as of PHP 8.0.
+ imagedestroy( $this->image );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->image = $dst;
</span><span class="cx" style="display: block; padding: 0 10px"> $this->update_size();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> return true;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -408,9 +421,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_gd_image( $rotated ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> imagealphablending( $rotated, true );
</span><span class="cx" style="display: block; padding: 0 10px"> imagesavealpha( $rotated, true );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- imagedestroy( $this->image );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ if ( PHP_VERSION_ID < 80000 ) { // imagedestroy() has no effect as of PHP 8.0.
+ imagedestroy( $this->image );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->image = $rotated;
</span><span class="cx" style="display: block; padding: 0 10px"> $this->update_size();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> return true;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -439,8 +457,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $sh = $horz ? -$h : $h;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( imagecopyresampled( $dst, $this->image, 0, 0, $sx, $sy, $w, $h, $sw, $sh ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- imagedestroy( $this->image );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( PHP_VERSION_ID < 80000 ) { // imagedestroy() has no effect as of PHP 8.0.
+ imagedestroy( $this->image );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->image = $dst;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> return true;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpincludesfeedphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/feed.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/feed.php 2025-09-02 23:51:40 UTC (rev 60702)
+++ trunk/src/wp-includes/feed.php 2025-09-03 12:16:17 UTC (rev 60703)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -599,7 +599,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $parser = xml_parser_create();
</span><span class="cx" style="display: block; padding: 0 10px"> xml_parse( $parser, '<div>' . $data . '</div>', true );
</span><span class="cx" style="display: block; padding: 0 10px"> $code = xml_get_error_code( $parser );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- xml_parser_free( $parser );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ if ( PHP_VERSION_ID < 80000 ) { // xml_parser_free() has no effect as of PHP 8.0.
+ xml_parser_free( $parser );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> unset( $parser );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $code ) {
</span></span></pre></div>
<a id="trunksrcwpincludesfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/functions.php 2025-09-02 23:51:40 UTC (rev 60702)
+++ trunk/src/wp-includes/functions.php 2025-09-03 12:16:17 UTC (rev 60703)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3172,8 +3172,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $type && ! $real_mime && extension_loaded( 'fileinfo' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $finfo = finfo_open( FILEINFO_MIME_TYPE );
</span><span class="cx" style="display: block; padding: 0 10px"> $real_mime = finfo_file( $finfo, $file );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- finfo_close( $finfo );
</del><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( PHP_VERSION_ID < 80100 ) { // finfo_close() has no effect as of PHP 8.1.
+ finfo_close( $finfo );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $google_docs_types = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
</span><span class="cx" style="display: block; padding: 0 10px"> 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3401,8 +3404,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( extension_loaded( 'fileinfo' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $fileinfo = finfo_open( FILEINFO_MIME_TYPE );
</span><span class="cx" style="display: block; padding: 0 10px"> $mime_type = finfo_file( $fileinfo, $file );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- finfo_close( $fileinfo );
</del><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( PHP_VERSION_ID < 80100 ) { // finfo_close() has no effect as of PHP 8.1.
+ finfo_close( $fileinfo );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( wp_is_heic_image_mime_type( $mime_type ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $mime = $mime_type;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpincludesrssphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/rss.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/rss.php 2025-09-02 23:51:40 UTC (rev 60702)
+++ trunk/src/wp-includes/rss.php 2025-09-03 12:16:17 UTC (rev 60703)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -93,7 +93,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- xml_parser_free( $this->parser );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( PHP_VERSION_ID < 80000 ) { // xml_parser_free() has no effect as of PHP 8.0.
+ xml_parser_free( $this->parser );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> unset( $this->parser );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->normalize();
</span></span></pre></div>
<a id="trunktestsphpunitincludesutilsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/includes/utils.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/includes/utils.php 2025-09-02 23:51:40 UTC (rev 60702)
+++ trunk/tests/phpunit/includes/utils.php 2025-09-03 12:16:17 UTC (rev 60703)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -311,7 +311,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> xml_get_current_line_number( $this->xml )
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- xml_parser_free( $this->xml );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ if ( PHP_VERSION_ID < 80000 ) { // xml_parser_free() has no effect as of PHP 8.0.
+ xml_parser_free( $this->xml );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> return true;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunktestsphpunittestsimagefunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/image/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/image/functions.php 2025-09-02 23:51:40 UTC (rev 60702)
+++ trunk/tests/phpunit/tests/image/functions.php 2025-09-03 12:16:17 UTC (rev 60703)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -360,7 +360,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $img = imagecreatefromjpeg( DIR_TESTDATA . '/images/canola.jpg' );
</span><span class="cx" style="display: block; padding: 0 10px"> $ret = wp_save_image_file( $file, $img, 'image/jpeg', 1 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- imagedestroy( $img );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( PHP_VERSION_ID < 80000 ) { // imagedestroy() has no effect as of PHP 8.0.
+ imagedestroy( $img );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> unlink( $file );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertTrue( $ret, 'Image failed to save.' );
</span></span></pre>
</div>
</div>
</body>
</html>