From e610e739cb4294dcab92c3145285a5ffa5c3cf61 Mon Sep 17 00:00:00 2001 From: Andre Klapper Date: Tue, 5 Dec 2023 10:23:43 -0800 Subject: [PATCH] Fix PHP 8.1 exceptions rendering task when custom select field configured 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. In the other case, do not call `json_decode()` when passing null to it. ``` EXCEPTION: (RuntimeException) json_decode(): Passing null to parameter #1 ($json) of type string is deprecated at [/src/error/PhutilErrorHandler.php:261] #0 <#2> PhutilErrorHandler::handleError(integer, string, string, integer) called at [/src/error/PhutilErrorHandler.php:261] #1 <#2> json_decode(NULL, boolean) called at [/src/infrastructure/customfield/standard/PhabricatorStandardCustomFieldPHIDs.php:44] ``` ``` EXCEPTION: (RuntimeException) strlen(): Passing null to parameter #1 ($string) of type string is deprecated at [/src/error/PhutilErrorHandler.php:261] #0 <#2> PhutilErrorHandler::handleError(integer, string, string, integer) called at [/src/infrastructure/customfield/standard/PhabricatorStandardCustomFieldSelect.php:76] ``` Closes T15683 Test Plan: After configuring a custom `select` field, access a task. Reviewers: O1 Blessed Committers, speck Reviewed By: O1 Blessed Committers, speck Subscribers: tobiaswiese, valerio.bozzolan, Matthew, Cigaryno Maniphest Tasks: T15683 Differential Revision: https://we.phorge.it/D25487 --- .../standard/PhabricatorStandardCustomFieldPHIDs.php | 2 +- .../standard/PhabricatorStandardCustomFieldSelect.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/infrastructure/customfield/standard/PhabricatorStandardCustomFieldPHIDs.php b/src/infrastructure/customfield/standard/PhabricatorStandardCustomFieldPHIDs.php index a96ebefda1..48d5ea725a 100644 --- a/src/infrastructure/customfield/standard/PhabricatorStandardCustomFieldPHIDs.php +++ b/src/infrastructure/customfield/standard/PhabricatorStandardCustomFieldPHIDs.php @@ -40,7 +40,7 @@ abstract class PhabricatorStandardCustomFieldPHIDs // TODO: Clean this up. $result = array(); - if (!is_array($value)) { + if (!is_array($value) && phutil_nonempty_string($value)) { $value = json_decode($value, true); if (is_array($value)) { $result = array_values($value); diff --git a/src/infrastructure/customfield/standard/PhabricatorStandardCustomFieldSelect.php b/src/infrastructure/customfield/standard/PhabricatorStandardCustomFieldSelect.php index 5957afe56a..12e0aa6c3d 100644 --- a/src/infrastructure/customfield/standard/PhabricatorStandardCustomFieldSelect.php +++ b/src/infrastructure/customfield/standard/PhabricatorStandardCustomFieldSelect.php @@ -73,7 +73,7 @@ final class PhabricatorStandardCustomFieldSelect } public function renderPropertyViewValue(array $handles) { - if (!strlen($this->getFieldValue())) { + if (!phutil_nonempty_string($this->getFieldValue())) { return null; } return idx($this->getOptions(), $this->getFieldValue());