Implement FilterNotFound exception

mantisbt · Sep 17, 2011 · faf6a72 · faf6a72
1 parent 74840e5
commit faf6a72
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 8 deletions.
diff --git a/application/MantisBT/Exception/Filter/FilterNotFound.php b/application/MantisBT/Exception/Filter/FilterNotFound.php
@@ -0,0 +1,14 @@
+<?php
+namespace MantisBT\Exception\Filter;
+use MantisBT\Exception\ExceptionAbstract;
+
+require_api('lang_api.php');
+
+class FilterNotFound extends ExceptionAbstract {
+	public function __construct($filterID) {
+		$errorMessage = lang_get(ERROR_FILTER_NOT_FOUND, null, false);
+		$errorMessage = sprintf($errorMessage, $filterID);
+		parent::__construct(ERROR_FILTER_NOT_FOUND, $errorMessage, null);
+		$this->responseCode = 404;
+	}
+}
diff --git a/application/core/filter_api.php b/application/core/filter_api.php
@@ -34,7 +34,6 @@
  * @uses custom_field_api.php
  * @uses database_api.php
  * @uses date_api.php
- * @uses error_api.php
  * @uses event_api.php
  * @uses filter_constants_inc.php
  * @uses gpc_api.php
@@ -53,6 +52,7 @@
  */
 
 use MantisBT\Exception\Database\ColumnNotFound;
+use MantisBT\Exception\Filter\FilterNotFound;
 
 require_api( 'access_api.php' );
 require_api( 'authentication_api.php' );
@@ -65,7 +65,6 @@
 require_api( 'custom_field_api.php' );
 require_api( 'database_api.php' );
 require_api( 'date_api.php' );
-require_api( 'error_api.php' );
 require_api( 'event_api.php' );
 require_api( 'filter_constants_inc.php' );
 require_api( 'gpc_api.php' );
@@ -4299,8 +4298,7 @@ function filter_cache_row( $p_filter_id, $p_trigger_errors = true ) {
 
 	if( !$row ) {
 		if( $p_trigger_errors ) {
-			error_parameters( $p_filter_id );
-			trigger_error( ERROR_FILTER_NOT_FOUND, ERROR );
+			throw new FilterNotFound( $p_filter_id );
 		} else {
 			return false;
 		}

diff --git a/public/return_dynamic_filters.php b/public/return_dynamic_filters.php
@@ -27,13 +27,14 @@
  * @uses constant_inc.php
  * @uses current_user_api.php
  * @uses custom_field_api.php
- * @uses error_api.php
  * @uses filter_api.php
  * @uses filter_constants_inc.php
  * @uses gpc_api.php
  * @uses helper_api.php
  */
 
+use MantisBT\Exception\Filter\FilterNotFound;
+
 /**
  * MantisBT Core API's
  */
@@ -44,7 +45,6 @@
 require_api( 'constant_inc.php' );
 require_api( 'current_user_api.php' );
 require_api( 'custom_field_api.php' );
-require_api( 'error_api.php' );
 require_api( 'filter_api.php' );
 require_api( 'filter_constants_inc.php' );
 require_api( 'gpc_api.php' );
@@ -151,7 +151,6 @@ function return_dynamic_filters_prepend_headers() {
 
 	if ( !$t_found ) {
 		# error - no function to populate the target (e.g., print_filter_foo)
-		error_parameters( $f_filter_target );
-		trigger_error( ERROR_FILTER_NOT_FOUND, ERROR );
+		throw new FilterNotFound( $f_filter_target );
 	}
 }