revi-archive/phorge-phorge
1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-11-22 14:52:41 +01:00
Code Issues Releases Wiki Activity

Fix PHP 8.1 Diffusion history errors

Browse source 
Summary:
Fix multiple PHP 8.1 errors when viewing Diffusion history.

Fixes T15573

Test Plan: View a diffusion history page. Eg https://my.php81.phorge.site/source/myrepo/history/master/

Reviewers: O1 Blessed Committers, speck

Reviewed By: O1 Blessed Committers, speck

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

Maniphest Tasks: T15573

Differential Revision: https://we.phorge.it/D25366
This commit is contained in:
sten 2023-07-29 12:51:00 +01:00
parent fa687b4ba0
commit 1802ebd2cc
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/applications/diffusion/controller/DiffusionHistoryController.php
View file

@ -50,7 +50,7 @@ final class DiffusionHistoryController extends DiffusionController {
// ancestors appropriately, but this would currrently be prohibitively // ancestors appropriately, but this would currrently be prohibitively
// expensive in the general case. // expensive in the general case.
$show_graph = !strlen($drequest->getPath()); $show_graph = !phutil_nonempty_string($drequest->getPath());
if ($show_graph) { if ($show_graph) {
$history_list $history_list
->setParents($history_results['parents']) ->setParents($history_results['parents'])
@ -98,11 +98,10 @@ final class DiffusionHistoryController extends DiffusionController {
$viewer = $this->getViewer(); $viewer = $this->getViewer();
$repository = $drequest->getRepository(); $repository = $drequest->getRepository();
$no_path = !strlen($drequest->getPath()); if (phutil_nonempty_string($drequest->getPath())) {
if ($no_path) {
$header_text = pht('History');
} else {
$header_text = $this->renderPathLinks($drequest, $mode = 'history'); $header_text = $this->renderPathLinks($drequest, $mode = 'history');
} else {
$header_text = pht('History');
} }
$header = id(new PHUIHeaderView()) $header = id(new PHUIHeaderView())

3
src/applications/diffusion/query/pathid/DiffusionPathIDQuery.php
View file

@ -48,6 +48,9 @@ final class DiffusionPathIDQuery extends Phobject {
*/ */
public static function normalizePath($path) { public static function normalizePath($path) {
// Ensure we have a string, not a null.
$path = coalesce($path, '');
// Normalize to single slashes, e.g. "///" => "/". // Normalize to single slashes, e.g. "///" => "/".
$path = preg_replace('@[/]{2,}@', '/', $path); $path = preg_replace('@[/]{2,}@', '/', $path);