+5 -12

src/applications/config/custom/PhabricatorConfigJSONOptionType.php

reviewed

··· 13 13 $display_value = $request->getStr('value'); 14 14 15 15 if (strlen($display_value)) { 16 16 - $storage_value = phutil_json_decode($display_value); 17 17 - if ($storage_value === null) { 16 16 + try { 17 17 + $storage_value = phutil_json_decode($display_value); 18 18 + $this->validateOption($option, $storage_value); 19 19 + } catch (Exception $ex) { 18 20 $e_value = pht('Invalid'); 19 19 - $errors[] = pht( 20 20 - 'Configuration value should be specified in JSON. The provided '. 21 21 - 'value is not valid JSON.'); 22 22 - } else { 23 23 - try { 24 24 - $this->validateOption($option, $storage_value); 25 25 - } catch (Exception $ex) { 26 26 - $e_value = pht('Invalid'); 27 27 - $errors[] = $ex->getMessage(); 28 28 - } 21 21 + $errors[] = $ex->getMessage(); 29 22 } 30 23 } else { 31 24 $storage_value = null;

+1 -4

src/applications/dashboard/paneltype/PhabricatorDashboardPanelTypeTabs.php

reviewed

··· 38 38 $config = $panel->getProperty('config'); 39 39 if (!is_array($config)) { 40 40 // NOTE: The older version of this panel stored raw JSON. 41 41 - $config = phutil_json_decode($config, null); 42 42 - if ($config === null) { 43 43 - throw new Exception(pht('The configuration is not valid JSON.')); 44 44 - } 41 41 + $config = phutil_json_decode($config); 45 42 } 46 43 47 44 $list = id(new PHUIListView())

+5 -1

src/applications/differential/customfield/DifferentialAuditorsField.php

reviewed

··· 20 20 } 21 21 22 22 public function setValueFromStorage($value) { 23 23 - $this->setValue(phutil_json_decode($value)); 23 23 + try { 24 24 + $this->setValue(phutil_json_decode($value)); 25 25 + } catch (PhutilJSONParserException $ex) { 26 26 + $this->setValue(array()); 27 27 + } 24 28 return $this; 25 29 } 26 30

+5 -1

src/applications/differential/customfield/DifferentialJIRAIssuesField.php

reviewed

··· 26 26 } 27 27 28 28 public function setValueFromStorage($value) { 29 29 - $this->setValue(phutil_json_decode($value)); 29 29 + try { 30 30 + $this->setValue(phutil_json_decode($value)); 31 31 + } catch (PhutilJSONParserException $ex) { 32 32 + $this->setValue(array()); 33 33 + } 30 34 return $this; 31 35 } 32 36

+3 -10

src/applications/differential/parser/__tests__/DifferentialCommitMessageParserTestCase.php

reviewed

··· 23 23 } 24 24 25 25 list($message, $fields, $output, $errors) = $parts; 26 26 - $fields = phutil_json_decode($fields, null); 27 27 - $output = phutil_json_decode($output, null); 28 28 - $errors = phutil_json_decode($errors, null); 29 29 - 30 30 - if ($fields === null || $output === null || $errors === null) { 31 31 - throw new Exception( 32 32 - pht( 33 33 - 'Expected test file "%s" to contain valid JSON in its sections.', 34 34 - $file)); 35 35 - } 26 26 + $fields = phutil_json_decode($fields); 27 27 + $output = phutil_json_decode($output); 28 28 + $errors = phutil_json_decode($errors); 36 29 37 30 $parser = id(new DifferentialCommitMessageParser()) 38 31 ->setLabelMap($fields)