Continued:

[core.git] / framework / main / classes / filter / verifier / class_UserGuestVerifierFilter.php

diff --git a/framework/main/classes/filter/verifier/class_UserGuestVerifierFilter.php b/framework/main/classes/filter/verifier/class_UserGuestVerifierFilter.php
index bcf6c8cab20425a04b13ff1bd18bdd81d9ae985b..4a3da1bee03ca22641386982b26cff9c633ca1c3 100644 (file)
--- 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
 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\BaseFilter;

+use Org\Mxchange\CoreFramework\Filter\Chain\FilterChainException;

 use Org\Mxchange\CoreFramework\Filter\Filterable;
 use Org\Mxchange\CoreFramework\Filter\Filterable;

-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;
 
 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
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0

- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2020 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
  *
  * @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
         */
         *
         * @return      void
         */

-       protected function __construct () {
+       private function __construct () {

                // Call parent constructor
                parent::__construct(__CLASS__);
        }
                // Call parent constructor
                parent::__construct(__CLASS__);
        }


@@ -49,7 +51,7 @@ class UserGuestVerifierFilter extends BaseFilter implements Filterable {
         *
         * @return      $filterInstance         An instance of this filter class
         */
         *
         * @return      $filterInstance         An instance of this filter class
         */

-       public static final function createUserGuestVerifierFilter () {
+       public static final function createUserGuestVerifierFilter (): Filterable {

                // Get a new instance
                $filterInstance = new UserGuestVerifierFilter();
 
                // Get a new instance
                $filterInstance = new UserGuestVerifierFilter();
 


@@ -65,14 +67,14 @@ class UserGuestVerifierFilter extends BaseFilter implements Filterable {
         * @return      void
         * @throws      FilterChainException    If this filter fails to operate
         */
         * @return      void
         * @throws      FilterChainException    If this filter fails to operate
         */

-       public function execute (Requestable $requestInstance, Responseable $responseInstance) {
+       public function execute (Requestable $requestInstance, Responseable $responseInstance): void {

                // Get username from request
                $userName = $requestInstance->getRequestElement('user');
 
                // Is the username set?
                if (is_null($userName)) {
                        // Not found in form so stop the filtering process
                // Get username from request
                $userName = $requestInstance->getRequestElement('user');
 
                // 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');
 
                        // 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!
                        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');
 
                        // 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
                        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');
 
                        // 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
         */
         * @param       $userName               Username to check for existence
         * @return      $alreadyTaken   Whether the username has been taken
         */

-       private function ifUserGuestIsTaken ($userName) {
+       private function ifUserGuestIsTaken (string $userName): bool {

                // Default is already taken
                $alreadyTaken = true;
 
                // Default is already taken
                $alreadyTaken = true;
 


@@ -117,21 +119,21 @@ class UserGuestVerifierFilter extends BaseFilter implements Filterable {
                $userInstance = NULL;
 
                // Get a registry instance
                $userInstance = NULL;
 
                // Get a registry instance

-               $registry = GenericRegistry::getRegistry();
+               $registryInstance = ObjectRegistry::getRegistry('generic');

 
                // Is the user already there?
 
                // Is the user already there?

-               if ($registry->instanceExists('user')) {
+               if ($registryInstance->instanceExists('user')) {

                        // Use the instance for checking for the email
                        // 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->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
 
                                // 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
                        }
                        } catch (UsernameMissingException $e) {
                                // User was not found
                        }