From 412c01ffa6fbfa4fd6a760e0d29ed8af8296d5c8 Mon Sep 17 00:00:00 2001 From: Andre Klapper Date: Wed, 17 Apr 2024 13:08:14 +0200 Subject: [PATCH] Fix PHP 8.1 "strlen(null)" exception for "/bin/auth cache-pkcs8" 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 another similar strlen() occurrence 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/auth/management/PhabricatorAuthManagementCachePKCS8Workflow.php:35] ``` Test Plan: Run `../phorge/bin/auth cache-pkcs8`: Get no `strlen()` error anymore but only expected output `Usage Exception: You must specify the path to a public keyfile with --public.` 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/D25587 --- .../PhabricatorAuthManagementCachePKCS8Workflow.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/applications/auth/management/PhabricatorAuthManagementCachePKCS8Workflow.php b/src/applications/auth/management/PhabricatorAuthManagementCachePKCS8Workflow.php index 22f993cee5..1ffb8dab9a 100644 --- a/src/applications/auth/management/PhabricatorAuthManagementCachePKCS8Workflow.php +++ b/src/applications/auth/management/PhabricatorAuthManagementCachePKCS8Workflow.php @@ -32,7 +32,7 @@ final class PhabricatorAuthManagementCachePKCS8Workflow $console = PhutilConsole::getConsole(); $public_keyfile = $args->getArg('public'); - if (!strlen($public_keyfile)) { + if (!phutil_nonempty_string($public_keyfile)) { throw new PhutilArgumentUsageException( pht( 'You must specify the path to a public keyfile with %s.', @@ -49,7 +49,7 @@ final class PhabricatorAuthManagementCachePKCS8Workflow $public_key = Filesystem::readFile($public_keyfile); $pkcs8_keyfile = $args->getArg('pkcs8'); - if (!strlen($pkcs8_keyfile)) { + if (!phutil_nonempty_string($pkcs8_keyfile)) { throw new PhutilArgumentUsageException( pht( 'You must specify the path to a pkcs8 keyfile with %s.',