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

Fix PHP 8.1 "strlen(null)" and preg_match() exceptions which block rendering "Browse Subscribers" overlay dialog

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.

Similarly, `preg_match()` does not accept passing `null` as `$subject` parameter since PHP 8.1.

Closes T15381

Test Plan: Applied these two changes (on top of D25179 and D25213), and on the task creation page, after clicking the magnifier icon in the "Subscribers" field, the "Browse Subscribers" overlay dialog got rendered.

Reviewers: O1 Blessed Committers, valerio.bozzolan

Reviewed By: O1 Blessed Committers, valerio.bozzolan

Subscribers: speck, tobiaswiese, valerio.bozzolan, Matthew, Cigaryno

Maniphest Tasks: T15381

Differential Revision: https://we.phorge.it/D25214
This commit is contained in:
Andre Klapper 2023-05-12 12:01:55 +02:00
parent bac87ca264
commit 3a3112f67b
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/applications/owners/typeahead/PhabricatorOwnersPackageDatasource.php
View file

@ -26,7 +26,7 @@ final class PhabricatorOwnersPackageDatasource
// If the user is querying by monogram explicitly, like "O123", do an ID // If the user is querying by monogram explicitly, like "O123", do an ID
// search. Otherwise, do an ngram substring search. // search. Otherwise, do an ngram substring search.
if (preg_match('/^[oO]\d+\z/', $raw_query)) { if ($raw_query && preg_match('/^[oO]\d+\z/', $raw_query)) {
$id = trim($raw_query, 'oO'); $id = trim($raw_query, 'oO');
$id = (int)$id; $id = (int)$id;
$query->withIDs(array($id)); $query->withIDs(array($id));

2
src/infrastructure/query/policy/PhabricatorCursorPagedPolicyAwareQuery.php
View file

@ -2449,7 +2449,7 @@ abstract class PhabricatorCursorPagedPolicyAwareQuery
PhabricatorSearchNgrams $index, PhabricatorSearchNgrams $index,
$value) { $value) {
if (strlen($value)) { if (phutil_nonempty_string($value)) {
$this->ngrams[] = array( $this->ngrams[] = array(
'index' => $index, 'index' => $index,
'value' => $value, 'value' => $value,