X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=inc%2Fclasses%2Fmain%2Ffilter%2Fpayment%2Fclass_PaymentDiscoveryFilter.php;h=124998f6a530fac687ae9289bd6d5354ffbb8247;hp=2439cb56406106274178c126ae939813301ba5da;hb=4b88c118b615335d06bd74e444173d21aef4406c;hpb=361e6320e50a8bb1a3ccb675388b8042361669ae

diff --git a/inc/classes/main/filter/payment/class_PaymentDiscoveryFilter.php b/inc/classes/main/filter/payment/class_PaymentDiscoveryFilter.php
index 2439cb56..124998f6 100644
--- a/inc/classes/main/filter/payment/class_PaymentDiscoveryFilter.php
+++ b/inc/classes/main/filter/payment/class_PaymentDiscoveryFilter.php
@@ -6,7 +6,7 @@
  *
  * @author		Roland Haeder <webmaster@ship-simu.org>
  * @version		0.0.0
- * @copyright	Copyright (c) 2007 - 2009 Roland Haeder, this is free software
+ * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2011 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.ship-simu.org
  *
@@ -27,7 +27,7 @@ class PaymentDiscoveryFilter extends BaseFilter implements Filterable {
 	/**
 	 * Action name for payment discovery
 	 */
-	private $actionName = "";
+	private $actionName = '';
 
 	/**
 	 * Protected constructor
@@ -46,7 +46,7 @@ class PaymentDiscoveryFilter extends BaseFilter implements Filterable {
 	 * @return	$filterInstance		An instance of this filter class
 	 * @throws	NullPointerException	If the resolver is not set
 	 */
-	public final static function createPaymentDiscoveryFilter (PerformableAction $actionInstance) {
+	public static final function createPaymentDiscoveryFilter (PerformableAction $actionInstance) {
 		// Get a new instance
 		$filterInstance = new PaymentDiscoveryFilter();
 
@@ -95,6 +95,7 @@ class PaymentDiscoveryFilter extends BaseFilter implements Filterable {
 	 * @param	$responseInstance	An instance of a class with an Responseable interface
 	 * @return	void
 	 * @todo	0% done
+	 * @throws	FilterChainException	If this filter fails to operate
 	 */
 	public function execute (Requestable $requestInstance, Responseable $responseInstance) {
 		// Try to get real discovery class
@@ -107,7 +108,7 @@ class PaymentDiscoveryFilter extends BaseFilter implements Filterable {
 
 			// Remember this instance if all wents fine
 			Registry::getRegistry()->addInstance('payments', $discoveryInstance);
-		} catch (ConfigEntryNotFoundException $e) {
+		} catch (NoConfigEntryException $e) {
 			// Something bad happend
 			$requestInstance->requestIsValid(false);
 
@@ -116,8 +117,8 @@ class PaymentDiscoveryFilter extends BaseFilter implements Filterable {
 			$responseInstance->addFatalMessagePlain($e->getMessage());
 
 			// Abort here
-			return false;
-		} catch (ClassNotFoundException $e) {
+			throw new FilterChainException($this, self::EXCEPTION_FILTER_CHAIN_INTERCEPTED);
+		} catch (NoClassException $e) {
 			// Something bad happend
 			$requestInstance->requestIsValid(false);
 
@@ -126,7 +127,7 @@ class PaymentDiscoveryFilter extends BaseFilter implements Filterable {
 			$responseInstance->addFatalMessagePlain($e->getMessage());
 
 			// Abort here
-			return false;
+			throw new FilterChainException($this, self::EXCEPTION_FILTER_CHAIN_INTERCEPTED);
 		}
 	}
 }