X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=framework%2Fmain%2Fclasses%2Ffilter%2Fverifier%2Fclass_UserGuestVerifierFilter.php;h=c150009ce69e5bcba8b74cbbb3344eccbe160d42;hb=HEAD;hp=9e559c6e49b58c00e424acf9060067e5add0039b;hpb=4f9cf34b521892cb99fae9b21b92787f3d555b74;p=core.git

diff --git a/framework/main/classes/filter/verifier/class_UserGuestVerifierFilter.php b/framework/main/classes/filter/verifier/class_UserGuestVerifierFilter.php
index 9e559c6e..e1f087d5 100644
--- a/framework/main/classes/filter/verifier/class_UserGuestVerifierFilter.php
+++ b/framework/main/classes/filter/verifier/class_UserGuestVerifierFilter.php
@@ -3,9 +3,11 @@
 namespace Org\Mxchange\CoreFramework\Filter\Verifier\User;
 
 // Import framework stuff
+use Org\Mxchange\CoreFramework\Bootstrap\FrameworkBootstrap;
 use Org\Mxchange\CoreFramework\Filter\BaseFilter;
+use Org\Mxchange\CoreFramework\Filter\Chain\FilterChainException;
 use Org\Mxchange\CoreFramework\Filter\Filterable;
-use Org\Mxchange\CoreFramework\Registry\Registry;
+use Org\Mxchange\CoreFramework\Registry\Object\ObjectRegistry;
 use Org\Mxchange\CoreFramework\Request\Requestable;
 use Org\Mxchange\CoreFramework\Response\Responseable;
 
@@ -16,7 +18,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
  *
@@ -39,7 +41,7 @@ class UserGuestVerifierFilter extends BaseFilter implements Filterable {
 	 *
 	 * @return	void
 	 */
-	protected function __construct () {
+	private function __construct () {
 		// Call parent constructor
 		parent::__construct(__CLASS__);
 	}
@@ -72,7 +74,7 @@ class UserGuestVerifierFilter extends BaseFilter implements Filterable {
 		// Is the username set?
 		if (is_null($userName)) {
 			// Not found in form so stop the filtering process
-			$requestInstance->requestIsValid(false);
+			$requestInstance->setIsRequestValid(FALSE);
 
 			// Add a message to the response
 			$responseInstance->addFatalMessage('username_guest_unset');
@@ -81,7 +83,7 @@ class UserGuestVerifierFilter extends BaseFilter implements Filterable {
 			throw new FilterChainException($this, self::EXCEPTION_FILTER_CHAIN_INTERCEPTED);
 		} elseif (empty($userName)) {
 			// Empty field!
-			$requestInstance->requestIsValid(false);
+			$requestInstance->setIsRequestValid(FALSE);
 
 			// Add a message to the response
 			$responseInstance->addFatalMessage('username_guest_empty');
@@ -90,7 +92,7 @@ class UserGuestVerifierFilter extends BaseFilter implements Filterable {
 			throw new FilterChainException($this, self::EXCEPTION_FILTER_CHAIN_INTERCEPTED);
 		} elseif ($this->ifUserGuestIsTaken($userName) === false) {
 			// Username is already taken
-			$requestInstance->requestIsValid(false);
+			$requestInstance->setIsRequestValid(FALSE);
 
 			// Add a message to the response
 			$responseInstance->addFatalMessage('username_guest_not_found');
@@ -109,7 +111,7 @@ class UserGuestVerifierFilter extends BaseFilter implements Filterable {
 	 * @param	$userName		Username to check for existence
 	 * @return	$alreadyTaken	Whether the username has been taken
 	 */
-	private function ifUserGuestIsTaken ($userName) {
+	private function ifUserGuestIsTaken (string $userName) {
 		// Default is already taken
 		$alreadyTaken = true;
 
@@ -117,21 +119,21 @@ class UserGuestVerifierFilter extends BaseFilter implements Filterable {
 		$userInstance = NULL;
 
 		// Get a registry instance
-		$registry = Registry::getRegistry();
+		$registryInstance = ObjectRegistry::getRegistry('generic');
 
 		// Is the user already there?
-		if ($registry->instanceExists('user')) {
+		if ($registryInstance->instanceExists('user')) {
 			// Use the instance for checking for the email
-			$userInstance = $registry->getInstance('user');
+			$userInstance = $registryInstance->getInstance('user');
 			$userInstance->setUserGuest($userName);
 		} else {
 			// If this instance is created then the username *does* exist
 			try {
 				// Get a new instance
-				$userInstance = call_user_func_array(array($this->getConfigInstance()->getConfigEntry('guest_class'), 'createGuestByUsername'), array($userName));
+				$userInstance = call_user_func_array(array(FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('guest_class'), 'createGuestByUsername'), array($userName));
 
 				// Remember this user instance in our registry for later usage
-				$registry->addInstance('user', $userInstance);
+				$registryInstance->addInstance('user', $userInstance);
 			} catch (UsernameMissingException $e) {
 				// User was not found
 			}