From 912a933b0214f7b310b26b1c730ef9ed5331fe23 Mon Sep 17 00:00:00 2001 From: Andre Klapper <a9016009@gmx.de> Date: Fri, 19 May 2023 17:01:35 +0200 Subject: [PATCH] Fix PHP 8.1 "strlen(null)" exceptions which block rendering Legalpad signatures 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 T15395 Test Plan: Applied these two changes; afterwards "All Signatures" page at `/legalpad/signatures/1/` gets rendered 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: T15395 Differential Revision: https://we.phorge.it/D25226 --- .../legalpad/query/LegalpadDocumentSignatureSearchEngine.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/applications/legalpad/query/LegalpadDocumentSignatureSearchEngine.php b/src/applications/legalpad/query/LegalpadDocumentSignatureSearchEngine.php index 14ebca9d04..ac3e181889 100644 --- a/src/applications/legalpad/query/LegalpadDocumentSignatureSearchEngine.php +++ b/src/applications/legalpad/query/LegalpadDocumentSignatureSearchEngine.php @@ -127,12 +127,12 @@ final class LegalpadDocumentSignatureSearchEngine } $name_contains = $saved->getParameter('nameContains'); - if (strlen($name_contains)) { + if (phutil_nonempty_string($name_contains)) { $query->withNameContains($name_contains); } $email_contains = $saved->getParameter('emailContains'); - if (strlen($email_contains)) { + if (phutil_nonempty_string($email_contains)) { $query->withEmailContains($email_contains); }