From 9d512595c0e2a37bb50097f3494af806b8322d45 Mon Sep 17 00:00:00 2001
From: Steve Campbell <steve.campbell@virginmedia.co.uk>
Date: Wed, 5 Jul 2023 14:24:47 +0100
Subject: [PATCH] Fix PHP 8.1 DifferentialBranchField getBranchDescription
 strlen(null) error

Summary:
Fix PHP 8.1 strlen(null) error in DifferentialBranchField getBranchDescription()

Fixes T15531

Test Plan:
Simply viewing a diff (eg https://my.phorge.site/D1234) on a PHP 8.1 server generated the error fixed by this diff.

Also created a unit test.

Reviewers: O1 Blessed Committers, valerio.bozzolan

Reviewed By: O1 Blessed Committers, valerio.bozzolan

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

Maniphest Tasks: T15531

Differential Revision: https://we.phorge.it/D25335
---
 src/__phutil_library_map__.php                |  2 +
 .../customfield/DifferentialBranchField.php   |  2 +-
 .../DifferentialBranchFieldTestCase.php       | 39 +++++++++++++++++++
 3 files changed, 42 insertions(+), 1 deletion(-)
 create mode 100644 src/applications/differential/customfield/__tests__/DifferentialBranchFieldTestCase.php

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 3de392e025..ddee83b5f1 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -466,6 +466,7 @@ phutil_register_library_map(array(
     'DifferentialBlockHeraldAction' => 'applications/differential/herald/DifferentialBlockHeraldAction.php',
     'DifferentialBlockingReviewerDatasource' => 'applications/differential/typeahead/DifferentialBlockingReviewerDatasource.php',
     'DifferentialBranchField' => 'applications/differential/customfield/DifferentialBranchField.php',
+    'DifferentialBranchFieldTestCase' => 'applications/differential/customfield/__tests__/DifferentialBranchFieldTestCase.php',
     'DifferentialBuildableEngine' => 'applications/differential/harbormaster/DifferentialBuildableEngine.php',
     'DifferentialChangeDetailMailView' => 'applications/differential/mail/DifferentialChangeDetailMailView.php',
     'DifferentialChangeHeraldFieldGroup' => 'applications/differential/herald/DifferentialChangeHeraldFieldGroup.php',
@@ -6472,6 +6473,7 @@ phutil_register_library_map(array(
     'DifferentialBlockHeraldAction' => 'HeraldAction',
     'DifferentialBlockingReviewerDatasource' => 'PhabricatorTypeaheadCompositeDatasource',
     'DifferentialBranchField' => 'DifferentialCustomField',
+    'DifferentialBranchFieldTestCase' => 'PhabricatorTestCase',
     'DifferentialBuildableEngine' => 'HarbormasterBuildableEngine',
     'DifferentialChangeDetailMailView' => 'DifferentialMailView',
     'DifferentialChangeHeraldFieldGroup' => 'HeraldFieldGroup',
diff --git a/src/applications/differential/customfield/DifferentialBranchField.php b/src/applications/differential/customfield/DifferentialBranchField.php
index 60291b6be3..9d5d8f81a9 100644
--- a/src/applications/differential/customfield/DifferentialBranchField.php
+++ b/src/applications/differential/customfield/DifferentialBranchField.php
@@ -45,7 +45,7 @@ final class DifferentialBranchField
       return pht('%s (bookmark)', $bookmark);
     } else if (strlen($branch)) {
       $onto = $diff->loadTargetBranch();
-      if (strlen($onto) && ($onto !== $branch)) {
+      if (phutil_nonempty_string($onto) && ($onto !== $branch)) {
         return pht(
           '%s (branched from %s)',
           $branch,
diff --git a/src/applications/differential/customfield/__tests__/DifferentialBranchFieldTestCase.php b/src/applications/differential/customfield/__tests__/DifferentialBranchFieldTestCase.php
new file mode 100644
index 0000000000..e96b4bd245
--- /dev/null
+++ b/src/applications/differential/customfield/__tests__/DifferentialBranchFieldTestCase.php
@@ -0,0 +1,39 @@
+<?php
+
+final class DifferentialBranchFieldTestCase extends PhabricatorTestCase {
+
+  protected function getPhabricatorTestCaseConfiguration() {
+    return array(
+      self::PHABRICATOR_TESTCONFIG_BUILD_STORAGE_FIXTURES => true,
+    );
+  }
+
+  private function getTestDiff() {
+  $parser = new ArcanistDiffParser();
+  $raw_diff = <<<EODIFF
+diff --git a/src b/src
+index 123457..bb216b1 100644
+--- a/src
++++ b/src
+@@ -1,5 +1,5 @@
+ Line a
+-Line b
++Line 2
+ Line c
+ Line d
+ Line e
+EODIFF;
+
+  return DifferentialDiff::newFromRawChanges(
+    PhabricatorUser::getOmnipotentUser(),
+    $parser->parseDiff($raw_diff));
+  }
+
+  public function testRenderDiffPropertyViewValue() {
+    $test_object = new DifferentialBranchField();
+    $diff = $this->getTestDiff();
+    $diff->setBranch('test');
+    $this->assertEqual('test',
+      $test_object->renderDiffPropertyViewValue($diff));
+  }
+}