revi-archive/phorge-arcanist
1
0
Fork 0
mirror of https://we.phorge.it/source/arcanist.git synced 2024-11-25 08:12:40 +01:00
Code Issues Releases Wiki Activity

Pass the file contents instead of the file path to phutil_json_decode.

Browse source 
Summary: See D9681#22.

Test Plan: Created an empty `.git/arc/config` file... no exception was thrown.

Reviewers: epriestley, #blessed_reviewers

Reviewed By: epriestley, #blessed_reviewers

Subscribers: epriestley, Korvin

Differential Revision: https://secure.phabricator.com/D9704
This commit is contained in:
Joshua Spence 2014-06-24 11:40:04 +10:00
parent 750a94e89f
commit 108a4dc9e6
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/workingcopyidentity/ArcanistWorkingCopyIdentity.php
View file

@ -311,7 +311,8 @@ final class ArcanistWorkingCopyIdentity {
$local_path)); $local_path));
try { try {
return phutil_json_decode($local_path); $json = Filesystem::readFile($local_path);
return phutil_json_decode($json);
} catch (PhutilJSONParserException $ex) { } catch (PhutilJSONParserException $ex) {
throw new PhutilProxyException( throw new PhutilProxyException(
pht("Failed to parse '%s' as JSON.", $local_path), pht("Failed to parse '%s' as JSON.", $local_path),