Implement ArrayExpected exception

mantisbt · Jan 15, 2012 · e5aa632 · e5aa632
1 parent e45da50
commit e5aa632
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 6 deletions.
diff --git a/application/MantisBT/Exception/GPC/ArrayExpected.php b/application/MantisBT/Exception/GPC/ArrayExpected.php
@@ -0,0 +1,14 @@
+<?php
+namespace MantisBT\Exception\GPC;
+use MantisBT\Exception\ExceptionAbstract;
+
+require_api('lang_api.php');
+
+class ArrayExpected extends ExceptionAbstract {
+	public function __construct($variableName) {
+		$errorMessage = lang_get(ERROR_GPC_ARRAY_EXPECTED, null, false);
+		$errorMessage = sprintf($errorMessage, $variableName);
+		parent::__construct(ERROR_GPC_ARRAY_EXPECTED, $errorMessage, null);
+		$this->responseCode = 400;
+	}
+}
diff --git a/application/core/gpc_api.php b/application/core/gpc_api.php
@@ -32,6 +32,7 @@
  */
 
 use MantisBT\Exception\Field\EmptyField;
+use MantisBT\Exception\GPC\ArrayExpected;
 use MantisBT\Exception\GPC\ArrayUnexpected;
 
 require_api( 'config_api.php' );
@@ -259,8 +260,7 @@ function gpc_get_string_array( $p_var_name, $p_default = null ) {
 
 	# If we the result isn't the default we were given or an array, error
 	if( !((( 1 < func_num_args() ) && ( $t_result === $p_default ) ) || is_array( $t_result ) ) ) {
-		error_parameters( $p_var_name );
-		trigger_error( ERROR_GPC_ARRAY_EXPECTED, ERROR );
+		throw new ArrayExpected( $p_var_name );
 	}
 
 	return $t_result;
@@ -282,8 +282,7 @@ function gpc_get_int_array( $p_var_name, $p_default = null ) {
 
 	# If we the result isn't the default we were given or an array, error
 	if( !((( 1 < func_num_args() ) && ( $t_result === $p_default ) ) || is_array( $t_result ) ) ) {
-		error_parameters( $p_var_name );
-		trigger_error( ERROR_GPC_ARRAY_EXPECTED, ERROR );
+		throw new ArrayExpected( $p_var_name );
 	}
 
 	$t_count = count( $t_result );
@@ -309,8 +308,7 @@ function gpc_get_bool_array( $p_var_name, $p_default = null ) {
 
 	# If we the result isn't the default we were given or an array, error
 	if( !((( 1 < func_num_args() ) && ( $t_result === $p_default ) ) || is_array( $t_result ) ) ) {
-		error_parameters( $p_var_name );
-		trigger_error( ERROR_GPC_ARRAY_EXPECTED, ERROR );
+		throw new ArrayExpected( $p_var_name );
 	}
 
 	$t_count = count( $t_result );