From ae177ee92c0c70c53c854e2f5bd33c09ce56e5f6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Mon, 1 Jan 2018 04:50:00 +0100 Subject: [PATCH] Continued: - "imported" more classes/interfaces - created new namespaces MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- application/city/classes/actions/class_ | 1 + application/city/classes/actions/class_BaseCityAction.php | 1 + .../actions/html/city/class_HtmlCityLoginCityMapAction.php | 1 + .../actions/html/class_HtmlCityLoginGovernmentAction.php | 1 + .../actions/html/class_HtmlCityLoginLogoutAction.php | 2 ++ .../actions/html/class_HtmlCityLoginProfileAction.php | 1 + .../html/class_HtmlCityLoginStatusProblemAction.php | 2 ++ .../actions/html/class_HtmlCityLoginWelcomeAction.php | 1 + .../city/classes/city_daemon/class_BaseCityDaemon.php | 1 + .../default/class_SimulationDefaultCityDaemon.php | 1 + .../commands/console/class_CityConsoleDaemonCommand.php | 5 +++++ .../commands/html/class_CityHtmlCityGuestLoginCommand.php | 5 +++++ .../classes/commands/html/class_CityHtmlCityMapCommand.php | 5 +++++ .../commands/html/class_CityHtmlCityRegisterCommand.php | 5 +++++ .../commands/html/class_CityHtmlCityUserLoginCommand.php | 5 +++++ .../classes/commands/html/class_CityHtmlConfirmCommand.php | 4 ++++ .../classes/commands/html/class_CityHtmlDoFormCommand.php | 4 ++++ .../classes/commands/html/class_CityHtmlHomeCommand.php | 5 +++++ .../commands/html/class_CityHtmlLoginAreaCommand.php | 2 ++ .../classes/commands/html/class_CityHtmlLoginCommand.php | 4 ++++ .../commands/html/class_CityHtmlLoginFailedCommand.php | 4 ++++ .../classes/commands/html/class_CityHtmlLogoutCommand.php | 4 ++++ .../commands/html/class_CityHtmlRegisterCommand.php | 4 ++++ .../commands/html/class_CityHtmlResendLinkCommand.php | 5 +++++ .../classes/commands/html/class_HtmlLogoutDoneCommand.php | 5 +++++ .../console/class_CityConsoleDefaultNewsController.php | 2 ++ .../controller/html/class_CityHtmlConfirmController.php | 2 ++ .../html/class_CityHtmlDefaultNewsController.php | 2 ++ .../controller/html/class_CityHtmlLoginController.php | 1 + .../html/class_CityHtmlLoginFailedController.php | 1 + .../controller/html/class_CityHtmlLogoutController.php | 1 + .../controller/html/class_CityHtmlLogoutDoneController.php | 1 + .../controller/html/class_CityHtmlRegisterController.php | 1 + .../html/form/class_CityHtmlDoFormController.php | 1 + .../html/login/class_CityHtmlLoginAreaController.php | 2 ++ .../frontend/city/class_CityInformationDatabaseWrapper.php | 1 + .../districts/class_CityDistrictsDatabaseWrapper.php | 6 ++++++ .../city_entities/lots/class_CityLotsDatabaseWrapper.php | 6 ++++++ .../sections/class_CitySectionsDatabaseWrapper.php | 6 ++++++ .../region/class_RegionInformationDatabaseWrapper.php | 6 ++++++ .../frontend/region_map/class_RegionMapDatabaseWrapper.php | 6 ++++++ .../factories/city_daemon/class_CityDaemonFactory.php | 1 + .../classes/factories/manager/class_ManagerFactory.php | 6 ++++++ .../factories/states/city/class_CityStateFactory.php | 6 ++++++ .../class_CityDaemonTaskHandlerInitializerFilter.php | 1 + application/city/classes/login/class_CityGuestLogin.php | 1 + application/city/classes/login/class_CityUserLogin.php | 1 + .../city/classes/login/helper/class_CityLoginHelper.php | 1 + .../city/classes/registration/class_CityRegistration.php | 1 + .../command/console/class_CityConsoleCommandResolver.php | 7 +++++-- .../command/html/class_CityHtmlCommandResolver.php | 7 +++++-- .../console/class_CityConsoleControllerResolver.php | 3 ++- .../controller/html/class_CityHtmlControllerResolver.php | 3 ++- .../controller/image/class_CityImageControllerResolver.php | 3 ++- application/city/config.php | 2 +- 55 files changed, 158 insertions(+), 8 deletions(-) diff --git a/application/city/classes/actions/class_ b/application/city/classes/actions/class_ index 6ac6067..5b633e8 100644 --- a/application/city/classes/actions/class_ +++ b/application/city/classes/actions/class_ @@ -3,6 +3,7 @@ namespace Org\Mxchange\City\Action; // Import framework stuff +use Org\Mxchange\CoreFramework\Controller\Controller; use Org\Mxchange\CoreFramework\Request\Requestable; use Org\Mxchange\CoreFramework\Response\Responseable; diff --git a/application/city/classes/actions/class_BaseCityAction.php b/application/city/classes/actions/class_BaseCityAction.php index aa27ec4..5384e9c 100644 --- a/application/city/classes/actions/class_BaseCityAction.php +++ b/application/city/classes/actions/class_BaseCityAction.php @@ -3,6 +3,7 @@ namespace Org\Mxchange\City\Action; // Import framework stuff +use Org\Mxchange\CoreFramework\Controller\Controller; use Org\Mxchange\CoreFramework\Request\Requestable; use Org\Mxchange\CoreFramework\Response\Responseable; diff --git a/application/city/classes/actions/html/city/class_HtmlCityLoginCityMapAction.php b/application/city/classes/actions/html/city/class_HtmlCityLoginCityMapAction.php index 1e701ab..edddc0f 100644 --- a/application/city/classes/actions/html/city/class_HtmlCityLoginCityMapAction.php +++ b/application/city/classes/actions/html/city/class_HtmlCityLoginCityMapAction.php @@ -3,6 +3,7 @@ namespace Org\Mxchange\City\Action\Login; // Import framework stuff +use Org\Mxchange\CoreFramework\Controller\Controller; use Org\Mxchange\CoreFramework\Request\Requestable; use Org\Mxchange\CoreFramework\Response\Responseable; diff --git a/application/city/classes/actions/html/class_HtmlCityLoginGovernmentAction.php b/application/city/classes/actions/html/class_HtmlCityLoginGovernmentAction.php index 1435c26..227b36f 100644 --- a/application/city/classes/actions/html/class_HtmlCityLoginGovernmentAction.php +++ b/application/city/classes/actions/html/class_HtmlCityLoginGovernmentAction.php @@ -3,6 +3,7 @@ namespace Org\Mxchange\City\Action\Login; // Import framework stuff +use Org\Mxchange\CoreFramework\Controller\Controller; use Org\Mxchange\CoreFramework\Request\Requestable; use Org\Mxchange\CoreFramework\Response\Responseable; diff --git a/application/city/classes/actions/html/class_HtmlCityLoginLogoutAction.php b/application/city/classes/actions/html/class_HtmlCityLoginLogoutAction.php index cc5aeb7..5ef2c49 100644 --- a/application/city/classes/actions/html/class_HtmlCityLoginLogoutAction.php +++ b/application/city/classes/actions/html/class_HtmlCityLoginLogoutAction.php @@ -3,6 +3,8 @@ 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\Request\Requestable; use Org\Mxchange\CoreFramework\Response\Responseable; diff --git a/application/city/classes/actions/html/class_HtmlCityLoginProfileAction.php b/application/city/classes/actions/html/class_HtmlCityLoginProfileAction.php index e1b7372..9737fc8 100644 --- a/application/city/classes/actions/html/class_HtmlCityLoginProfileAction.php +++ b/application/city/classes/actions/html/class_HtmlCityLoginProfileAction.php @@ -3,6 +3,7 @@ namespace Org\Mxchange\City\Action\Login; // Import framework stuff +use Org\Mxchange\CoreFramework\Controller\Controller; 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 2733295..f29a700 100644 --- a/application/city/classes/actions/html/class_HtmlCityLoginStatusProblemAction.php +++ b/application/city/classes/actions/html/class_HtmlCityLoginStatusProblemAction.php @@ -3,6 +3,8 @@ 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\Request\Requestable; use Org\Mxchange\CoreFramework\Response\Responseable; diff --git a/application/city/classes/actions/html/class_HtmlCityLoginWelcomeAction.php b/application/city/classes/actions/html/class_HtmlCityLoginWelcomeAction.php index 5fbb1db..5199c25 100644 --- a/application/city/classes/actions/html/class_HtmlCityLoginWelcomeAction.php +++ b/application/city/classes/actions/html/class_HtmlCityLoginWelcomeAction.php @@ -3,6 +3,7 @@ namespace Org\Mxchange\City\Action\Login; // Import framework stuff +use Org\Mxchange\CoreFramework\Controller\Controller; 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 3ba7047..2d17669 100644 --- a/application/city/classes/city_daemon/class_BaseCityDaemon.php +++ b/application/city/classes/city_daemon/class_BaseCityDaemon.php @@ -3,6 +3,7 @@ namespace Org\Mxchange\City\Daemon; // Import framework stuff +use Org\Mxchange\CoreFramework\Factory\ObjectFactory; use Org\Mxchange\CoreFramework\Request\Requestable; use Org\Mxchange\CoreFramework\Response\Responseable; diff --git a/application/city/classes/city_daemon/default/class_SimulationDefaultCityDaemon.php b/application/city/classes/city_daemon/default/class_SimulationDefaultCityDaemon.php index 6735334..6e278ec 100644 --- a/application/city/classes/city_daemon/default/class_SimulationDefaultCityDaemon.php +++ b/application/city/classes/city_daemon/default/class_SimulationDefaultCityDaemon.php @@ -6,6 +6,7 @@ namespace Org\Mxchange\City\Daemon\Simulation; use Org\Mxchange\City\Daemon\BaseCityDaemon; // Import framework stuff +use Org\Mxchange\CoreFramework\Factory\ObjectFactory; use Org\Mxchange\CoreFramework\Request\Requestable; /** diff --git a/application/city/classes/commands/console/class_CityConsoleDaemonCommand.php b/application/city/classes/commands/console/class_CityConsoleDaemonCommand.php index ca8f5fe..684cc1a 100644 --- a/application/city/classes/commands/console/class_CityConsoleDaemonCommand.php +++ b/application/city/classes/commands/console/class_CityConsoleDaemonCommand.php @@ -3,7 +3,12 @@ namespace Org\Mxchange\City\Command; // Import framework stuff +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\Request\Requestable; +use Org\Mxchange\CoreFramework\Resolver\Command\CommandResolver; use Org\Mxchange\CoreFramework\Response\Responseable; /** diff --git a/application/city/classes/commands/html/class_CityHtmlCityGuestLoginCommand.php b/application/city/classes/commands/html/class_CityHtmlCityGuestLoginCommand.php index 4f83286..bb444a4 100644 --- a/application/city/classes/commands/html/class_CityHtmlCityGuestLoginCommand.php +++ b/application/city/classes/commands/html/class_CityHtmlCityGuestLoginCommand.php @@ -3,7 +3,12 @@ namespace Org\Mxchange\City\Command; // Import framework stuff +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\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 c7fe40b..b7d68b4 100644 --- a/application/city/classes/commands/html/class_CityHtmlCityMapCommand.php +++ b/application/city/classes/commands/html/class_CityHtmlCityMapCommand.php @@ -3,7 +3,12 @@ namespace Org\Mxchange\City\Command; // Import framework stuff +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\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 4732ccd..9b609b7 100644 --- a/application/city/classes/commands/html/class_CityHtmlCityRegisterCommand.php +++ b/application/city/classes/commands/html/class_CityHtmlCityRegisterCommand.php @@ -3,7 +3,12 @@ namespace Org\Mxchange\City\Command; // Import framework stuff +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\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 8860939..fbc91e2 100644 --- a/application/city/classes/commands/html/class_CityHtmlCityUserLoginCommand.php +++ b/application/city/classes/commands/html/class_CityHtmlCityUserLoginCommand.php @@ -3,7 +3,12 @@ namespace Org\Mxchange\City\Command; // Import framework stuff +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\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 c97205e..e3f1505 100644 --- a/application/city/classes/commands/html/class_CityHtmlConfirmCommand.php +++ b/application/city/classes/commands/html/class_CityHtmlConfirmCommand.php @@ -3,7 +3,11 @@ namespace Org\Mxchange\City\Command; // Import framework stuff +use Org\Mxchange\CoreFramework\Command\BaseCommand; +use Org\Mxchange\CoreFramework\Command\Commandable; +use Org\Mxchange\CoreFramework\Controller\Controller; 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_CityHtmlDoFormCommand.php b/application/city/classes/commands/html/class_CityHtmlDoFormCommand.php index 615c86b..841a995 100644 --- a/application/city/classes/commands/html/class_CityHtmlDoFormCommand.php +++ b/application/city/classes/commands/html/class_CityHtmlDoFormCommand.php @@ -3,7 +3,11 @@ namespace Org\Mxchange\City\Command; // Import framework stuff +use Org\Mxchange\CoreFramework\Command\BaseCommand; +use Org\Mxchange\CoreFramework\Command\Commandable; +use Org\Mxchange\CoreFramework\Controller\Controller; 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_CityHtmlHomeCommand.php b/application/city/classes/commands/html/class_CityHtmlHomeCommand.php index e23348a..2d1ac24 100644 --- a/application/city/classes/commands/html/class_CityHtmlHomeCommand.php +++ b/application/city/classes/commands/html/class_CityHtmlHomeCommand.php @@ -3,7 +3,12 @@ namespace Org\Mxchange\City\Command; // Import framework stuff +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\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 aee209c..073f0e3 100644 --- a/application/city/classes/commands/html/class_CityHtmlLoginAreaCommand.php +++ b/application/city/classes/commands/html/class_CityHtmlLoginAreaCommand.php @@ -3,7 +3,9 @@ namespace Org\Mxchange\City\Command; // Import framework stuff +use Org\Mxchange\CoreFramework\Controller\Controller; 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_CityHtmlLoginCommand.php b/application/city/classes/commands/html/class_CityHtmlLoginCommand.php index fafbf1f..6ecbf29 100644 --- a/application/city/classes/commands/html/class_CityHtmlLoginCommand.php +++ b/application/city/classes/commands/html/class_CityHtmlLoginCommand.php @@ -3,7 +3,11 @@ namespace Org\Mxchange\City\Command; // Import framework stuff +use Org\Mxchange\CoreFramework\Command\BaseCommand; +use Org\Mxchange\CoreFramework\Command\Commandable; +use Org\Mxchange\CoreFramework\Controller\Controller; 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_CityHtmlLoginFailedCommand.php b/application/city/classes/commands/html/class_CityHtmlLoginFailedCommand.php index 7a64525..758159b 100644 --- a/application/city/classes/commands/html/class_CityHtmlLoginFailedCommand.php +++ b/application/city/classes/commands/html/class_CityHtmlLoginFailedCommand.php @@ -3,7 +3,11 @@ namespace Org\Mxchange\City\Command; // Import framework stuff +use Org\Mxchange\CoreFramework\Command\BaseCommand; +use Org\Mxchange\CoreFramework\Command\Commandable; +use Org\Mxchange\CoreFramework\Controller\Controller; 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_CityHtmlLogoutCommand.php b/application/city/classes/commands/html/class_CityHtmlLogoutCommand.php index 17f9710..8cac273 100644 --- a/application/city/classes/commands/html/class_CityHtmlLogoutCommand.php +++ b/application/city/classes/commands/html/class_CityHtmlLogoutCommand.php @@ -3,7 +3,11 @@ namespace Org\Mxchange\City\Command; // Import framework stuff +use Org\Mxchange\CoreFramework\Command\BaseCommand; +use Org\Mxchange\CoreFramework\Command\Commandable; +use Org\Mxchange\CoreFramework\Controller\Controller; 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_CityHtmlRegisterCommand.php b/application/city/classes/commands/html/class_CityHtmlRegisterCommand.php index 7a1bc3c..13ddeb9 100644 --- a/application/city/classes/commands/html/class_CityHtmlRegisterCommand.php +++ b/application/city/classes/commands/html/class_CityHtmlRegisterCommand.php @@ -3,7 +3,11 @@ namespace Org\Mxchange\City\Command; // Import framework stuff +use Org\Mxchange\CoreFramework\Command\BaseCommand; +use Org\Mxchange\CoreFramework\Command\Commandable; +use Org\Mxchange\CoreFramework\Controller\Controller; 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_CityHtmlResendLinkCommand.php b/application/city/classes/commands/html/class_CityHtmlResendLinkCommand.php index e3ff35f..3ffce95 100644 --- a/application/city/classes/commands/html/class_CityHtmlResendLinkCommand.php +++ b/application/city/classes/commands/html/class_CityHtmlResendLinkCommand.php @@ -3,7 +3,12 @@ namespace Org\Mxchange\City\Command; // Import framework stuff +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\Request\Requestable; +use Org\Mxchange\CoreFramework\Resolver\Command\CommandResolver; use Org\Mxchange\CoreFramework\Response\Responseable; /** diff --git a/application/city/classes/commands/html/class_HtmlLogoutDoneCommand.php b/application/city/classes/commands/html/class_HtmlLogoutDoneCommand.php index 6b57424..f4824be 100644 --- a/application/city/classes/commands/html/class_HtmlLogoutDoneCommand.php +++ b/application/city/classes/commands/html/class_HtmlLogoutDoneCommand.php @@ -3,7 +3,12 @@ namespace Org\Mxchange\City\Command; // Import framework stuff +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\Request\Requestable; +use Org\Mxchange\CoreFramework\Resolver\Command\CommandResolver; use Org\Mxchange\CoreFramework\Response\Responseable; /** diff --git a/application/city/classes/controller/console/class_CityConsoleDefaultNewsController.php b/application/city/classes/controller/console/class_CityConsoleDefaultNewsController.php index 81fb7ff..d5e7113 100644 --- a/application/city/classes/controller/console/class_CityConsoleDefaultNewsController.php +++ b/application/city/classes/controller/console/class_CityConsoleDefaultNewsController.php @@ -5,7 +5,9 @@ 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\Request\Requestable; +use Org\Mxchange\CoreFramework\Resolver\Command\CommandResolver; use Org\Mxchange\CoreFramework\Response\Responseable; /** diff --git a/application/city/classes/controller/html/class_CityHtmlConfirmController.php b/application/city/classes/controller/html/class_CityHtmlConfirmController.php index 6b2e541..02d4df6 100644 --- a/application/city/classes/controller/html/class_CityHtmlConfirmController.php +++ b/application/city/classes/controller/html/class_CityHtmlConfirmController.php @@ -5,7 +5,9 @@ namespace Org\Mxchange\City\Controller\Confirmed; // 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\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 4a99543..ccffd4e 100644 --- a/application/city/classes/controller/html/class_CityHtmlDefaultNewsController.php +++ b/application/city/classes/controller/html/class_CityHtmlDefaultNewsController.php @@ -5,7 +5,9 @@ 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\Request\Requestable; +use Org\Mxchange\CoreFramework\Resolver\Command\CommandResolver; use Org\Mxchange\CoreFramework\Response\Responseable; /** diff --git a/application/city/classes/controller/html/class_CityHtmlLoginController.php b/application/city/classes/controller/html/class_CityHtmlLoginController.php index 0256ea1..65b6b9a 100644 --- a/application/city/classes/controller/html/class_CityHtmlLoginController.php +++ b/application/city/classes/controller/html/class_CityHtmlLoginController.php @@ -6,6 +6,7 @@ namespace Org\Mxchange\City\Controller\Login; use Org\Mxchange\CoreFramework\Controller\BaseController; use Org\Mxchange\CoreFramework\Controller\Controller; 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_CityHtmlLoginFailedController.php b/application/city/classes/controller/html/class_CityHtmlLoginFailedController.php index 2e6a526..0d05962 100644 --- a/application/city/classes/controller/html/class_CityHtmlLoginFailedController.php +++ b/application/city/classes/controller/html/class_CityHtmlLoginFailedController.php @@ -6,6 +6,7 @@ namespace Org\Mxchange\City\Controller\LoginFailed; use Org\Mxchange\CoreFramework\Controller\BaseController; use Org\Mxchange\CoreFramework\Controller\Controller; 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_CityHtmlLogoutController.php b/application/city/classes/controller/html/class_CityHtmlLogoutController.php index 7a1155c..7fd8b71 100644 --- a/application/city/classes/controller/html/class_CityHtmlLogoutController.php +++ b/application/city/classes/controller/html/class_CityHtmlLogoutController.php @@ -6,6 +6,7 @@ namespace Org\Mxchange\City\Controller\Logout; use Org\Mxchange\CoreFramework\Controller\BaseController; use Org\Mxchange\CoreFramework\Controller\Controller; 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_CityHtmlLogoutDoneController.php b/application/city/classes/controller/html/class_CityHtmlLogoutDoneController.php index c3bb7eb..6f4385f 100644 --- a/application/city/classes/controller/html/class_CityHtmlLogoutDoneController.php +++ b/application/city/classes/controller/html/class_CityHtmlLogoutDoneController.php @@ -6,6 +6,7 @@ namespace Org\Mxchange\City\Controller\LogoutDone; use Org\Mxchange\CoreFramework\Controller\BaseController; use Org\Mxchange\CoreFramework\Controller\Controller; 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_CityHtmlRegisterController.php b/application/city/classes/controller/html/class_CityHtmlRegisterController.php index 03a658a..a6dff23 100644 --- a/application/city/classes/controller/html/class_CityHtmlRegisterController.php +++ b/application/city/classes/controller/html/class_CityHtmlRegisterController.php @@ -6,6 +6,7 @@ namespace Org\Mxchange\City\Controller\Register; use Org\Mxchange\CoreFramework\Controller\BaseController; use Org\Mxchange\CoreFramework\Controller\Controller; 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/form/class_CityHtmlDoFormController.php b/application/city/classes/controller/html/form/class_CityHtmlDoFormController.php index 43c3565..56415cb 100644 --- a/application/city/classes/controller/html/form/class_CityHtmlDoFormController.php +++ b/application/city/classes/controller/html/form/class_CityHtmlDoFormController.php @@ -6,6 +6,7 @@ namespace Org\Mxchange\City\Controller\DoForm; use Org\Mxchange\CoreFramework\Controller\BaseController; use Org\Mxchange\CoreFramework\Controller\Controller; 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 4334052..d552246 100644 --- a/application/city/classes/controller/html/login/class_CityHtmlLoginAreaController.php +++ b/application/city/classes/controller/html/login/class_CityHtmlLoginAreaController.php @@ -5,7 +5,9 @@ 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\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_CityInformationDatabaseWrapper.php b/application/city/classes/database/frontend/city/class_CityInformationDatabaseWrapper.php index 56539b2..d9acf4b 100644 --- a/application/city/classes/database/frontend/city/class_CityInformationDatabaseWrapper.php +++ b/application/city/classes/database/frontend/city/class_CityInformationDatabaseWrapper.php @@ -6,6 +6,7 @@ namespace Org\Mxchange\City\Database\Frontend\Information; use Org\Mxchange\City\Daemon\BaseCityDaemon; // Import framework stuff +use Org\Mxchange\CoreFramework\Factory\ObjectFactory; use Org\Mxchange\CoreFramework\Request\Requestable; /** diff --git a/application/city/classes/database/frontend/city_entities/districts/class_CityDistrictsDatabaseWrapper.php b/application/city/classes/database/frontend/city_entities/districts/class_CityDistrictsDatabaseWrapper.php index 246ef5b..0ebb871 100644 --- a/application/city/classes/database/frontend/city_entities/districts/class_CityDistrictsDatabaseWrapper.php +++ b/application/city/classes/database/frontend/city_entities/districts/class_CityDistrictsDatabaseWrapper.php @@ -1,4 +1,10 @@ isCommandValid($commandName) === FALSE) { + } elseif ($resolverInstance->isCommandValid('Org\Mxchange\City\Command', $commandName) === FALSE) { // Invalid command found throw new InvalidCommandException(array($resolverInstance, $commandName), self::EXCEPTION_INVALID_COMMAND); } - // Set the application instance + // Set namespace and application instance + $resolverInstance->setNamespace('Org\Mxchange\City\Command'); $resolverInstance->setApplicationInstance($applicationInstance); // Return the prepared instance diff --git a/application/city/classes/resolver/command/html/class_CityHtmlCommandResolver.php b/application/city/classes/resolver/command/html/class_CityHtmlCommandResolver.php index 30e5339..90ac6ff 100644 --- a/application/city/classes/resolver/command/html/class_CityHtmlCommandResolver.php +++ b/application/city/classes/resolver/command/html/class_CityHtmlCommandResolver.php @@ -4,6 +4,8 @@ namespace Org\Mxchange\City\Resolver\Command; // Import framework stuff use Org\Mxchange\CoreFramework\Manager\ManageableApplication; +use Org\Mxchange\CoreFramework\Resolver\Command\BaseCommandResolver; +use Org\Mxchange\CoreFramework\Resolver\Command\CommandResolver; /** * A command resolver for HTML commands @@ -58,12 +60,13 @@ class CityHtmlCommandResolver extends BaseCommandResolver implements CommandReso if (empty($commandName)) { // Then thrown an exception here throw new EmptyVariableException(array($resolverInstance, 'commandName'), self::EXCEPTION_UNEXPECTED_EMPTY_STRING); - } elseif ($resolverInstance->isCommandValid($commandName) === FALSE) { + } elseif ($resolverInstance->isCommandValid('Org\Mxchange\City\Command', $commandName) === FALSE) { // Invalid command found throw new InvalidCommandException(array($resolverInstance, $commandName), self::EXCEPTION_INVALID_COMMAND); } - // Set the application instance + // Set namespace and application instance + $resolverInstance->setNamespace('Org\Mxchange\City\Command'); $resolverInstance->setApplicationInstance($applicationInstance); // Return the prepared instance diff --git a/application/city/classes/resolver/controller/console/class_CityConsoleControllerResolver.php b/application/city/classes/resolver/controller/console/class_CityConsoleControllerResolver.php index 1cee1ae..1fc1fba 100644 --- a/application/city/classes/resolver/controller/console/class_CityConsoleControllerResolver.php +++ b/application/city/classes/resolver/controller/console/class_CityConsoleControllerResolver.php @@ -68,7 +68,8 @@ class CityConsoleControllerResolver extends BaseControllerResolver implements Co // Set the application instance $resolverInstance->setApplicationInstance($applicationInstance); - // Set controller name + // Set namespace and controller name + $resolverInstance->setNamespace('Org\Mxchange\City\Controller'); $resolverInstance->setControllerName($controllerName); // Return the prepared instance diff --git a/application/city/classes/resolver/controller/html/class_CityHtmlControllerResolver.php b/application/city/classes/resolver/controller/html/class_CityHtmlControllerResolver.php index cb15a70..f7bcba4 100644 --- a/application/city/classes/resolver/controller/html/class_CityHtmlControllerResolver.php +++ b/application/city/classes/resolver/controller/html/class_CityHtmlControllerResolver.php @@ -68,7 +68,8 @@ class CityHtmlControllerResolver extends BaseControllerResolver implements Contr // Set the application instance $resolverInstance->setApplicationInstance($applicationInstance); - // Set controller name + // Set namespace and controller name + $resolverInstance->setNamespace('Org\Mxchange\City\Controller'); $resolverInstance->setControllerName($controllerName); // Return the prepared instance diff --git a/application/city/classes/resolver/controller/image/class_CityImageControllerResolver.php b/application/city/classes/resolver/controller/image/class_CityImageControllerResolver.php index d8483b3..831d9ad 100644 --- a/application/city/classes/resolver/controller/image/class_CityImageControllerResolver.php +++ b/application/city/classes/resolver/controller/image/class_CityImageControllerResolver.php @@ -68,7 +68,8 @@ class CityImageControllerResolver extends BaseControllerResolver implements Cont // Set the application instance $resolverInstance->setApplicationInstance($applicationInstance); - // Set controller name + // Set namespace and controller name + $resolverInstance->setNamespace('Org\Mxchange\City\Controller'); $resolverInstance->setControllerName($controllerName); // Return the prepared instance diff --git a/application/city/config.php b/application/city/config.php index 6571829..a31b52f 100644 --- a/application/city/config.php +++ b/application/city/config.php @@ -517,7 +517,7 @@ $cfg->setConfigEntry('default_city_console_command', 'daemon'); $cfg->setConfigEntry('default_city_console_controller', 'daemon'); // CFG: CITY-CONSOLE-CMD-DAEMON-RESOLVER-CLASS -$cfg->setConfigEntry('city_console_cmd_daemon_resolver_class', 'CityConsoleCommandResolver'); +$cfg->setConfigEntry('city_console_cmd_daemon_resolver_class', 'Org\Mxchange\City\Resolver\Command\CityConsoleCommandResolver'); // CFG: CITY-DAEMON-PHP-REQUIREMENTS-FILTER $cfg->setConfigEntry('city_daemon_php_requirements_filter', 'CityDaemonPhpRequirementsFilter'); -- 2.39.2