From 8d2b481bb5a83d1a4ce82014cabdc83fa3ca432d Mon Sep 17 00:00:00 2001
From: Andre Klapper <a9016009@gmx.de>
Date: Mon, 8 May 2023 23:12:22 +0200
Subject: [PATCH] Fix PHP 8.1 "strlen(null)" exceptions which block rendering
 page to import ICS calendar file

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
---
 .../calendar/import/PhabricatorCalendarICSFileImportEngine.php  | 2 +-
 .../xaction/PhabricatorCalendarImportICSFileTransaction.php     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/applications/calendar/import/PhabricatorCalendarICSFileImportEngine.php b/src/applications/calendar/import/PhabricatorCalendarICSFileImportEngine.php
index c37ba6c944..4fde813223 100644
--- a/src/applications/calendar/import/PhabricatorCalendarICSFileImportEngine.php
+++ b/src/applications/calendar/import/PhabricatorCalendarICSFileImportEngine.php
@@ -56,7 +56,7 @@ final class PhabricatorCalendarICSFileImportEngine
   public function getDisplayName(PhabricatorCalendarImport $import) {
     $filename_key = PhabricatorCalendarImportICSFileTransaction::PARAMKEY_NAME;
     $filename = $import->getParameter($filename_key);
-    if (strlen($filename)) {
+    if (phutil_nonempty_string($filename)) {
       return pht('ICS File "%s"', $filename);
     } else {
       return pht('ICS File');
diff --git a/src/applications/calendar/xaction/PhabricatorCalendarImportICSFileTransaction.php b/src/applications/calendar/xaction/PhabricatorCalendarImportICSFileTransaction.php
index 26a968d13d..51abdd8cad 100644
--- a/src/applications/calendar/xaction/PhabricatorCalendarImportICSFileTransaction.php
+++ b/src/applications/calendar/xaction/PhabricatorCalendarImportICSFileTransaction.php
@@ -53,7 +53,7 @@ final class PhabricatorCalendarImportICSFileTransaction
     $new_value = $object->getParameter(self::PARAMKEY_FILE);
     foreach ($xactions as $xaction) {
       $new_value = $xaction->getNewValue();
-      if (!strlen($new_value)) {
+      if (!phutil_nonempty_string($new_value)) {
         continue;
       }