From a9213d23971254059d47038fb054ac808ecdc6fc Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Fri, 30 Oct 2020 01:00:11 +0100 Subject: [PATCH] Continued: - added missing imports - updated core framework MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- .../city/classes/city_daemon/class_BaseCityDaemon.php | 1 + .../commands/html/class_CityHtmlConfirmCommand.php | 2 ++ .../commands/html/class_CityHtmlResendLinkCommand.php | 1 + .../city/classes/login/class_CityGuestLogin.php | 3 +++ application/city/classes/login/class_CityUserLogin.php | 2 ++ .../classes/login/helper/class_CityLoginHelper.php | 10 +++++++--- .../classes/registration/class_CityRegistration.php | 5 ++++- core | 2 +- 8 files changed, 21 insertions(+), 5 deletions(-) diff --git a/application/city/classes/city_daemon/class_BaseCityDaemon.php b/application/city/classes/city_daemon/class_BaseCityDaemon.php index c19270f..d4c5382 100644 --- a/application/city/classes/city_daemon/class_BaseCityDaemon.php +++ b/application/city/classes/city_daemon/class_BaseCityDaemon.php @@ -12,6 +12,7 @@ use Org\Mxchange\City\Database\Frontend\Information\CityInformationDatabaseWrapp use Org\Mxchange\CoreFramework\Bootstrap\FrameworkBootstrap; use Org\Mxchange\CoreFramework\Criteria\Add\AddableCriteria; use Org\Mxchange\CoreFramework\Criteria\Storing\StoreableCriteria; +use Org\Mxchange\CoreFramework\Database\Frontend\User\UserDatabaseWrapper; use Org\Mxchange\CoreFramework\Database\Updateable; use Org\Mxchange\CoreFramework\Factory\Database\Wrapper\DatabaseWrapperFactory; use Org\Mxchange\CoreFramework\Factory\ObjectFactory; diff --git a/application/city/classes/commands/html/class_CityHtmlConfirmCommand.php b/application/city/classes/commands/html/class_CityHtmlConfirmCommand.php index 4fb3b71..e6ae502 100644 --- a/application/city/classes/commands/html/class_CityHtmlConfirmCommand.php +++ b/application/city/classes/commands/html/class_CityHtmlConfirmCommand.php @@ -6,7 +6,9 @@ namespace Org\Mxchange\City\Command; use Org\Mxchange\CoreFramework\Command\BaseCommand; use Org\Mxchange\CoreFramework\Command\Commandable; use Org\Mxchange\CoreFramework\Controller\Controller; +use Org\Mxchange\CoreFramework\Database\Frontend\User\UserDatabaseWrapper; use Org\Mxchange\CoreFramework\Factory\ObjectFactory; +use Org\Mxchange\CoreFramework\Generic\NullPointerException; use Org\Mxchange\CoreFramework\Registry\GenericRegistry; use Org\Mxchange\CoreFramework\Request\Requestable; use Org\Mxchange\CoreFramework\Resolver\Command\CommandResolver; diff --git a/application/city/classes/commands/html/class_CityHtmlResendLinkCommand.php b/application/city/classes/commands/html/class_CityHtmlResendLinkCommand.php index 77a2ba6..172ecc6 100644 --- a/application/city/classes/commands/html/class_CityHtmlResendLinkCommand.php +++ b/application/city/classes/commands/html/class_CityHtmlResendLinkCommand.php @@ -6,6 +6,7 @@ namespace Org\Mxchange\City\Command; use Org\Mxchange\CoreFramework\Command\BaseCommand; use Org\Mxchange\CoreFramework\Command\Commandable; use Org\Mxchange\CoreFramework\Controller\Controller; +use Org\Mxchange\CoreFramework\Database\Frontend\User\UserDatabaseWrapper; use Org\Mxchange\CoreFramework\Factory\ObjectFactory; use Org\Mxchange\CoreFramework\Registry\GenericRegistry; use Org\Mxchange\CoreFramework\Request\Requestable; diff --git a/application/city/classes/login/class_CityGuestLogin.php b/application/city/classes/login/class_CityGuestLogin.php index 14fd428..4fc2b9d 100644 --- a/application/city/classes/login/class_CityGuestLogin.php +++ b/application/city/classes/login/class_CityGuestLogin.php @@ -3,7 +3,10 @@ namespace Org\Mxchange\City\Login\Guest; // Import framework stuff +use Org\Mxchange\CoreFramework\Auth\LoginableUser; +use Org\Mxchange\CoreFramework\Bootstrap\FrameworkBootstrap; use Org\Mxchange\CoreFramework\Factory\ObjectFactory; +use Org\Mxchange\CoreFramework\Factory\User\UserFactory; use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem; use Org\Mxchange\CoreFramework\Registry\GenericRegistry; use Org\Mxchange\CoreFramework\Registry\Registerable; diff --git a/application/city/classes/login/class_CityUserLogin.php b/application/city/classes/login/class_CityUserLogin.php index ac9f9b1..8297bb9 100644 --- a/application/city/classes/login/class_CityUserLogin.php +++ b/application/city/classes/login/class_CityUserLogin.php @@ -3,8 +3,10 @@ namespace Org\Mxchange\City\Login\User; // Import framework stuff +use Org\Mxchange\CoreFramework\Auth\LoginableUser; use Org\Mxchange\CoreFramework\Bootstrap\FrameworkBootstrap; use Org\Mxchange\CoreFramework\Factory\ObjectFactory; +use Org\Mxchange\CoreFramework\Factory\User\UserFactory; use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem; use Org\Mxchange\CoreFramework\Registry\GenericRegistry; use Org\Mxchange\CoreFramework\Registry\Registerable; diff --git a/application/city/classes/login/helper/class_CityLoginHelper.php b/application/city/classes/login/helper/class_CityLoginHelper.php index b33105b..1a2db89 100644 --- a/application/city/classes/login/helper/class_CityLoginHelper.php +++ b/application/city/classes/login/helper/class_CityLoginHelper.php @@ -3,10 +3,15 @@ namespace Org\Mxchange\City\Helper\Login; // Import framework stuff +use Org\Mxchange\CoreFramework\User\ManageableAccount; use Org\Mxchange\CoreFramework\Bootstrap\FrameworkBootstrap; use Org\Mxchange\CoreFramework\Factory\ObjectFactory; +use Org\Mxchange\CoreFramework\Generic\NullPointerException; +use Org\Mxchange\CoreFramework\Helper\Login\BaseLoginHelper; +use Org\Mxchange\CoreFramework\Helper\Login\HelpableLogin; use Org\Mxchange\CoreFramework\Registry\GenericRegistry; use Org\Mxchange\CoreFramework\Request\Requestable; +use Org\Mxchange\CoreFramework\Response\Responseable; /** * A helper for City to login. This login helper first checks what setting @@ -62,8 +67,7 @@ class CityLoginHelper extends BaseLoginHelper implements HelpableLogin { * * @param $requestInstance An instance of a Requestable class * @return $helperInstance An instance of this helper class - * @throws UserInstanceMissingException If the user instance in registry - * is missing or invalid + * @throws NullPointerException If the user instance in registry is missing or invalid */ public static final function createCityLoginHelper (Requestable $requestInstance) { // Get a new instance first @@ -75,7 +79,7 @@ class CityLoginHelper extends BaseLoginHelper implements HelpableLogin { // Is this instance valid? if (!$userInstance instanceof ManageableAccount) { // Thrown an exception here - throw new UserInstanceMissingException (array($helperInstance, 'user'), self::EXCEPTION_INVALID_USER_INSTANCE); + throw new NullPointerException($this, self::EXCEPTION_IS_NULL_POINTER); } // END - if // Set default login method from config diff --git a/application/city/classes/registration/class_CityRegistration.php b/application/city/classes/registration/class_CityRegistration.php index b9fc815..3b4ca6d 100644 --- a/application/city/classes/registration/class_CityRegistration.php +++ b/application/city/classes/registration/class_CityRegistration.php @@ -5,8 +5,11 @@ namespace Org\Mxchange\City\Registration; // Import framework stuff use Org\Mxchange\CoreFramework\Bootstrap\FrameworkBootstrap; use Org\Mxchange\CoreFramework\Criteria\Storing\StoreableCriteria; +use Org\Mxchange\CoreFramework\Database\Frontend\User\UserDatabaseWrapper; use Org\Mxchange\CoreFramework\Factory\Database\Wrapper\DatabaseWrapperFactory; use Org\Mxchange\CoreFramework\Factory\ObjectFactory; +use Org\Mxchange\CoreFramework\Registration\BaseRegistration; +use Org\Mxchange\CoreFramework\Registration\User\UserRegister; use Org\Mxchange\CoreFramework\Request\Requestable; /** @@ -159,7 +162,7 @@ class CityRegistration extends BaseRegistration implements UserRegister { $actionInstance = ObjectFactory::createObjectByConfiguredName('post_registration_class'); // Execute the action - $actionInstance->execute(FrameworkBootstrap::getRequestInstance(), $this->getResponseInstance()); + $actionInstance->execute(FrameworkBootstrap::getRequestInstance(), FrameworkBootstrap::getResponseInstance()); } /** diff --git a/core b/core index f2ab4d6..645d702 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit f2ab4d6de08ce3a56636bf76ba5ef0ebf3a187c7 +Subproject commit 645d7022e1e74573bd7511fb98ae3ac4e341464e -- 2.39.2