revi-archive/phorge-phorge
1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-11-22 06:42:42 +01:00
Code Issues Releases Wiki Activity

Fix PHP 8.1 "strlen(null)" exception for "/bin/almanac register" without parameter

Browse source 
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
This commit is contained in:
Andre Klapper 2024-04-17 13:11:22 +02:00
parent db3e68137d
commit 5fe2fc33fb
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/applications/almanac/management/AlmanacManagementRegisterWorkflow.php
View file

@ -38,7 +38,7 @@ final class AlmanacManagementRegisterWorkflow
$viewer = $this->getViewer(); $viewer = $this->getViewer();
$device_name = $args->getArg('device'); $device_name = $args->getArg('device');
if (!strlen($device_name)) { if (!phutil_nonempty_string($device_name)) {
throw new PhutilArgumentUsageException( throw new PhutilArgumentUsageException(
pht('Specify a device with --device.')); pht('Specify a device with --device.'));
} }
@ -55,7 +55,7 @@ final class AlmanacManagementRegisterWorkflow
$identify_as = $args->getArg('identify-as'); $identify_as = $args->getArg('identify-as');
$raw_device = $device_name; $raw_device = $device_name;
if (strlen($identify_as)) { if (phutil_nonempty_string($identify_as)) {
$raw_device = $identify_as; $raw_device = $identify_as;
} }
@ -70,7 +70,7 @@ final class AlmanacManagementRegisterWorkflow
} }
$private_key_path = $args->getArg('private-key'); $private_key_path = $args->getArg('private-key');
if (!strlen($private_key_path)) { if (!phutil_nonempty_string($private_key_path)) {
throw new PhutilArgumentUsageException( throw new PhutilArgumentUsageException(
pht('Specify a private key with --private-key.')); pht('Specify a private key with --private-key.'));
} }