Don't "abuse" setters for actually "unsetting" (closing) instances. Better use

[core.git] / inc / classes / main / filter / payment / class_PaymentDiscoveryFilter.php

diff --git a/inc/classes/main/filter/payment/class_PaymentDiscoveryFilter.php b/inc/classes/main/filter/payment/class_PaymentDiscoveryFilter.php
index 4f3ef1b90bd088863a6b93977069ce8db03ce750..7a016ece8c46f2b0cda6b287191615d884a0c394 100644 (file)
--- a/inc/classes/main/filter/payment/class_PaymentDiscoveryFilter.php
+++ b/inc/classes/main/filter/payment/class_PaymentDiscoveryFilter.php
@@ -4,11 +4,11 @@
  * returns an object holding all available payment system for the requested
  * type.
  *
- * @author             Roland Haeder <webmaster@ship-simu.org>
+ * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009, 2010 Core Developer Team
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2015 Core Developer Team
  * @license            GNU GPL 3.0 or any newer version
- * @link               http://www.ship-simu.org
+ * @link               http://www.shipsimu.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -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();
 
@@ -101,7 +101,7 @@ class PaymentDiscoveryFilter extends BaseFilter implements Filterable {
                // Try to get real discovery class
                try {
                        // Get an instance from the object factory
-                       $discoveryInstance = ObjectFactory::createObjectByConfiguredName($this->getActionName().'_payment_discovery', array($this));
+                       $discoveryInstance = ObjectFactory::createObjectByConfiguredName($this->getActionName() . '_payment_discovery', array($this));
 
                        // Call the discovery method
                        $discoveryInstance->discover($requestInstance);
@@ -110,7 +110,7 @@ class PaymentDiscoveryFilter extends BaseFilter implements Filterable {
                        Registry::getRegistry()->addInstance('payments', $discoveryInstance);
                } catch (NoConfigEntryException $e) {
                        // Something bad happend
-                       $requestInstance->requestIsValid(false);
+                       $requestInstance->requestIsValid(FALSE);
 
                        // Add a message to the response
                        $responseInstance->addFatalMessage('payment_config_entry_error');
@@ -120,7 +120,7 @@ class PaymentDiscoveryFilter extends BaseFilter implements Filterable {
                        throw new FilterChainException($this, self::EXCEPTION_FILTER_CHAIN_INTERCEPTED);
                } catch (NoClassException $e) {
                        // Something bad happend
-                       $requestInstance->requestIsValid(false);
+                       $requestInstance->requestIsValid(FALSE);
 
                        // Add a message to the response
                        $responseInstance->addFatalMessage('payment_class_error');