diff --git a/src/applications/conduit/method/differential/ConduitAPI_differential_parsecommitmessage_Method.php b/src/applications/conduit/method/differential/ConduitAPI_differential_parsecommitmessage_Method.php index b7b85deed7..a25d977652 100644 --- a/src/applications/conduit/method/differential/ConduitAPI_differential_parsecommitmessage_Method.php +++ b/src/applications/conduit/method/differential/ConduitAPI_differential_parsecommitmessage_Method.php @@ -69,12 +69,11 @@ final class ConduitAPI_differential_parsecommitmessage_Method $field = $aux_fields[$field_key]; try { $fields[$field_key] = $field->parseValueFromCommitMessage($field_value); + $field->setValueFromParsedCommitMessage($fields[$field_key]); } catch (DifferentialFieldParseException $ex) { $field_label = $field->renderLabelForCommitMessage(); $errors[] = "Error parsing field '{$field_label}': ".$ex->getMessage(); - $fields[$field_key] = $ex->getPartialParse(); } - $field->setValueFromParsedCommitMessage($fields[$field_key]); } if (!$is_partial) { diff --git a/src/applications/differential/field/exception/DifferentialFieldParseException.php b/src/applications/differential/field/exception/DifferentialFieldParseException.php index 992fb72168..33254675a1 100644 --- a/src/applications/differential/field/exception/DifferentialFieldParseException.php +++ b/src/applications/differential/field/exception/DifferentialFieldParseException.php @@ -18,14 +18,4 @@ final class DifferentialFieldParseException extends Exception { - private $partialParse; - - public function __construct($message, $partial_parse = null) { - parent::__construct($message); - $this->partialParse = $partial_parse; - } - - public function getPartialParse() { - return $this->partialParse; - } } diff --git a/src/applications/differential/field/specification/DifferentialFieldSpecification.php b/src/applications/differential/field/specification/DifferentialFieldSpecification.php index 728be2d079..ce13cb222e 100644 --- a/src/applications/differential/field/specification/DifferentialFieldSpecification.php +++ b/src/applications/differential/field/specification/DifferentialFieldSpecification.php @@ -768,8 +768,7 @@ abstract class DifferentialFieldSpecification { ? "users and mailing lists" : "users"; throw new DifferentialFieldParseException( - "Commit message references nonexistent {$what}: {$invalid}.", - array_unique($results)); + "Commit message references nonexistent {$what}: {$invalid}."); } return array_unique($results); diff --git a/src/applications/differential/field/specification/DifferentialManiphestTasksFieldSpecification.php b/src/applications/differential/field/specification/DifferentialManiphestTasksFieldSpecification.php index 4758301a84..8f4760b78f 100644 --- a/src/applications/differential/field/specification/DifferentialManiphestTasksFieldSpecification.php +++ b/src/applications/differential/field/specification/DifferentialManiphestTasksFieldSpecification.php @@ -149,8 +149,7 @@ final class DifferentialManiphestTasksFieldSpecification } $invalid = implode(', ', $invalid); throw new DifferentialFieldParseException( - "Commit message references nonexistent {$what}: {$invalid}.", - $task_phids); + "Commit message references nonexistent {$what}: {$invalid}."); } return $task_phids;