From 651e3f7263b58e46cd65285cce7ba266af480aef Mon Sep 17 00:00:00 2001 From: Andre Klapper Date: Sat, 6 May 2023 04:08:07 +0200 Subject: [PATCH] Fix PHP 8.1 "strlen(null)" exception which blocks rendering a File page when Alt Text was altered Summary: `strlen()` was used in Phabricator to check if a generic value is a non-empty string. This behavior is deprecated since PHP 8.1. Phorge adopts `phutil_nonempty_string()` as a replacement. Note: this may highlight other absurd input values that might be worth correcting instead of just ignoring. If phutil_nonempty_string() throws an exception in your instance, report it to Phorge to evaluate and fix that specific corner case. Closes T15342 Test Plan: Applied these two changes on top of D25186. Added an Alt Text to a file; page of the File now rendered correctly in web browser. Removed Alt Text from a file; page of the File now rendered correctly in web browser. Reviewers: O1 Blessed Committers, valerio.bozzolan Reviewed By: O1 Blessed Committers, valerio.bozzolan Subscribers: speck, tobiaswiese, valerio.bozzolan, Matthew, Cigaryno Maniphest Tasks: T15342 Differential Revision: https://we.phorge.it/D25187 --- .../files/xaction/PhabricatorFileAltTextTransaction.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/applications/files/xaction/PhabricatorFileAltTextTransaction.php b/src/applications/files/xaction/PhabricatorFileAltTextTransaction.php index dcf3c6f76f..c3151910e4 100644 --- a/src/applications/files/xaction/PhabricatorFileAltTextTransaction.php +++ b/src/applications/files/xaction/PhabricatorFileAltTextTransaction.php @@ -27,12 +27,12 @@ final class PhabricatorFileAltTextTransaction $old_value = $this->getOldValue(); $new_value = $this->getNewValue(); - if (!strlen($old_value)) { + if (!phutil_nonempty_string($old_value)) { return pht( '%s set the alternate text for this file to %s.', $this->renderAuthor(), $this->renderNewValue()); - } else if (!strlen($new_value)) { + } else if (!phutil_nonempty_string($new_value)) { return pht( '%s removed the alternate text for this file (was %s).', $this->renderAuthor(),