From d8d45d343ed4cf52d3a865bb0f6d1bc252b08ed0 Mon Sep 17 00:00:00 2001 From: Andre Klapper Date: Sun, 30 Apr 2023 18:27:43 +0200 Subject: [PATCH] Fix PHP 8.1 "strlen(null)" exceptions which block rendering the Conduit page 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 T15307 Test Plan: Applied these two changes (on top `D25144`, `D25145`, `D25146`, `D25147`, `D25150`, `D25151`, `D25152`, `D25153`, `D25154` locally applied) and `/conduit/` finally rendered in web browser. Also the page /conduit/query/. Reviewers: O1 Blessed Committers, valerio.bozzolan Reviewed By: O1 Blessed Committers, valerio.bozzolan Subscribers: speck, tobiaswiese, valerio.bozzolan, Matthew, Cigaryno Maniphest Tasks: T15307 Differential Revision: https://we.phorge.it/D25156 --- .../conduit/query/PhabricatorConduitSearchEngine.php | 2 +- src/view/phui/PHUIObjectItemView.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/applications/conduit/query/PhabricatorConduitSearchEngine.php b/src/applications/conduit/query/PhabricatorConduitSearchEngine.php index 06ba536dfe..3dc5617bb5 100644 --- a/src/applications/conduit/query/PhabricatorConduitSearchEngine.php +++ b/src/applications/conduit/query/PhabricatorConduitSearchEngine.php @@ -39,7 +39,7 @@ final class PhabricatorConduitSearchEngine $query->withIsInternal(false); $contains = $saved->getParameter('nameContains'); - if (strlen($contains)) { + if (phutil_nonempty_string($contains)) { $query->withNameContains($contains); } diff --git a/src/view/phui/PHUIObjectItemView.php b/src/view/phui/PHUIObjectItemView.php index 6563101f98..24f0d7743f 100644 --- a/src/view/phui/PHUIObjectItemView.php +++ b/src/view/phui/PHUIObjectItemView.php @@ -874,7 +874,7 @@ final class PHUIObjectItemView extends AphrontTagView { 'class' => 'phui-oi-status-icon', ); - if (strlen($label)) { + if (phutil_nonempty_string($label)) { $options['sigil'] = 'has-tooltip'; $options['meta'] = array('tip' => $label, 'size' => 300); }