From bfd2eae26b95c04344c74ed6846beb6b587400e7 Mon Sep 17 00:00:00 2001 From: Robert Munteanu Date: Thu, 22 Oct 2009 11:18:39 +0300 Subject: [PATCH] Issue #11061: SOAP issue tests fail Fix according to review: - style fixes: there should be no spaces between function names and () - removed isset checks from some of the mci_get functions called by mc_issue_add and mc_issue_update since they are no longer used. --- api/soap/mc_api.php | 35 ----------------------------------- api/soap/mc_issue_api.php | 38 +++++++++++++++++++------------------- 2 files changed, 19 insertions(+), 54 deletions(-) diff --git a/api/soap/mc_api.php b/api/soap/mc_api.php index 68229006da..a9ee98adb8 100644 --- a/api/soap/mc_api.php +++ b/api/soap/mc_api.php @@ -99,10 +99,6 @@ function mci_get_project_view_state_id( $p_view_state ) { } function mci_get_user_id( $p_user ) { - if( !isset( $p_user ) ) { - return 0; - } - $t_user_id = 0; if( (int) $p_user['id'] != 0 ) { @@ -125,66 +121,35 @@ function mci_get_user_lang( $p_user_id ) { } function mci_get_status_id( $p_status ) { - if ( !isset( $p_status ) ) { - return (int)config_get( 'bug_submit_status' ); - } - return mci_get_enum_id_from_objectref( 'status', $p_status ); } function mci_get_severity_id( $p_severity ) { - if ( !isset( $p_severity ) ) { - return (int)config_get( 'default_bug_severity' ); - } - return mci_get_enum_id_from_objectref( 'severity', $p_severity ); } function mci_get_priority_id( $p_priority ) { - if ( !isset( $p_priority ) ) { - return (int)config_get( 'default_bug_priority' ); - } return mci_get_enum_id_from_objectref( 'priority', $p_priority ); } function mci_get_reproducibility_id( $p_reproducibility ) { - if ( !isset( $p_reproducibility ) ) { - return (int)config_get( 'default_bug_reproducibility' ); - } - return mci_get_enum_id_from_objectref( 'reproducibility', $p_reproducibility ); } function mci_get_resolution_id( $p_resolution ) { - if ( !isset( $p_resolution ) ) { - return (int)config_get( 'default_bug_resolution' ); - } - return mci_get_enum_id_from_objectref( 'resolution', $p_resolution ); } function mci_get_projection_id( $p_projection ) { - if ( !isset( $p_projection ) ) { - return (int)config_get( 'default_bug_projection' ); - } - return mci_get_enum_id_from_objectref( 'projection', $p_projection ); } function mci_get_eta_id( $p_eta ) { - if ( !isset( $p_eta ) ) { - return (int)config_get( 'default_bug_eta' ); - } - return mci_get_enum_id_from_objectref( 'eta', $p_eta ); } function mci_get_view_state_id( $p_view_state ) { - if ( !isset( $p_view_state ) ) { - return (int)config_get( 'default_bug_view_status' ); - } - return mci_get_enum_id_from_objectref( 'view_state', $p_view_state ); } diff --git a/api/soap/mc_issue_api.php b/api/soap/mc_issue_api.php index fd832ce240..cb501d7655 100644 --- a/api/soap/mc_issue_api.php +++ b/api/soap/mc_issue_api.php @@ -418,16 +418,16 @@ function mc_issue_add( $p_username, $p_password, $p_issue ) { $t_handler_id = isset( $p_issue['handler'] ) ? mci_get_user_id( $p_issue['handler'] ) : 0; $t_priority_id = isset( $p_issue['priority'] ) ? mci_get_priority_id( $p_issue['priority'] ) : config_get( 'default_bug_priority' ); $t_severity_id = isset( $p_issue['severity'] ) ? mci_get_severity_id( $p_issue['severity'] ) : config_get( 'default_bug_severity' ); - $t_status_id = isset ( $p_issue['status'] ) ? mci_get_status_id( $p_issue['status'] ) : config_get( 'bug_submit_status' ); - $t_reproducibility_id = isset ( $p_issue['reproducibility'] ) ? mci_get_reproducibility_id( $p_issue['reproducibility'] ) : config_get( 'default_bug_reproducibility' ); - $t_resolution_id = isset ( $p_issue['resolution'] ) ? mci_get_resolution_id( $p_issue['resolution'] ) : config_get('default_bug_resolution'); - $t_projection_id = isset ( $p_issue['projection'] ) ? mci_get_projection_id( $p_issue['projection'] ) : config_get('default_bug_resolution'); - $t_eta_id = isset ( $p_issue['eta'] ) ? mci_get_eta_id( $p_issue['eta'] ) : config_get('default_bug_eta'); - $t_view_state_id = isset ( $p_issue['view_state'] ) ? mci_get_view_state_id( $p_issue['view_state'] ) : config_get( 'default_bug_view_status' ); - $t_reporter_id = isset ( $p_issue['reporter'] ) ? mci_get_user_id( $p_issue['reporter'] ) : 0; + $t_status_id = isset( $p_issue['status'] ) ? mci_get_status_id( $p_issue['status'] ) : config_get( 'bug_submit_status' ); + $t_reproducibility_id = isset( $p_issue['reproducibility'] ) ? mci_get_reproducibility_id( $p_issue['reproducibility'] ) : config_get( 'default_bug_reproducibility' ); + $t_resolution_id = isset( $p_issue['resolution'] ) ? mci_get_resolution_id( $p_issue['resolution'] ) : config_get('default_bug_resolution'); + $t_projection_id = isset( $p_issue['projection'] ) ? mci_get_projection_id( $p_issue['projection'] ) : config_get('default_bug_resolution'); + $t_eta_id = isset( $p_issue['eta'] ) ? mci_get_eta_id( $p_issue['eta'] ) : config_get('default_bug_eta'); + $t_view_state_id = isset( $p_issue['view_state'] ) ? mci_get_view_state_id( $p_issue['view_state'] ) : config_get( 'default_bug_view_status' ); + $t_reporter_id = isset( $p_issue['reporter'] ) ? mci_get_user_id( $p_issue['reporter'] ) : 0; $t_summary = $p_issue['summary']; $t_description = $p_issue['description']; - $t_notes = isset ( $p_issue['notes'] ) ? $p_issue['notes'] : array(); + $t_notes = isset( $p_issue['notes'] ) ? $p_issue['notes'] : array(); if( $t_reporter_id == 0 ) { $t_reporter_id = $t_user_id; @@ -583,18 +583,18 @@ function mc_issue_update( $p_username, $p_password, $p_issue_id, $p_issue ) { $t_handler_id = isset( $p_issue['handler'] ) ? mci_get_user_id( $p_issue['handler'] ) : 0; $t_priority_id = isset( $p_issue['priority'] ) ? mci_get_priority_id( $p_issue['priority'] ) : config_get( 'default_bug_priority' ); $t_severity_id = isset( $p_issue['severity'] ) ? mci_get_severity_id( $p_issue['severity'] ) : config_get( 'default_bug_severity' ); - $t_status_id = isset ( $p_issue['status'] ) ? mci_get_status_id( $p_issue['status'] ) : config_get( 'bug_submit_status' ); - $t_reproducibility_id = isset ( $p_issue['reproducibility'] ) ? mci_get_reproducibility_id( $p_issue['reproducibility'] ) : config_get( 'default_bug_reproducibility' ); - $t_resolution_id = isset ( $p_issue['resolution'] ) ? mci_get_resolution_id( $p_issue['resolution'] ) : config_get('default_bug_resolution'); - $t_projection_id = isset ( $p_issue['projection'] ) ? mci_get_projection_id( $p_issue['projection'] ) : config_get('default_bug_resolution'); - $t_eta_id = isset ( $p_issue['eta'] ) ? mci_get_eta_id( $p_issue['eta'] ) : config_get('default_bug_eta'); - $t_view_state_id = isset ( $p_issue['view_state'] ) ? mci_get_view_state_id( $p_issue['view_state'] ) : config_get( 'default_bug_view_status' ); - $t_reporter_id = isset ( $p_issue['reporter'] ) ? mci_get_user_id( $p_issue['reporter'] ) : 0; + $t_status_id = isset( $p_issue['status'] ) ? mci_get_status_id( $p_issue['status'] ) : config_get( 'bug_submit_status' ); + $t_reproducibility_id = isset( $p_issue['reproducibility'] ) ? mci_get_reproducibility_id( $p_issue['reproducibility'] ) : config_get( 'default_bug_reproducibility' ); + $t_resolution_id = isset( $p_issue['resolution'] ) ? mci_get_resolution_id( $p_issue['resolution'] ) : config_get('default_bug_resolution'); + $t_projection_id = isset( $p_issue['projection'] ) ? mci_get_projection_id( $p_issue['projection'] ) : config_get('default_bug_resolution'); + $t_eta_id = isset( $p_issue['eta'] ) ? mci_get_eta_id( $p_issue['eta'] ) : config_get('default_bug_eta'); + $t_view_state_id = isset( $p_issue['view_state'] ) ? mci_get_view_state_id( $p_issue['view_state'] ) : config_get( 'default_bug_view_status' ); + $t_reporter_id = isset( $p_issue['reporter'] ) ? mci_get_user_id( $p_issue['reporter'] ) : 0; $t_project = $p_issue['project']; - $t_summary = isset ( $p_issue['summary'] ) ? $p_issue['summary'] : ''; - $t_description = isset ( $p_issue['description'] ) ? $p_issue['description'] : ''; - $t_additional_information = isset ( $p_issue['additional_information'] ) ? $p_issue['additional_information'] : ''; - $t_steps_to_reproduce = isset ( $p_issue['steps_to_reproduce'] ) ? $p_issue['steps_to_reproduce'] : ''; + $t_summary = isset( $p_issue['summary'] ) ? $p_issue['summary'] : ''; + $t_description = isset( $p_issue['description'] ) ? $p_issue['description'] : ''; + $t_additional_information = isset( $p_issue['additional_information'] ) ? $p_issue['additional_information'] : ''; + $t_steps_to_reproduce = isset( $p_issue['steps_to_reproduce'] ) ? $p_issue['steps_to_reproduce'] : ''; if( $t_reporter_id == 0 ) { $t_reporter_id = $t_user_id;