mirror of
https://we.phorge.it/source/phorge.git
synced 2024-11-25 16:22:43 +01:00
Fix PHP 8.1 "strlen(null)" exception on History page of Diffusion repo after setting maintenance mode
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. ``` EXCEPTION: (RuntimeException) strlen(): Passing null to parameter #1 ($string) of type string is deprecated at [<arcanist>/src/error/PhutilErrorHandler.php:261] arcanist(head=master, ref.master=97e163187418), phorge(head=master, ref.master=1c098c273d06) #0 <#2> PhutilErrorHandler::handleError(integer, string, string, integer) called at [<phorge>/src/applications/repository/xaction/PhabricatorRepositoryMaintenanceTransaction.php:28] ``` Closes T15475 Test Plan: Play a bit with maintenance messages: ./bin/repository maintenance --start "Start" R1 ./bin/repository maintenance --start "Start Yeah" R1 ./bin/repository maintenance --stop R1 Then visit `/diffusion/1/manage/history/` and look at `Diffusion put this repository into maintenance mode.` as expected, instead of an exception. Reviewers: O1 Blessed Committers, valerio.bozzolan Reviewed By: O1 Blessed Committers, valerio.bozzolan Subscribers: speck, tobiaswiese, valerio.bozzolan, Matthew, Cigaryno Maniphest Tasks: T15475 Differential Revision: https://we.phorge.it/D25295
This commit is contained in:
parent
f45d6421a1
commit
71f38a90a3
1 changed files with 5 additions and 2 deletions
|
@ -25,11 +25,14 @@ final class PhabricatorRepositoryMaintenanceTransaction
|
|||
$old = $this->getOldValue();
|
||||
$new = $this->getNewValue();
|
||||
|
||||
if (strlen($old) && !strlen($new)) {
|
||||
$old_nonempty = phutil_nonempty_string($old);
|
||||
$new_nonempty = phutil_nonempty_string($new);
|
||||
|
||||
if ($old_nonempty && !$new_nonempty) {
|
||||
return pht(
|
||||
'%s took this repository out of maintenance mode.',
|
||||
$this->renderAuthor());
|
||||
} else if (!strlen($old) && strlen($new)) {
|
||||
} else if (!$old_nonempty && $new_nonempty) {
|
||||
return pht(
|
||||
'%s put this repository into maintenance mode.',
|
||||
$this->renderAuthor());
|
||||
|
|
Loading…
Reference in a new issue