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

Fix PHP 8.1 null exceptions which block rendering tab panels on dashboards

Browse source 
Summary:
Passing null as input strings to `substr()` and `preg_match()` is deprecated in PHP 8.
Thus do not call `substr()` when input is `null` and pass an empty string instead of `null` to `preg_match()`. (Not calling `preg_match()` at all here would lead to `Exception: Lexical error on line 1. Unrecognized text. ^`).

Closes T15346

Test Plan: After applying these three changes and following the steps in T15346, tab on the dashboard displays "This tab panel does not have any tabs yet." as expected instead of the previous RuntimeException.

Reviewers: O1 Blessed Committers, valerio.bozzolan

Reviewed By: O1 Blessed Committers, valerio.bozzolan

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

Maniphest Tasks: T15346

Differential Revision: https://we.phorge.it/D25250
This commit is contained in:
Andre Klapper 2023-06-02 18:30:39 +02:00
parent 8eda766990
commit b325304b6e
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
externals/jsonlint/src/Seld/JsonLint/JsonParser.php vendored
View file

@ -481,7 +481,7 @@ class JsonLintJsonParser
// UTF-8 ByteOrderMark sequence // UTF-8 ByteOrderMark sequence
$bom = "\xEF\xBB\xBF"; $bom = "\xEF\xBB\xBF";
if (substr($input, 0, 3) === $bom) { if ($input && (substr($input, 0, 3) === $bom)) {
$this->parseError("BOM detected, make sure your input does not include a Unicode Byte-Order-Mark", array()); $this->parseError("BOM detected, make sure your input does not include a Unicode Byte-Order-Mark", array());
} }
} }

5
externals/jsonlint/src/Seld/JsonLint/Lexer.php vendored
View file

@ -94,7 +94,7 @@ class JsonLintLexer
public function getUpcomingInput() public function getUpcomingInput()
{ {
$next = $this->match; $next = $this->match;
if (strlen($next) < 20) { if ($this->input !== null && strlen($next) < 20) {
$next .= substr($this->input, 0, 20 - strlen($next)); $next .= substr($this->input, 0, 20 - strlen($next));
} }
@ -128,6 +128,9 @@ class JsonLintLexer
$rules = $this->getCurrentRules(); $rules = $this->getCurrentRules();
$rulesLen = count($rules); $rulesLen = count($rules);
if (!isset($this->input)) {
$this->input = '';
}
for ($i=0; $i < $rulesLen; $i++) { for ($i=0; $i < $rulesLen; $i++) {
if (preg_match($this->rules[$rules[$i]], $this->input, $match)) { if (preg_match($this->rules[$rules[$i]], $this->input, $match)) {
preg_match_all('/\n.*/', $match[0], $lines); preg_match_all('/\n.*/', $match[0], $lines);