Skip to content

Commit ce3d484

Browse files
committedMay 29, 2023
Addressing some PHP8 incompatibilities - Diffusion & Differential
Summary: Running through setting up and using Diffusion repositories and addressing PHP8 issues that come up. Test Plan: I set up a hosted mercurial repository and pushed commits to it over ssh. I set up a hosted git repository and pushed commits to it over ssh. I set up a mirrored mercurial repository over ssh. I set up a mirrored git repository over ssh. I created a diff on a git repository and landed it. I created a diff on a mercurial repository and landed it. I cloned and pushed a commit to a mercurial repo over http. I cloned and pushed a commit to a git repo over http. Reviewers: #blessed_reviewers, epriestley Reviewed By: #blessed_reviewers, epriestley Subscribers: Korvin, epriestley Differential Revision: https://secure.phabricator.com/D21864
1 parent 5899526 commit ce3d484

File tree

51 files changed

+151
-83
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+151
-83
lines changed
 

‎scripts/ssh/ssh-auth.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636

3737
$authstruct = null;
3838

39-
if (strlen($authstruct_raw)) {
39+
if ($authstruct_raw !== null && strlen($authstruct_raw)) {
4040
try {
4141
$authstruct = phutil_json_decode($authstruct_raw);
4242
} catch (Exception $ex) {
@@ -135,7 +135,7 @@
135135

136136
$cmd = csprintf('%s %Ls', $bin, $key_argv);
137137

138-
if (strlen($instance)) {
138+
if ($instance !== null && strlen($instance)) {
139139
$cmd = csprintf('PHABRICATOR_INSTANCE=%s %C', $instance, $cmd);
140140
}
141141

‎src/applications/almanac/util/AlmanacKeys.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public static function getLiveDevice() {
5858

5959
public static function getClusterSSHUser() {
6060
$username = PhabricatorEnv::getEnvConfig('diffusion.ssh-user');
61-
if (strlen($username)) {
61+
if ($username !== null && strlen($username)) {
6262
return $username;
6363
}
6464

0 commit comments

Comments
 (0)
Failed to load comments.