From 5fe2fc33fb1cdfffbb725f79c0c4b5192cfd9d97 Mon Sep 17 00:00:00 2001 From: Andre Klapper Date: Wed, 17 Apr 2024 13:11:22 +0200 Subject: [PATCH] Fix PHP 8.1 "strlen(null)" exception for "/bin/almanac register" without parameter 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. This patch also fixes two similar strlen() occurrences in the same source file. ``` ERROR 8192: strlen(): Passing null to parameter #1 ($string) of type string is deprecated at [/var/www/html/phorge/phorge/src/applications/almanac/management/AlmanacManagementRegisterWorkflow.php:41] ``` Test Plan: Run `../phorge/bin/almanac register`: Get no `strlen()` error anymore but only expected output `Usage Exception: Specify a device with --device.` Reviewers: O1 Blessed Committers, valerio.bozzolan Reviewed By: O1 Blessed Committers, valerio.bozzolan Subscribers: tobiaswiese, valerio.bozzolan, Matthew, Cigaryno Differential Revision: https://we.phorge.it/D25591 --- .../management/AlmanacManagementRegisterWorkflow.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/applications/almanac/management/AlmanacManagementRegisterWorkflow.php b/src/applications/almanac/management/AlmanacManagementRegisterWorkflow.php index 545a8c3931..c240c3b638 100644 --- a/src/applications/almanac/management/AlmanacManagementRegisterWorkflow.php +++ b/src/applications/almanac/management/AlmanacManagementRegisterWorkflow.php @@ -38,7 +38,7 @@ final class AlmanacManagementRegisterWorkflow $viewer = $this->getViewer(); $device_name = $args->getArg('device'); - if (!strlen($device_name)) { + if (!phutil_nonempty_string($device_name)) { throw new PhutilArgumentUsageException( pht('Specify a device with --device.')); } @@ -55,7 +55,7 @@ final class AlmanacManagementRegisterWorkflow $identify_as = $args->getArg('identify-as'); $raw_device = $device_name; - if (strlen($identify_as)) { + if (phutil_nonempty_string($identify_as)) { $raw_device = $identify_as; } @@ -70,7 +70,7 @@ final class AlmanacManagementRegisterWorkflow } $private_key_path = $args->getArg('private-key'); - if (!strlen($private_key_path)) { + if (!phutil_nonempty_string($private_key_path)) { throw new PhutilArgumentUsageException( pht('Specify a private key with --private-key.')); }