From 5314fd5eae8bb70cc234e3c83eedd96dd35c5267 Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Tue, 16 Sep 2025 10:22:30 +0200 Subject: [PATCH] Fix ord()-related PHP 8.5 deprecations --- src/Symfony/Component/HttpFoundation/BinaryFileResponse.php | 2 +- src/Symfony/Component/Mime/Encoder/QpContentEncoder.php | 6 +++--- src/Symfony/Component/Mime/Encoder/QpEncoder.php | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Symfony/Component/HttpFoundation/BinaryFileResponse.php b/src/Symfony/Component/HttpFoundation/BinaryFileResponse.php index 2c14d366802f1..9cd86879b0a26 100644 --- a/src/Symfony/Component/HttpFoundation/BinaryFileResponse.php +++ b/src/Symfony/Component/HttpFoundation/BinaryFileResponse.php @@ -163,7 +163,7 @@ public function setContentDisposition(string $disposition, string $filename = '' for ($i = 0, $filenameLength = mb_strlen($filename, $encoding); $i < $filenameLength; ++$i) { $char = mb_substr($filename, $i, 1, $encoding); - if ('%' === $char || \ord($char) < 32 || \ord($char) > 126) { + if ('%' === $char || \ord($char[0]) < 32 || \ord($char[0]) > 126) { $filenameFallback .= '_'; } else { $filenameFallback .= $char; diff --git a/src/Symfony/Component/Mime/Encoder/QpContentEncoder.php b/src/Symfony/Component/Mime/Encoder/QpContentEncoder.php index 777a6a96c37bb..c425b6759d25f 100644 --- a/src/Symfony/Component/Mime/Encoder/QpContentEncoder.php +++ b/src/Symfony/Component/Mime/Encoder/QpContentEncoder.php @@ -46,9 +46,9 @@ private function standardize(string $string): string // transform =0D=0A to CRLF $string = str_replace(["\t=0D=0A", ' =0D=0A', '=0D=0A'], ["=09\r\n", "=20\r\n", "\r\n"], $string); - return match (\ord(substr($string, -1))) { - 0x09 => substr_replace($string, '=09', -1), - 0x20 => substr_replace($string, '=20', -1), + return match ($string[-1] ?? '') { + "\x09" => substr_replace($string, '=09', -1), + "\x20" => substr_replace($string, '=20', -1), default => $string, }; } diff --git a/src/Symfony/Component/Mime/Encoder/QpEncoder.php b/src/Symfony/Component/Mime/Encoder/QpEncoder.php index 160dde32971cf..76ec445a3179b 100644 --- a/src/Symfony/Component/Mime/Encoder/QpEncoder.php +++ b/src/Symfony/Component/Mime/Encoder/QpEncoder.php @@ -183,9 +183,9 @@ private function standardize(string $string): string { $string = str_replace(["\t=0D=0A", ' =0D=0A', '=0D=0A'], ["=09\r\n", "=20\r\n", "\r\n"], $string); - return match ($end = \ord(substr($string, -1))) { - 0x09, - 0x20 => substr_replace($string, self::QP_MAP[$end], -1), + return match ($end = ($string[-1] ?? '')) { + "\x09", + "\x20" => substr_replace($string, self::QP_MAP[\ord($end)], -1), default => $string, }; }