From ce05c4a9aa076a7ea569aeec7861b5d97d797ec6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Mon, 7 Dec 2020 09:00:23 +0100 Subject: [PATCH] Continued: - moved ObjectFactory into deeper namespace - ObjectFactory is now final, need to extend BaseFactory instead MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- application/city/class_ApplicationHelper.php | 2 +- .../html/class_HtmlCityLoginLogoutAction.php | 2 +- ...class_HtmlCityLoginStatusProblemAction.php | 2 +- .../city_daemon/class_BaseCityDaemon.php | 2 +- .../class_SimulationDefaultCityDaemon.php | 2 +- .../class_CityConsoleDaemonCommand.php | 2 +- .../class_CityHtmlCityGuestLoginCommand.php | 2 +- .../html/class_CityHtmlCityMapCommand.php | 2 +- .../class_CityHtmlCityRegisterCommand.php | 2 +- .../class_CityHtmlCityUserLoginCommand.php | 2 +- .../html/class_CityHtmlConfirmCommand.php | 2 +- .../html/class_CityHtmlHomeCommand.php | 2 +- .../html/class_CityHtmlLoginAreaCommand.php | 2 +- .../html/class_CityHtmlLoginCommand.php | 2 +- .../html/class_CityHtmlLoginFailedCommand.php | 2 +- .../html/class_CityHtmlLogoutCommand.php | 2 +- .../html/class_CityHtmlLogoutDoneCommand.php | 2 +- .../html/class_CityHtmlResendLinkCommand.php | 2 +- ...class_CityConsoleDefaultNewsController.php | 2 +- .../html/class_CityHtmlConfirmController.php | 2 +- .../class_CityHtmlDefaultNewsController.php | 2 +- .../class_CityHtmlLoginAreaController.php | 2 +- .../class_CityInformationDatabaseFrontend.php | 2 +- .../class_CityDistrictsDatabaseFrontend.php | 2 +- .../lots/class_CityLotsDatabaseFrontend.php | 2 +- .../class_CitySectionsDatabaseFrontend.php | 2 +- ...class_RegionInformationDatabaseWrapper.php | 2 +- .../class_RegionMapDatabaseFrontend.php | 2 +- .../city_daemon/class_CityDaemonFactory.php | 4 ++-- .../manager/class_ManagerFactory.php | 4 ++-- .../states/city/class_CityStateFactory.php | 21 ++++++++++++------- ...CityDaemonTaskHandlerInitializerFilter.php | 2 +- .../classes/login/class_CityUserLogin.php | 2 +- .../login/helper/class_CityLoginHelper.php | 2 +- .../registration/class_CityRegistration.php | 2 +- .../code/action_city_login_city_map.ctp | 2 +- ...ion_city_login_government_startup_help.ctp | 2 +- .../action_city_login_government_training.ctp | 2 +- .../code/action_city_login_logout.ctp | 2 +- .../code/action_city_login_profile.ctp | 2 +- .../code/action_city_login_status_problem.ctp | 2 +- .../templates/code/block_persona_data.ctp | 2 +- .../templates/code/captch_graphic_code.ctp | 2 +- .../city/templates/code/confirm_link.ctp | 2 +- .../city/templates/code/login_failed.ctp | 2 +- .../city/templates/code/login_form.ctp | 2 +- .../city/templates/code/login_main.ctp | 2 +- .../city/templates/code/logout_done.ctp | 2 +- .../city/templates/code/register_form.ctp | 2 +- core | 2 +- index.php | 2 +- 51 files changed, 66 insertions(+), 59 deletions(-) diff --git a/application/city/class_ApplicationHelper.php b/application/city/class_ApplicationHelper.php index aad8388..b89c7af 100644 --- a/application/city/class_ApplicationHelper.php +++ b/application/city/class_ApplicationHelper.php @@ -5,7 +5,7 @@ namespace Org\Mxchange\CoreFramework\Helper\Application; // Import framework stuff use Org\Mxchange\CoreFramework\Application\BaseApplication; use Org\Mxchange\CoreFramework\Bootstrap\FrameworkBootstrap; -use Org\Mxchange\CoreFramework\Factory\ObjectFactory; +use Org\Mxchange\CoreFramework\Factory\Object\ObjectFactory; use Org\Mxchange\CoreFramework\Loader\ClassLoader; use Org\Mxchange\CoreFramework\Manager\ManageableApplication; use Org\Mxchange\CoreFramework\Registry\Registerable; diff --git a/application/city/classes/actions/html/class_HtmlCityLoginLogoutAction.php b/application/city/classes/actions/html/class_HtmlCityLoginLogoutAction.php index c97464d..e686d1b 100644 --- a/application/city/classes/actions/html/class_HtmlCityLoginLogoutAction.php +++ b/application/city/classes/actions/html/class_HtmlCityLoginLogoutAction.php @@ -4,7 +4,7 @@ namespace Org\Mxchange\City\Action\Login; // Import framework stuff use Org\Mxchange\CoreFramework\Controller\Controller; -use Org\Mxchange\CoreFramework\Factory\ObjectFactory; +use Org\Mxchange\CoreFramework\Factory\Object\ObjectFactory; use Org\Mxchange\CoreFramework\Registry\Registerable; use Org\Mxchange\CoreFramework\Request\Requestable; use Org\Mxchange\CoreFramework\Response\Responseable; diff --git a/application/city/classes/actions/html/class_HtmlCityLoginStatusProblemAction.php b/application/city/classes/actions/html/class_HtmlCityLoginStatusProblemAction.php index 914ceb0..968e45e 100644 --- a/application/city/classes/actions/html/class_HtmlCityLoginStatusProblemAction.php +++ b/application/city/classes/actions/html/class_HtmlCityLoginStatusProblemAction.php @@ -4,7 +4,7 @@ namespace Org\Mxchange\City\Action\Login; // Import framework stuff use Org\Mxchange\CoreFramework\Controller\Controller; -use Org\Mxchange\CoreFramework\Factory\ObjectFactory; +use Org\Mxchange\CoreFramework\Factory\Object\ObjectFactory; use Org\Mxchange\CoreFramework\Registry\Registerable; use Org\Mxchange\CoreFramework\Request\Requestable; use Org\Mxchange\CoreFramework\Response\Responseable; diff --git a/application/city/classes/city_daemon/class_BaseCityDaemon.php b/application/city/classes/city_daemon/class_BaseCityDaemon.php index e45a0f7..b4e3b1c 100644 --- a/application/city/classes/city_daemon/class_BaseCityDaemon.php +++ b/application/city/classes/city_daemon/class_BaseCityDaemon.php @@ -15,7 +15,7 @@ use Org\Mxchange\CoreFramework\Criteria\Storing\StoreableCriteria; use Org\Mxchange\CoreFramework\Database\Frontend\User\UserDatabaseFrontend; use Org\Mxchange\CoreFramework\Database\Updateable; use Org\Mxchange\CoreFramework\Factory\Database\Frontend\DatabaseFrontendFactory; -use Org\Mxchange\CoreFramework\Factory\ObjectFactory; +use Org\Mxchange\CoreFramework\Factory\Object\ObjectFactory; use Org\Mxchange\CoreFramework\Helper\Application\ApplicationHelper; use Org\Mxchange\CoreFramework\Registry\GenericRegistry;; use Org\Mxchange\CoreFramework\Request\Requestable; diff --git a/application/city/classes/city_daemon/default/class_SimulationDefaultCityDaemon.php b/application/city/classes/city_daemon/default/class_SimulationDefaultCityDaemon.php index 5eba097..167ac8f 100644 --- a/application/city/classes/city_daemon/default/class_SimulationDefaultCityDaemon.php +++ b/application/city/classes/city_daemon/default/class_SimulationDefaultCityDaemon.php @@ -7,7 +7,7 @@ use Org\Mxchange\City\Daemon\BaseCityDaemon; use Org\Mxchange\City\Helper\CityHelper; // Import framework stuff -use Org\Mxchange\CoreFramework\Factory\ObjectFactory; +use Org\Mxchange\CoreFramework\Factory\Object\ObjectFactory; use Org\Mxchange\CoreFramework\Handler\Task\HandleableTask; use Org\Mxchange\CoreFramework\Helper\Application\ApplicationHelper; use Org\Mxchange\CoreFramework\Registry\GenericRegistry; diff --git a/application/city/classes/commands/console/class_CityConsoleDaemonCommand.php b/application/city/classes/commands/console/class_CityConsoleDaemonCommand.php index b985a4a..a85a2ec 100644 --- a/application/city/classes/commands/console/class_CityConsoleDaemonCommand.php +++ b/application/city/classes/commands/console/class_CityConsoleDaemonCommand.php @@ -9,7 +9,7 @@ use Org\Mxchange\City\Daemon\Factory\CityDaemonFactory; use Org\Mxchange\CoreFramework\Command\BaseCommand; use Org\Mxchange\CoreFramework\Command\Commandable; use Org\Mxchange\CoreFramework\Controller\Controller; -use Org\Mxchange\CoreFramework\Factory\ObjectFactory; +use Org\Mxchange\CoreFramework\Factory\Object\ObjectFactory; use Org\Mxchange\CoreFramework\Helper\Application\ApplicationHelper; use Org\Mxchange\CoreFramework\Registry\GenericRegistry; use Org\Mxchange\CoreFramework\Request\Requestable; diff --git a/application/city/classes/commands/html/class_CityHtmlCityGuestLoginCommand.php b/application/city/classes/commands/html/class_CityHtmlCityGuestLoginCommand.php index 2734597..e95e23d 100644 --- a/application/city/classes/commands/html/class_CityHtmlCityGuestLoginCommand.php +++ b/application/city/classes/commands/html/class_CityHtmlCityGuestLoginCommand.php @@ -6,7 +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\Factory\ObjectFactory; +use Org\Mxchange\CoreFramework\Factory\Object\ObjectFactory; use Org\Mxchange\CoreFramework\Request\Requestable; use Org\Mxchange\CoreFramework\Resolver\Command\CommandResolver; use Org\Mxchange\CoreFramework\Response\Responseable; diff --git a/application/city/classes/commands/html/class_CityHtmlCityMapCommand.php b/application/city/classes/commands/html/class_CityHtmlCityMapCommand.php index 903ce08..b265c0f 100644 --- a/application/city/classes/commands/html/class_CityHtmlCityMapCommand.php +++ b/application/city/classes/commands/html/class_CityHtmlCityMapCommand.php @@ -10,7 +10,7 @@ use Org\Mxchange\City\Manager\City\ManageableCity; use Org\Mxchange\CoreFramework\Command\BaseCommand; use Org\Mxchange\CoreFramework\Command\Commandable; use Org\Mxchange\CoreFramework\Controller\Controller; -use Org\Mxchange\CoreFramework\Factory\ObjectFactory; +use Org\Mxchange\CoreFramework\Factory\Object\ObjectFactory; use Org\Mxchange\CoreFramework\Request\Requestable; use Org\Mxchange\CoreFramework\Resolver\Command\CommandResolver; use Org\Mxchange\CoreFramework\Response\Responseable; diff --git a/application/city/classes/commands/html/class_CityHtmlCityRegisterCommand.php b/application/city/classes/commands/html/class_CityHtmlCityRegisterCommand.php index ddd6bbc..99c6b2f 100644 --- a/application/city/classes/commands/html/class_CityHtmlCityRegisterCommand.php +++ b/application/city/classes/commands/html/class_CityHtmlCityRegisterCommand.php @@ -6,7 +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\Factory\ObjectFactory; +use Org\Mxchange\CoreFramework\Factory\Object\ObjectFactory; use Org\Mxchange\CoreFramework\Request\Requestable; use Org\Mxchange\CoreFramework\Resolver\Command\CommandResolver; use Org\Mxchange\CoreFramework\Response\Responseable; diff --git a/application/city/classes/commands/html/class_CityHtmlCityUserLoginCommand.php b/application/city/classes/commands/html/class_CityHtmlCityUserLoginCommand.php index edb4c67..45341d4 100644 --- a/application/city/classes/commands/html/class_CityHtmlCityUserLoginCommand.php +++ b/application/city/classes/commands/html/class_CityHtmlCityUserLoginCommand.php @@ -6,7 +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\Factory\ObjectFactory; +use Org\Mxchange\CoreFramework\Factory\Object\ObjectFactory; use Org\Mxchange\CoreFramework\Request\Requestable; use Org\Mxchange\CoreFramework\Resolver\Command\CommandResolver; use Org\Mxchange\CoreFramework\Response\Responseable; diff --git a/application/city/classes/commands/html/class_CityHtmlConfirmCommand.php b/application/city/classes/commands/html/class_CityHtmlConfirmCommand.php index ad4a9ad..f8a5a85 100644 --- a/application/city/classes/commands/html/class_CityHtmlConfirmCommand.php +++ b/application/city/classes/commands/html/class_CityHtmlConfirmCommand.php @@ -8,7 +8,7 @@ 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\UserDatabaseFrontend; -use Org\Mxchange\CoreFramework\Factory\ObjectFactory; +use Org\Mxchange\CoreFramework\Factory\Object\ObjectFactory; use Org\Mxchange\CoreFramework\Generic\NullPointerException; use Org\Mxchange\CoreFramework\Helper\Application\ApplicationHelper; use Org\Mxchange\CoreFramework\Registry\GenericRegistry; diff --git a/application/city/classes/commands/html/class_CityHtmlHomeCommand.php b/application/city/classes/commands/html/class_CityHtmlHomeCommand.php index 26bc2ab..9c9b72c 100644 --- a/application/city/classes/commands/html/class_CityHtmlHomeCommand.php +++ b/application/city/classes/commands/html/class_CityHtmlHomeCommand.php @@ -6,7 +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\Factory\ObjectFactory; +use Org\Mxchange\CoreFramework\Factory\Object\ObjectFactory; use Org\Mxchange\CoreFramework\Request\Requestable; use Org\Mxchange\CoreFramework\Resolver\Command\CommandResolver; use Org\Mxchange\CoreFramework\Response\Responseable; diff --git a/application/city/classes/commands/html/class_CityHtmlLoginAreaCommand.php b/application/city/classes/commands/html/class_CityHtmlLoginAreaCommand.php index 335a7af..d4f5a9f 100644 --- a/application/city/classes/commands/html/class_CityHtmlLoginAreaCommand.php +++ b/application/city/classes/commands/html/class_CityHtmlLoginAreaCommand.php @@ -5,7 +5,7 @@ namespace Org\Mxchange\City\Command; // Import framework stuff use Org\Mxchange\CoreFramework\Bootstrap\FrameworkBootstrap; use Org\Mxchange\CoreFramework\Controller\Controller; -use Org\Mxchange\CoreFramework\Factory\ObjectFactory; +use Org\Mxchange\CoreFramework\Factory\Object\ObjectFactory; use Org\Mxchange\CoreFramework\Helper\Application\ApplicationHelper; use Org\Mxchange\CoreFramework\Registry\GenericRegistry; use Org\Mxchange\CoreFramework\Request\Requestable; diff --git a/application/city/classes/commands/html/class_CityHtmlLoginCommand.php b/application/city/classes/commands/html/class_CityHtmlLoginCommand.php index 194ad83..e6852fe 100644 --- a/application/city/classes/commands/html/class_CityHtmlLoginCommand.php +++ b/application/city/classes/commands/html/class_CityHtmlLoginCommand.php @@ -7,7 +7,7 @@ use Org\Mxchange\CoreFramework\Bootstrap\FrameworkBootstrap; use Org\Mxchange\CoreFramework\Command\BaseCommand; use Org\Mxchange\CoreFramework\Command\Commandable; use Org\Mxchange\CoreFramework\Controller\Controller; -use Org\Mxchange\CoreFramework\Factory\ObjectFactory; +use Org\Mxchange\CoreFramework\Factory\Object\ObjectFactory; use Org\Mxchange\CoreFramework\Helper\Application\ApplicationHelper; use Org\Mxchange\CoreFramework\Registry\GenericRegistry;; use Org\Mxchange\CoreFramework\Registry\Registerable; diff --git a/application/city/classes/commands/html/class_CityHtmlLoginFailedCommand.php b/application/city/classes/commands/html/class_CityHtmlLoginFailedCommand.php index aad1e16..4ef43fa 100644 --- a/application/city/classes/commands/html/class_CityHtmlLoginFailedCommand.php +++ b/application/city/classes/commands/html/class_CityHtmlLoginFailedCommand.php @@ -7,7 +7,7 @@ use Org\Mxchange\CoreFramework\Bootstrap\FrameworkBootstrap; use Org\Mxchange\CoreFramework\Command\BaseCommand; use Org\Mxchange\CoreFramework\Command\Commandable; use Org\Mxchange\CoreFramework\Controller\Controller; -use Org\Mxchange\CoreFramework\Factory\ObjectFactory; +use Org\Mxchange\CoreFramework\Factory\Object\ObjectFactory; use Org\Mxchange\CoreFramework\Helper\Application\ApplicationHelper; use Org\Mxchange\CoreFramework\Registry\GenericRegistry;; use Org\Mxchange\CoreFramework\Request\Requestable; diff --git a/application/city/classes/commands/html/class_CityHtmlLogoutCommand.php b/application/city/classes/commands/html/class_CityHtmlLogoutCommand.php index 856f0d5..5164679 100644 --- a/application/city/classes/commands/html/class_CityHtmlLogoutCommand.php +++ b/application/city/classes/commands/html/class_CityHtmlLogoutCommand.php @@ -6,7 +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\Factory\ObjectFactory; +use Org\Mxchange\CoreFramework\Factory\Object\ObjectFactory; use Org\Mxchange\CoreFramework\Request\Requestable; use Org\Mxchange\CoreFramework\Resolver\Command\CommandResolver; use Org\Mxchange\CoreFramework\Response\Responseable; diff --git a/application/city/classes/commands/html/class_CityHtmlLogoutDoneCommand.php b/application/city/classes/commands/html/class_CityHtmlLogoutDoneCommand.php index 598b7a1..1b366fb 100644 --- a/application/city/classes/commands/html/class_CityHtmlLogoutDoneCommand.php +++ b/application/city/classes/commands/html/class_CityHtmlLogoutDoneCommand.php @@ -7,7 +7,7 @@ use Org\Mxchange\CoreFramework\Bootstrap\FrameworkBootstrap; use Org\Mxchange\CoreFramework\Command\BaseCommand; use Org\Mxchange\CoreFramework\Command\Commandable; use Org\Mxchange\CoreFramework\Controller\Controller; -use Org\Mxchange\CoreFramework\Factory\ObjectFactory; +use Org\Mxchange\CoreFramework\Factory\Object\ObjectFactory; use Org\Mxchange\CoreFramework\Helper\Application\ApplicationHelper; use Org\Mxchange\CoreFramework\Registry\GenericRegistry;; use Org\Mxchange\CoreFramework\Request\Requestable; diff --git a/application/city/classes/commands/html/class_CityHtmlResendLinkCommand.php b/application/city/classes/commands/html/class_CityHtmlResendLinkCommand.php index 5e52149..972b8ab 100644 --- a/application/city/classes/commands/html/class_CityHtmlResendLinkCommand.php +++ b/application/city/classes/commands/html/class_CityHtmlResendLinkCommand.php @@ -8,7 +8,7 @@ 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\UserDatabaseFrontend; -use Org\Mxchange\CoreFramework\Factory\ObjectFactory; +use Org\Mxchange\CoreFramework\Factory\Object\ObjectFactory; use Org\Mxchange\CoreFramework\Helper\Application\ApplicationHelper; use Org\Mxchange\CoreFramework\Registry\GenericRegistry; use Org\Mxchange\CoreFramework\Request\Requestable; diff --git a/application/city/classes/controller/console/class_CityConsoleDefaultNewsController.php b/application/city/classes/controller/console/class_CityConsoleDefaultNewsController.php index e430d35..e41a820 100644 --- a/application/city/classes/controller/console/class_CityConsoleDefaultNewsController.php +++ b/application/city/classes/controller/console/class_CityConsoleDefaultNewsController.php @@ -5,7 +5,7 @@ namespace Org\Mxchange\City\Controller; // Import framework stuff use Org\Mxchange\CoreFramework\Controller\BaseController; use Org\Mxchange\CoreFramework\Controller\Controller; -use Org\Mxchange\CoreFramework\Factory\ObjectFactory; +use Org\Mxchange\CoreFramework\Factory\Object\ObjectFactory; use Org\Mxchange\CoreFramework\Filter\Filterable; use Org\Mxchange\CoreFramework\Request\Requestable; use Org\Mxchange\CoreFramework\Resolver\Command\CommandResolver; diff --git a/application/city/classes/controller/html/class_CityHtmlConfirmController.php b/application/city/classes/controller/html/class_CityHtmlConfirmController.php index 82440fe..9f87eb7 100644 --- a/application/city/classes/controller/html/class_CityHtmlConfirmController.php +++ b/application/city/classes/controller/html/class_CityHtmlConfirmController.php @@ -5,7 +5,7 @@ namespace Org\Mxchange\City\Controller; // Import framework stuff use Org\Mxchange\CoreFramework\Controller\BaseController; use Org\Mxchange\CoreFramework\Controller\Controller; -use Org\Mxchange\CoreFramework\Factory\ObjectFactory; +use Org\Mxchange\CoreFramework\Factory\Object\ObjectFactory; use Org\Mxchange\CoreFramework\Request\Requestable; use Org\Mxchange\CoreFramework\Resolver\Command\CommandResolver; use Org\Mxchange\CoreFramework\Response\Responseable; diff --git a/application/city/classes/controller/html/class_CityHtmlDefaultNewsController.php b/application/city/classes/controller/html/class_CityHtmlDefaultNewsController.php index c0ef891..4379326 100644 --- a/application/city/classes/controller/html/class_CityHtmlDefaultNewsController.php +++ b/application/city/classes/controller/html/class_CityHtmlDefaultNewsController.php @@ -5,7 +5,7 @@ namespace Org\Mxchange\City\Controller; // Import framework stuff use Org\Mxchange\CoreFramework\Controller\BaseController; use Org\Mxchange\CoreFramework\Controller\Controller; -use Org\Mxchange\CoreFramework\Factory\ObjectFactory; +use Org\Mxchange\CoreFramework\Factory\Object\ObjectFactory; use Org\Mxchange\CoreFramework\Request\Requestable; use Org\Mxchange\CoreFramework\Resolver\Command\CommandResolver; use Org\Mxchange\CoreFramework\Response\Responseable; diff --git a/application/city/classes/controller/html/login/class_CityHtmlLoginAreaController.php b/application/city/classes/controller/html/login/class_CityHtmlLoginAreaController.php index af9c469..87acb0e 100644 --- a/application/city/classes/controller/html/login/class_CityHtmlLoginAreaController.php +++ b/application/city/classes/controller/html/login/class_CityHtmlLoginAreaController.php @@ -5,7 +5,7 @@ namespace Org\Mxchange\City\Controller\LoginArea; // Import framework stuff use Org\Mxchange\CoreFramework\Controller\BaseController; use Org\Mxchange\CoreFramework\Controller\Controller; -use Org\Mxchange\CoreFramework\Factory\ObjectFactory; +use Org\Mxchange\CoreFramework\Factory\Object\ObjectFactory; use Org\Mxchange\CoreFramework\Request\Requestable; use Org\Mxchange\CoreFramework\Resolver\Command\CommandResolver; use Org\Mxchange\CoreFramework\Response\Responseable; diff --git a/application/city/classes/database/frontend/city/class_CityInformationDatabaseFrontend.php b/application/city/classes/database/frontend/city/class_CityInformationDatabaseFrontend.php index 1a795ef..77e4e5b 100644 --- a/application/city/classes/database/frontend/city/class_CityInformationDatabaseFrontend.php +++ b/application/city/classes/database/frontend/city/class_CityInformationDatabaseFrontend.php @@ -10,7 +10,7 @@ use Org\Mxchange\City\Manager\City\ManageableCity; // Import framework stuff use Org\Mxchange\CoreFramework\Database\Frontend\BaseDatabaseFrontend; -use Org\Mxchange\CoreFramework\Factory\ObjectFactory; +use Org\Mxchange\CoreFramework\Factory\Object\ObjectFactory; use Org\Mxchange\CoreFramework\Registry\GenericRegistry; use Org\Mxchange\CoreFramework\Registry\Registerable; use Org\Mxchange\CoreFramework\Request\Requestable; diff --git a/application/city/classes/database/frontend/city_entities/districts/class_CityDistrictsDatabaseFrontend.php b/application/city/classes/database/frontend/city_entities/districts/class_CityDistrictsDatabaseFrontend.php index 758abf1..7d78471 100644 --- a/application/city/classes/database/frontend/city_entities/districts/class_CityDistrictsDatabaseFrontend.php +++ b/application/city/classes/database/frontend/city_entities/districts/class_CityDistrictsDatabaseFrontend.php @@ -4,7 +4,7 @@ namespace Org\Mxchange\City\Database\Frontend\Districts; // Import framework stuff use Org\Mxchange\CoreFramework\Database\Frontend\BaseDatabaseFrontend; -use Org\Mxchange\CoreFramework\Factory\ObjectFactory; +use Org\Mxchange\CoreFramework\Factory\Object\ObjectFactory; use Org\Mxchange\CoreFramework\Registry\Registerable; /** diff --git a/application/city/classes/database/frontend/city_entities/lots/class_CityLotsDatabaseFrontend.php b/application/city/classes/database/frontend/city_entities/lots/class_CityLotsDatabaseFrontend.php index 1cf4ab5..9059687 100644 --- a/application/city/classes/database/frontend/city_entities/lots/class_CityLotsDatabaseFrontend.php +++ b/application/city/classes/database/frontend/city_entities/lots/class_CityLotsDatabaseFrontend.php @@ -4,7 +4,7 @@ namespace Org\Mxchange\City\Database\Frontend\Lots; // Import framework stuff use Org\Mxchange\CoreFramework\Database\Frontend\BaseDatabaseFrontend; -use Org\Mxchange\CoreFramework\Factory\ObjectFactory; +use Org\Mxchange\CoreFramework\Factory\Object\ObjectFactory; use Org\Mxchange\CoreFramework\Registry\Registerable; /** diff --git a/application/city/classes/database/frontend/city_entities/sections/class_CitySectionsDatabaseFrontend.php b/application/city/classes/database/frontend/city_entities/sections/class_CitySectionsDatabaseFrontend.php index dc4004f..4044201 100644 --- a/application/city/classes/database/frontend/city_entities/sections/class_CitySectionsDatabaseFrontend.php +++ b/application/city/classes/database/frontend/city_entities/sections/class_CitySectionsDatabaseFrontend.php @@ -5,7 +5,7 @@ namespace Org\Mxchange\City\Database\Frontend\Sections; // Import framework stuff use Org\Mxchange\CoreFramework\Bootstrap\FrameworkBootstrap; use Org\Mxchange\CoreFramework\Database\Frontend\BaseDatabaseFrontend; -use Org\Mxchange\CoreFramework\Factory\ObjectFactory; +use Org\Mxchange\CoreFramework\Factory\Object\ObjectFactory; use Org\Mxchange\CoreFramework\Registry\Registerable; /** diff --git a/application/city/classes/database/frontend/region/class_RegionInformationDatabaseWrapper.php b/application/city/classes/database/frontend/region/class_RegionInformationDatabaseWrapper.php index a670a21..f5a4986 100644 --- a/application/city/classes/database/frontend/region/class_RegionInformationDatabaseWrapper.php +++ b/application/city/classes/database/frontend/region/class_RegionInformationDatabaseWrapper.php @@ -7,7 +7,7 @@ use Org\Mxchange\City\Factory\Manager\ManagerFactory; // Import framework stuff use Org\Mxchange\CoreFramework\Database\Frontend\BaseDatabaseFrontend; -use Org\Mxchange\CoreFramework\Factory\ObjectFactory; +use Org\Mxchange\CoreFramework\Factory\Object\ObjectFactory; use Org\Mxchange\CoreFramework\Registry\GenericRegistry; use Org\Mxchange\CoreFramework\Registry\Registerable; diff --git a/application/city/classes/database/frontend/region_map/class_RegionMapDatabaseFrontend.php b/application/city/classes/database/frontend/region_map/class_RegionMapDatabaseFrontend.php index 6ddbdba..1b50f56 100644 --- a/application/city/classes/database/frontend/region_map/class_RegionMapDatabaseFrontend.php +++ b/application/city/classes/database/frontend/region_map/class_RegionMapDatabaseFrontend.php @@ -4,7 +4,7 @@ namespace Org\Mxchange\City\Database\Frontend\Region; // Import framework stuff use Org\Mxchange\CoreFramework\Database\Frontend\BaseDatabaseFrontend; -use Org\Mxchange\CoreFramework\Factory\ObjectFactory; +use Org\Mxchange\CoreFramework\Factory\Object\ObjectFactory; use Org\Mxchange\CoreFramework\Registry\GenericRegistry; use Org\Mxchange\CoreFramework\Registry\Registerable; diff --git a/application/city/classes/factories/city_daemon/class_CityDaemonFactory.php b/application/city/classes/factories/city_daemon/class_CityDaemonFactory.php index 3bb123d..b80787e 100644 --- a/application/city/classes/factories/city_daemon/class_CityDaemonFactory.php +++ b/application/city/classes/factories/city_daemon/class_CityDaemonFactory.php @@ -4,7 +4,7 @@ namespace Org\Mxchange\City\Daemon\Factory; // Import framework stuff use Org\Mxchange\CoreFramework\Bootstrap\FrameworkBootstrap; -use Org\Mxchange\CoreFramework\Factory\ObjectFactory; +use Org\Mxchange\CoreFramework\Factory\BaseFactory; use Org\Mxchange\CoreFramework\Helper\Application\ApplicationHelper; use Org\Mxchange\CoreFramework\Registry\GenericRegistry; use Org\Mxchange\CoreFramework\Request\Requestable; @@ -32,7 +32,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable; * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -class CityDaemonFactory extends ObjectFactory { +class CityDaemonFactory extends BaseFactory { /** * Protected constructor * diff --git a/application/city/classes/factories/manager/class_ManagerFactory.php b/application/city/classes/factories/manager/class_ManagerFactory.php index 6dac023..d2799f4 100644 --- a/application/city/classes/factories/manager/class_ManagerFactory.php +++ b/application/city/classes/factories/manager/class_ManagerFactory.php @@ -3,7 +3,7 @@ namespace Org\Mxchange\City\Factory\Manager; // Import framework stuff -use Org\Mxchange\CoreFramework\Factory\ObjectFactory; +use Org\Mxchange\CoreFramework\Factory\BaseFactory; use Org\Mxchange\CoreFramework\Registry\GenericRegistry; /** @@ -28,7 +28,7 @@ use Org\Mxchange\CoreFramework\Registry\GenericRegistry; * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -class ManagerFactory extends ObjectFactory { +class ManagerFactory extends BaseFactory { /** * Protected constructor * diff --git a/application/city/classes/factories/states/city/class_CityStateFactory.php b/application/city/classes/factories/states/city/class_CityStateFactory.php index bcab149..cbd6f56 100644 --- a/application/city/classes/factories/states/city/class_CityStateFactory.php +++ b/application/city/classes/factories/states/city/class_CityStateFactory.php @@ -6,7 +6,11 @@ namespace Org\Mxchange\City\Factory\State; use Org\Mxchange\City\Daemon\Factory\CityDaemonFactory; // Import framework stuff -use Org\Mxchange\CoreFramework\Factory\ObjectFactory; +use Org\Mxchange\CoreFramework\Factory\BaseFactory; +use Org\Mxchange\CoreFramework\Factory\Object\ObjectFactory; + +// Import SPL stuff +use \InvalidArgumentException; /** * A factory class for city states @@ -30,7 +34,7 @@ use Org\Mxchange\CoreFramework\Factory\ObjectFactory; * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -class CityStateFactory extends ObjectFactory { +class CityStateFactory extends BaseFactory { /** * Protected constructor * @@ -48,18 +52,21 @@ class CityStateFactory extends ObjectFactory { * @param $stateName Name of the state * @return $stateInstance A Stateable class instance */ - public static final function createCityStateInstanceByName ($stateName) { - // Then construct the class' configuraton entry - $className = 'city_' . $stateName . '_state_class'; + public static final function createCityStateInstanceByName (string $stateName) { + // Validate parameter + if (empty($stateName)) { + // Throw IAE + throw new InvalidArgumentException('Parameter "stateName" is empty'); + } // Get a class from that configuration entry - $stateInstance = self::createObjectByConfiguredName($className); + $stateInstance = ObjectFactory::createObjectByConfiguredName(sprintf('city_%s_state_class', $stateName)); // Get city instance $cityInstance = CityDaemonFactory::createCityDaemonInstance(); // Debug message - self::createDebugInstance(__CLASS__)->debugOutput('CITY-STATE-FACTORY[' . __METHOD__ . ':' . __LINE__ . ']: City daemon state has changed from ' . $cityInstance->getPrintableState() . ' to ' . $stateInstance->getStateName() . '.'); + self::createDebugInstance(__CLASS__)->debugOutput('CITY-STATE-FACTORY: City daemon state has changed from ' . $cityInstance->getPrintableState() . ' to ' . $stateInstance->getStateName() . '.'); // Once we have that state, set it in the city instance $cityInstance->setStateInstance($stateInstance); diff --git a/application/city/classes/filter/task/city_daemon/class_CityDaemonTaskHandlerInitializerFilter.php b/application/city/classes/filter/task/city_daemon/class_CityDaemonTaskHandlerInitializerFilter.php index 642e8ac..4f4ba2c 100644 --- a/application/city/classes/filter/task/city_daemon/class_CityDaemonTaskHandlerInitializerFilter.php +++ b/application/city/classes/filter/task/city_daemon/class_CityDaemonTaskHandlerInitializerFilter.php @@ -7,7 +7,7 @@ use Org\Mxchange\City\Daemon\Factory\CityDaemonFactory; use Org\Mxchange\City\Filter\BaseCityFilter; // Import framework stuff -use Org\Mxchange\CoreFramework\Factory\ObjectFactory; +use Org\Mxchange\CoreFramework\Factory\Object\ObjectFactory; use Org\Mxchange\CoreFramework\Filter\Filterable; use Org\Mxchange\CoreFramework\Registry\GenericRegistry; use Org\Mxchange\CoreFramework\Request\Requestable; diff --git a/application/city/classes/login/class_CityUserLogin.php b/application/city/classes/login/class_CityUserLogin.php index 8297bb9..873946e 100644 --- a/application/city/classes/login/class_CityUserLogin.php +++ b/application/city/classes/login/class_CityUserLogin.php @@ -5,7 +5,7 @@ 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\Object\ObjectFactory; use Org\Mxchange\CoreFramework\Factory\User\UserFactory; use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem; use Org\Mxchange\CoreFramework\Registry\GenericRegistry; diff --git a/application/city/classes/login/helper/class_CityLoginHelper.php b/application/city/classes/login/helper/class_CityLoginHelper.php index 49876c1..65f92ba 100644 --- a/application/city/classes/login/helper/class_CityLoginHelper.php +++ b/application/city/classes/login/helper/class_CityLoginHelper.php @@ -5,7 +5,7 @@ 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\Factory\Object\ObjectFactory; use Org\Mxchange\CoreFramework\Generic\NullPointerException; use Org\Mxchange\CoreFramework\Helper\Login\BaseLoginHelper; use Org\Mxchange\CoreFramework\Helper\Login\HelpableLogin; diff --git a/application/city/classes/registration/class_CityRegistration.php b/application/city/classes/registration/class_CityRegistration.php index 5e2680d..18f47ba 100644 --- a/application/city/classes/registration/class_CityRegistration.php +++ b/application/city/classes/registration/class_CityRegistration.php @@ -7,7 +7,7 @@ use Org\Mxchange\CoreFramework\Bootstrap\FrameworkBootstrap; use Org\Mxchange\CoreFramework\Criteria\Storing\StoreableCriteria; use Org\Mxchange\CoreFramework\Database\Frontend\User\UserDatabaseFrontend; use Org\Mxchange\CoreFramework\Factory\Database\Frontend\DatabaseFrontendFactory; -use Org\Mxchange\CoreFramework\Factory\ObjectFactory; +use Org\Mxchange\CoreFramework\Factory\Object\ObjectFactory; use Org\Mxchange\CoreFramework\Registration\BaseRegistration; use Org\Mxchange\CoreFramework\Registration\User\UserRegister; use Org\Mxchange\CoreFramework\Request\Requestable; diff --git a/application/city/templates/code/action_city_login_city_map.ctp b/application/city/templates/code/action_city_login_city_map.ctp index 492fd31..e13bf34 100644 --- a/application/city/templates/code/action_city_login_city_map.ctp +++ b/application/city/templates/code/action_city_login_city_map.ctp @@ -1,6 +1,6 @@