Skip to content

Commit d9fe74b

Browse files
Code Modernization: Fix trigger_error() with E_USER_ERROR deprecation in Text_Diff_Op::reverse().
PHP 8.4 deprecates the use of `trigger_errror()` with `E_USER_ERROR` as the error level, as there are a number of gotchas to this way of creating a `Fatal Error` (`finally` blocks not executing, destructors not executing). The recommended replacements are either to use exceptions or to do a hard `exit`. This is an unmaintained external dependency; thus, the fix is made in the WP specific copy of the dependency. As `trigger_error()` call looks to be a remnant of the PHP 4 era before a class could be declared as `abstract`, fixed by making both the method as well as the class `abstract` and removing the call to `trigger_error()`. Ref: * https://wiki.php.net/rfc/deprecations_php_8_4#deprecate_passing_e_user_error_to_trigger_error * https://www.php.net/manual/en/migration80.incompatible.php Follow-up to [7747]. Props jrf. See #62061. git-svn-id: https://develop.svn.wordpress.org/trunk@59106 602fd350-edb4-49c9-b593-d223f7449a82
1 parent 9a9ca41 commit d9fe74b

File tree

1 file changed

+2
-5
lines changed

1 file changed

+2
-5
lines changed

src/wp-includes/Text/Diff.php

+2-5
Original file line numberDiff line numberDiff line change
@@ -350,15 +350,12 @@ public function Text_MappedDiff( $from_lines, $to_lines,
350350
*
351351
* @access private
352352
*/
353-
class Text_Diff_Op {
353+
abstract class Text_Diff_Op {
354354

355355
var $orig;
356356
var $final;
357357

358-
function &reverse()
359-
{
360-
trigger_error('Abstract method', E_USER_ERROR);
361-
}
358+
abstract function &reverse();
362359

363360
function norig()
364361
{

0 commit comments

Comments
 (0)