Continued:

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

diff --git a/framework/main/classes/filter/payment/class_PaymentDiscoveryFilter.php b/framework/main/classes/filter/payment/class_PaymentDiscoveryFilter.php
index 2b98122f3e115adec7d47ad87fbf0164bcd12bc2..c5843a4badc58bdffb02557a0d0a690534c493c1 100644 (file)
--- a/framework/main/classes/filter/payment/class_PaymentDiscoveryFilter.php
+++ b/framework/main/classes/filter/payment/class_PaymentDiscoveryFilter.php
@@ -1,17 +1,19 @@
 <?php
 // Own namespace
-namespace CoreFramework\Filter\Discovery\Payment;
+namespace Org\Mxchange\CoreFramework\Filter\Discovery\Payment;
 
 // Import framework stuff
-use CoreFramework\Action\PerformableAction;
-use CoreFramework\Factory\ObjectFactory;
-use CoreFramework\Filter\BaseFilter;
-use CoreFramework\Filter\Filterable;
-use CoreFramework\Generic\NullPointerException;
-use CoreFramework\Loader\NoClassException;
-use CoreFramework\Registry\Registry;
-use CoreFramework\Request\Requestable;
-use CoreFramework\Response\Responseable;
+use Org\Mxchange\CoreFramework\Action\PerformableAction;
+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\Request\Requestable;
+use Org\Mxchange\CoreFramework\Response\Responseable;
 
 /**
  * A filter for payment discovery. This class discovers the payment type and
@@ -20,7 +22,7 @@ use 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 - 2022 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__);
        }
@@ -71,7 +73,7 @@ class PaymentDiscoveryFilter extends BaseFilter implements Filterable {
                if (is_null($resolverInstance)) {
                        // Throw an exception here
                        throw new NullPointerException($filterInstance, self::EXCEPTION_IS_NULL_POINTER);
-               } // END - if
+               }
 
                // 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
-                       Registry::getRegistry()->addInstance('payments', $discoveryInstance);
+                       GenericRegistry::getRegistry()->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');