X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=framework%2Fmain%2Fclasses%2Ffilter%2Fpayment%2Fclass_PaymentDiscoveryFilter.php;h=70e1c09ce96ebec17069ab0a1e7c9b7afe34d9fe;hp=5df7ac34ee8d94ac920b7fc616c54ddef3721944;hb=HEAD;hpb=a60894f1d6ef33613d2d0351075aa07aa257f304

diff --git a/framework/main/classes/filter/payment/class_PaymentDiscoveryFilter.php b/framework/main/classes/filter/payment/class_PaymentDiscoveryFilter.php
index 5df7ac34..1536aec8 100644
--- a/framework/main/classes/filter/payment/class_PaymentDiscoveryFilter.php
+++ b/framework/main/classes/filter/payment/class_PaymentDiscoveryFilter.php
@@ -4,12 +4,14 @@ namespace Org\Mxchange\CoreFramework\Filter\Discovery\Payment;
 
 // Import framework stuff
 use Org\Mxchange\CoreFramework\Action\PerformableAction;
-use Org\Mxchange\CoreFramework\Factory\ObjectFactory;
+use Org\Mxchange\CoreFramework\Configuration\NoConfigEntryException;
+use Org\Mxchange\CoreFramework\Factory\Object\ObjectFactory;
 use Org\Mxchange\CoreFramework\Filter\BaseFilter;
+use Org\Mxchange\CoreFramework\Filter\Chain\FilterChainException;
 use Org\Mxchange\CoreFramework\Filter\Filterable;
 use Org\Mxchange\CoreFramework\Generic\NullPointerException;
 use Org\Mxchange\CoreFramework\Loader\NoClassException;
-use Org\Mxchange\CoreFramework\Registry\GenericRegistry;
+use Org\Mxchange\CoreFramework\Registry\Object\ObjectRegistry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
 
@@ -20,7 +22,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable;
  *
  * @author		Roland Haeder <webmaster@shipsimu.org>
  * @version		0.0.0
- * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+ * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2023 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
  *
@@ -48,7 +50,7 @@ class PaymentDiscoveryFilter extends BaseFilter implements Filterable {
 	 *
 	 * @return	void
 	 */
-	protected function __construct () {
+	private function __construct () {
 		// Call parent constructor
 		parent::__construct(__CLASS__);
 	}
@@ -70,8 +72,8 @@ class PaymentDiscoveryFilter extends BaseFilter implements Filterable {
 		// Is the resolver set?
 		if (is_null($resolverInstance)) {
 			// Throw an exception here
-			throw new NullPointerException($filterInstance, self::EXCEPTION_IS_NULL_POINTER);
-		} // END - if
+			throw new NullPointerException($filterInstance, FrameworkInterface::EXCEPTION_IS_NULL_POINTER);
+		}
 
 		// Get the action name from resolver
 		$actionName = $resolverInstance->getActionName();
@@ -89,8 +91,8 @@ class PaymentDiscoveryFilter extends BaseFilter implements Filterable {
 	 * @param	$actionName		Action name to set
 	 * @return	void
 	 */
-	protected final function setActionName ($actionName) {
-		$this->actionName = (string) $actionName;
+	protected final function setActionName (string $actionName) {
+		$this->actionName = $actionName;
 	}
 
 	/**
@@ -115,16 +117,16 @@ 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', [$this]);
 
 			// Call the discovery method
 			$discoveryInstance->discover($requestInstance);
 
 			// Remember this instance if all wents fine
-			GenericRegistry::getRegistry()->addInstance('payments', $discoveryInstance);
+			ObjectRegistry::getRegistry('generic')->addInstance('payments', $discoveryInstance);
 		} catch (NoConfigEntryException $e) {
 			// Something bad happend
-			$requestInstance->requestIsValid(false);
+			$requestInstance->setIsRequestValid(FALSE);
 
 			// Add a message to the response
 			$responseInstance->addFatalMessage('payment_config_entry_error');
@@ -134,7 +136,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->setIsRequestValid(FALSE);
 
 			// Add a message to the response
 			$responseInstance->addFatalMessage('payment_class_error');