Page MenuHomePhorge
Differential D25335

Fix PHP 8.1 DifferentialBranchField getBranchDescription strlen(null) error
ClosedPublic
Actions

Authored by Sten on Jul 5 2023, 13:32.
Tags
None
Referenced Files
F4116900: D25335.1746975818.diff
Sat, May 10, 15:03
F4116050: D25335.1746959094.diff
Sat, May 10, 10:24
F4110666: D25335.1746920407.diff
Fri, May 9, 23:40
F4093180: D25335.1746895970.diff
Fri, May 9, 16:52
F3979484: D25335.1746538165.diff
Mon, May 5, 13:29
F3946058: D25335.1746446180.diff
Sun, May 4, 11:56
F3904973: D25335.1746314111.diff
Fri, May 2, 23:15
F3882922: D25335.1746247015.diff
Fri, May 2, 04:36
View All 59 Files
Subscribers
Cigaryno
Matthew
speck
tobiaswiese
valerio.bozzolan

Details

Reviewers
valerio.bozzolan
Group Reviewers
O1: Blessed Committers
Maniphest Tasks
T15531: PHP 8.1 DifferentialBranchField getBranchDescription strlen(null) error
Commits
rP9d512595c0e2: 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.

Diff Detail

Repository
rP Phorge
Branch
DifferentialBranchField (branched from master)
Lint
Lint Passed
Unit
Tests Passed
Build Status
Buildable 644
Build 644: arc lint + arc unit

Event Timeline

Sten created this revision.Jul 5 2023, 13:32
Owners added a reviewer: O1: Blessed Committers.Jul 5 2023, 13:32
Herald added subscribers: Cigaryno, Matthew, valerio.bozzolan and 2 others. · View Herald TranscriptJul 5 2023, 13:32
Sten requested review of this revision.Jul 5 2023, 13:32
Harbormaster completed remote builds in B644: Diff 1079.Jul 5 2023, 13:32
valerio.bozzolan accepted this revision as: valerio.bozzolan.Jul 5 2023, 14:15

Hard +1 if that extra newline disappears :)

src/applications/differential/customfield/DifferentialBranchField.php
42

OH NO AN EXTRA LINE

49

✅ I verified that $onto must be a string or NULL, and that any other alien type will be reported exploding violently and we like that

Sten updated this revision to Diff 1083.Jul 5 2023, 14:39

Pesky newline removed :-)

Harbormaster completed remote builds in B647: Diff 1083.Jul 5 2023, 14:39
Sten marked an inline comment as done.Jul 5 2023, 14:39
valerio.bozzolan accepted this revision.Jul 5 2023, 14:40

sgtm

This revision is now accepted and ready to land.Jul 5 2023, 14:40
Closed by commit rP9d512595c0e2: Fix PHP 8.1 DifferentialBranchField getBranchDescription strlen(null) error. · Explain WhyJul 5 2023, 15:06
This revision was automatically updated to reflect the committed changes.
Sten added a commit: rP9d512595c0e2: Fix PHP 8.1 DifferentialBranchField getBranchDescription strlen(null) error.

Revision Contents
Changeset List

Diff 1079

View Options

src/__phutil_library_map__.php

