Context Navigation

← Previous Change
Next Change →

po.php

Timestamp:

03/23/2026 02:54:20 PM (4 months ago)

Author:

SergeyBiryukov

Message:

Code Modernization: Replace the deprecated auto_detect_line_endings setting.

Since PHP 8.1, the auto_detect_line_endings setting is deprecated:

The auto_detect_line_endings ini setting modifies the behavior of file() and fgets() to support an isolated \r (as opposed to \n or \r\n) as a newline character. These newlines were used by “Classic” Mac OS, a system which has been discontinued in 2001, nearly two decades ago. Interoperability with such systems is no longer relevant.

Reference: PHP RFC: Deprecations for PHP 8.1: auto_detect_line_endings ini setting.

The auto_detect_line_endings ini setting has been deprecated. If necessary, handle \r line breaks manually instead.

Reference: PHP 8.1 Upgrade Notes.

This commits adds code to replace the deprecated setting and still handle old-style \r line-terminated files in PO::read_line() using strpos() + fseek(). Includes a unit test covering \r, \n, and \r\n line endings.

Follow-up to [51633], [51636].

Props akirk, apermo, westonruter, SergeyBiryukov.
Fixes #64928.

File:

: 1 edited

trunk/src/wp-includes/pomo/po.php (modified) (2 diffs)

Legend:

: Unmodified
: Added
: Removed

trunk/src/wp-includes/pomo/po.php

-              r61444
+              r62093
         define( 'PO_MAX_LINE_LEN', 79 );
+}
-/*
- * The `auto_detect_line_endings` setting has been deprecated in PHP 8.1,
- * but will continue to work until PHP 9.0.
- * For now, we're silencing the deprecation notice as there may still be
- * translation files around which haven't been updated in a long time and
- * which still use the old MacOS standalone `\r` as a line ending.
- * This fix should be revisited when PHP 9.0 is in alpha/beta.
- */
-@ini_set( 'auto_detect_line_endings', 1 ); // phpcs:ignore WordPress.PHP.NoSilencedErrors.Discouraged
 /**
 …
                                 return true;
+                        }
+                        $line          = $use_last_line ? $last_line : fgets( $f );
+                        $line          = ( "\r\n" === substr( $line, -2 ) ) ? rtrim( $line, "\r\n" ) . "\n" : $line;
+                        if ( $use_last_line ) {
+                                $line = $last_line;
+                        } else {
+                                $line = fgets( $f );
+                                if ( false === $line ) {
+                                        return $line;
+                                }
+                                // Handle \r-only terminated lines after the deprecation of auto_detect_line_endings in PHP 8.1.
+                                $r = strpos( $line, "\r" );
+                                if ( false !== $r ) {
+                                        if ( strlen( $line ) === $r + 1
+                                                && "\r\n" === substr( $line, $r )
+                                        ) {
+                                                $line = rtrim( $line, "\r\n" ) . "\n";
+                                        } else {
+                                                // The lines are terminated by just \r, so we end the line there and rewind.
+                                                $rewind = strlen( $line ) - $r - 1;
+                                                $line   = substr( $line, 0, $r ) . "\n";
+                                                fseek( $f, - $rewind, SEEK_CUR );
+                                        }
+                                }
+                        }
                         $last_line     = $line;
                         $use_last_line = false;

Note: See TracChangeset for help on using the changeset viewer.

Make WordPress Core

Context Navigation

Changeset 62093 for trunk/src/wp-includes/pomo/po.php

Legend:

trunk/src/wp-includes/pomo/po.php

Download in other formats: