revi-archive/phorge-phorge
1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2025-02-18 01:38:39 +01:00
Code Issues Releases Wiki Activity

Fix PHP 8.1 "strlen(null)" exceptions which block rendering page to import ICS calendar file

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.

Closes T15362

Test Plan: Applied these two changes and `/calendar/import/edit/` correctly rendered the "Create Import" page in the web browser, with the expected error about the missing ICS file (instead of an exception stacktrace).

Reviewers: O1 Blessed Committers, valerio.bozzolan

Reviewed By: O1 Blessed Committers, valerio.bozzolan

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

Maniphest Tasks: T15362

Differential Revision: https://we.phorge.it/D25200
This commit is contained in:
Andre Klapper 2023-05-08 23:12:22 +02:00
parent 1b08be518e
commit 8d2b481bb5
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/calendar/import/PhabricatorCalendarICSFileImportEngine.php
View file

@ -56,7 +56,7 @@ final class PhabricatorCalendarICSFileImportEngine
public function getDisplayName(PhabricatorCalendarImport $import) { public function getDisplayName(PhabricatorCalendarImport $import) {
$filename_key = PhabricatorCalendarImportICSFileTransaction::PARAMKEY_NAME; $filename_key = PhabricatorCalendarImportICSFileTransaction::PARAMKEY_NAME;
$filename = $import->getParameter($filename_key); $filename = $import->getParameter($filename_key);
if (strlen($filename)) { if (phutil_nonempty_string($filename)) {
return pht('ICS File "%s"', $filename); return pht('ICS File "%s"', $filename);
} else { } else {
return pht('ICS File'); return pht('ICS File');

2
src/applications/calendar/xaction/PhabricatorCalendarImportICSFileTransaction.php
View file

@ -53,7 +53,7 @@ final class PhabricatorCalendarImportICSFileTransaction
$new_value = $object->getParameter(self::PARAMKEY_FILE); $new_value = $object->getParameter(self::PARAMKEY_FILE);
foreach ($xactions as $xaction) { foreach ($xactions as $xaction) {
$new_value = $xaction->getNewValue(); $new_value = $xaction->getNewValue();
if (!strlen($new_value)) { if (!phutil_nonempty_string($new_value)) {
continue; continue;
} }