<?php <?php
final class PhabricatorPeopleUserEmailQuery final class PhabricatorPeopleUserEmailQuery
extends PhabricatorCursorPagedPolicyAwareQuery { extends PhabricatorCursorPagedPolicyAwareQuery {
private $ids; private $ids;
private $phids; private $phids;
private $userPhids;
private $isVerified;
public function withIDs(array $ids) { public function withIDs(array $ids) {
$this->ids = $ids; $this->ids = $ids;
return $this; return $this;
} }
public function withPHIDs(array $phids) { public function withPHIDs(array $phids) {
$this->phids = $phids; $this->phids = $phids;
return $this; return $this;
} }
/**
* With the specified User PHIDs.
* @param null|array $phids User PHIDs
*/
public function withUserPHIDs(array $phids) {
$this->userPhids = $phids;
return $this;
}
/**
* With a verified email or not.
* @param bool|null $isVerified
*/
public function withIsVerified($verified) {
$this->isVerified = $verified;
return $this;
}
public function newResultObject() { public function newResultObject() {
return new PhabricatorUserEmail(); return new PhabricatorUserEmail();
} }
protected function getPrimaryTableAlias() { protected function getPrimaryTableAlias() {
return 'email'; return 'email';
} }
Show All 9 Lines protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
if ($this->phids !== null) { if ($this->phids !== null) {
$where[] = qsprintf( $where[] = qsprintf(
$conn, $conn,
'email.phid IN (%Ls)', 'email.phid IN (%Ls)',
$this->phids); $this->phids);
} }
if ($this->userPhids !== null) {
$where[] = qsprintf(
$conn,
'email.userPHID IN (%Ls)',
$this->userPhids);
}
if ($this->isVerified !== null) {
$where[] = qsprintf(
$conn,
'email.isVerified = %d',
(int)$this->isVerified);
}
return $where; return $where;
} }
protected function willLoadPage(array $page) { protected function willLoadPage(array $page) {
$user_phids = mpull($page, 'getUserPHID'); $user_phids = mpull($page, 'getUserPHID');
$users = id(new PhabricatorPeopleQuery()) $users = id(new PhabricatorPeopleQuery())
Show All 26 Lines
View Options

src/applications/differential/customfield/DifferentialBranchField.php

<?php <?php
final class PhabricatorPeopleUserEmailQuery final class PhabricatorPeopleUserEmailQuery
extends PhabricatorCursorPagedPolicyAwareQuery { extends PhabricatorCursorPagedPolicyAwareQuery {
private $ids; private $ids;
private $phids; private $phids;
private $userPhids;
private $isVerified;
public function withIDs(array $ids) { public function withIDs(array $ids) {
$this->ids = $ids; $this->ids = $ids;
return $this; return $this;
} }
public function withPHIDs(array $phids) { public function withPHIDs(array $phids) {
$this->phids = $phids; $this->phids = $phids;
return $this; return $this;
} }
/**
* With the specified User PHIDs.
* @param null|array $phids User PHIDs
*/
public function withUserPHIDs(array $phids) {
$this->userPhids = $phids;
return $this;
}
/**
* With a verified email or not.
* @param bool|null $isVerified
*/
public function withIsVerified($verified) {
$this->isVerified = $verified;
return $this;
}
public function newResultObject() { public function newResultObject() {
return new PhabricatorUserEmail(); return new PhabricatorUserEmail();
} }
protected function getPrimaryTableAlias() { protected function getPrimaryTableAlias() {
return 'email'; return 'email';
} }
Show All 9 Lines protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
if ($this->phids !== null) { if ($this->phids !== null) {
$where[] = qsprintf( $where[] = qsprintf(
$conn, $conn,
'email.phid IN (%Ls)', 'email.phid IN (%Ls)',
$this->phids); $this->phids);
} }
if ($this->userPhids !== null) {
$where[] = qsprintf(
$conn,
'email.userPHID IN (%Ls)',
$this->userPhids);
}
if ($this->isVerified !== null) {
$where[] = qsprintf(
$conn,
'email.isVerified = %d',
(int)$this->isVerified);
}
return $where; return $where;
} }
protected function willLoadPage(array $page) { protected function willLoadPage(array $page) {
$user_phids = mpull($page, 'getUserPHID'); $user_phids = mpull($page, 'getUserPHID');
$users = id(new PhabricatorPeopleQuery()) $users = id(new PhabricatorPeopleQuery())
Show All 26 Lines
View Options

src/applications/differential/customfield/__tests__/DifferentialBranchFieldTestCase.php

<?php <?php
final class PhabricatorPeopleUserEmailQuery final class PhabricatorPeopleUserEmailQuery
extends PhabricatorCursorPagedPolicyAwareQuery { extends PhabricatorCursorPagedPolicyAwareQuery {
private $ids; private $ids;
private $phids; private $phids;
private $userPhids;
private $isVerified;
public function withIDs(array $ids) { public function withIDs(array $ids) {
$this->ids = $ids; $this->ids = $ids;
return $this; return $this;
} }
public function withPHIDs(array $phids) { public function withPHIDs(array $phids) {
$this->phids = $phids; $this->phids = $phids;
return $this; return $this;
} }
/**
* With the specified User PHIDs.
* @param null|array $phids User PHIDs
*/
public function withUserPHIDs(array $phids) {
$this->userPhids = $phids;
return $this;
}
/**
* With a verified email or not.
* @param bool|null $isVerified
*/
public function withIsVerified($verified) {
$this->isVerified = $verified;
return $this;
}
public function newResultObject() { public function newResultObject() {
return new PhabricatorUserEmail(); return new PhabricatorUserEmail();
} }
protected function getPrimaryTableAlias() { protected function getPrimaryTableAlias() {
return 'email'; return 'email';
} }
Show All 9 Lines protected function buildWhereClauseParts(AphrontDatabaseConnection $conn) {
if ($this->phids !== null) { if ($this->phids !== null) {
$where[] = qsprintf( $where[] = qsprintf(
$conn, $conn,
'email.phid IN (%Ls)', 'email.phid IN (%Ls)',
$this->phids); $this->phids);
} }
if ($this->userPhids !== null) {
$where[] = qsprintf(
$conn,
'email.userPHID IN (%Ls)',
$this->userPhids);
}
if ($this->isVerified !== null) {
$where[] = qsprintf(
$conn,
'email.isVerified = %d',
(int)$this->isVerified);
}
return $where; return $where;
} }
protected function willLoadPage(array $page) { protected function willLoadPage(array $page) {
$user_phids = mpull($page, 'getUserPHID'); $user_phids = mpull($page, 'getUserPHID');
$users = id(new PhabricatorPeopleQuery()) $users = id(new PhabricatorPeopleQuery())
Show All 26 Lines
Content licensed under Creative Commons Attribution-ShareAlike 4.0 (CC-BY-SA) unless otherwise noted; code licensed under Apache 2.0 or other open source licenses. · CC BY-SA 4.0 · Apache 2.0