From 2f13b8829ca1aaa76fe28448223230502adfb93f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Mon, 1 Jan 2018 05:23:32 +0100 Subject: [PATCH] Next wave: - "imported" classes/interfaces - created new namespaces - updated configuration entries MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- application/city/classes/city_daemon/class_ | 4 ++++ .../city_daemon/class_BaseCityDaemon.php | 7 ++++++ .../class_SimulationDefaultCityDaemon.php | 3 +++ application/city/classes/class_ | 6 +++++ application/city/classes/class_Base | 6 +++++ .../city/classes/class_BaseCitySystem.php | 9 +++++++ .../class_CityConsoleDaemonCommand.php | 4 ++++ .../html/class_CityHtmlConfirmCommand.php | 1 + .../html/class_CityHtmlLoginAreaCommand.php | 1 + .../html/class_CityHtmlResendLinkCommand.php | 1 + ...class_CityConsoleDefaultNewsController.php | 1 + .../class_CityInformationDatabaseWrapper.php | 2 ++ ...class_RegionInformationDatabaseWrapper.php | 1 + .../class_RegionMapDatabaseWrapper.php | 1 + .../city_daemon/class_CityDaemonFactory.php | 3 ++- .../manager/class_ManagerFactory.php | 1 + .../states/city/class_CityStateFactory.php | 3 +++ .../city_daemon/class_CityDaemonBootstrap | 5 ++++ ...aemonBootstrapExtraBootstrappingFilter.php | 5 ++++ .../bootstrap/class_CityDaemonBootstrap | 5 ++++ ...ss_CityDaemonBootstrapInitDaemonFilter.php | 5 ++++ .../filter/city_daemon/class_CityDaemon | 4 ++++ .../class_CityDaemonInitializationFilter.php | 5 ++++ .../class_CityDaemonPhpRequirementsFilter.php | 4 ++++ .../class_CityDaemonWelcomeTeaserFilter.php | 5 ++++ application/city/classes/filter/class_ | 5 ++++ .../classes/filter/class_BaseCityFilter.php | 8 +++++++ .../shutdown/city/class_CityDaemonShutdown | 5 ++++ .../class_CityDaemonShutdownCityFilter.php | 5 ++++ ...ss_CityDaemonShutdownTaskHandlerFilter.php | 5 ++++ ...CityDaemonTaskHandlerInitializerFilter.php | 7 +++++- .../verifier/class_CityNameVerifierFilter.php | 2 ++ .../classes/login/class_CityGuestLogin.php | 1 + .../classes/login/class_CityUserLogin.php | 2 ++ .../login/helper/class_CityLoginHelper.php | 4 +--- .../districts/class_CityDistrictsManager.php | 6 +++++ .../lots/class_CityLotsManager.php | 6 +++++ .../sections/class_CitySectionsManager.php | 6 +++++ application/city/classes/manager/class_ | 6 +++++ .../classes/manager/class_BaseManager.php | 6 +++++ .../registration/class_CityRegistration.php | 4 +--- .../city/active/class_CityActiveState.php | 6 +++++ .../city/classes/tasks/class_BaseCityTask.php | 6 +++++ .../class_CityDaemonBuildingGrowthTask.php | 6 +++++ .../class_CityDaemonHouseholdGrowthTask.php | 6 +++++ .../class_CityDaemonMapExpanderTask.php | 6 +++++ application/city/config.php | 24 +++++++++---------- .../city/class_CityInformationWrapper.php | 1 + .../helper/city/class_CityHelper.php | 3 +++ core | 2 +- 50 files changed, 209 insertions(+), 21 deletions(-) diff --git a/application/city/classes/city_daemon/class_ b/application/city/classes/city_daemon/class_ index 3733a98..8e70ece 100644 --- a/application/city/classes/city_daemon/class_ +++ b/application/city/classes/city_daemon/class_ @@ -2,7 +2,11 @@ // Own namespace namespace Org\Mxchange\City\Daemon\Simulation; +// Import own stuff +use Org\Mxchange\City\Helper\CityHelper; + // Import framework stuff +use Org\Mxchange\CoreFramework\Handler\Task\HandleableTask; use Org\Mxchange\CoreFramework\Request\Requestable; /** diff --git a/application/city/classes/city_daemon/class_BaseCityDaemon.php b/application/city/classes/city_daemon/class_BaseCityDaemon.php index 2d17669..9d7302a 100644 --- a/application/city/classes/city_daemon/class_BaseCityDaemon.php +++ b/application/city/classes/city_daemon/class_BaseCityDaemon.php @@ -2,8 +2,15 @@ // Own namespace namespace Org\Mxchange\City\Daemon; +// Import own stuff +use Org\Mxchange\City\Generic\BaseCitySystem; + // Import framework stuff +use Org\Mxchange\CoreFramework\Criteria\Add\AddableCriteria; +use Org\Mxchange\CoreFramework\Criteria\Storing\StoreableCriteria; +use Org\Mxchange\CoreFramework\Database\Updateable; use Org\Mxchange\CoreFramework\Factory\ObjectFactory; +use Org\Mxchange\CoreFramework\Registry\Registry; 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 6e278ec..2820158 100644 --- a/application/city/classes/city_daemon/default/class_SimulationDefaultCityDaemon.php +++ b/application/city/classes/city_daemon/default/class_SimulationDefaultCityDaemon.php @@ -4,9 +4,12 @@ namespace Org\Mxchange\City\Daemon\Simulation; // Import own stuff 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\Handler\Task\HandleableTask; +use Org\Mxchange\CoreFramework\Registry\Registry; use Org\Mxchange\CoreFramework\Request\Requestable; /** diff --git a/application/city/classes/class_ b/application/city/classes/class_ index 81c9847..408811f 100644 --- a/application/city/classes/class_ +++ b/application/city/classes/class_ @@ -1,4 +1,10 @@ convertToClassName($cityMode) . 'CityDaemon'; + $className = 'Org\Mxchange\City\Daemon\Simulation\Simulation' . $factoryInstance->convertToClassName($cityMode) . 'CityDaemon'; // Get the city instance $cityInstance = ObjectFactory::createObjectByName($className, array($requestInstance)); diff --git a/application/city/classes/factories/manager/class_ManagerFactory.php b/application/city/classes/factories/manager/class_ManagerFactory.php index 03d6f05..7c2b5be 100644 --- a/application/city/classes/factories/manager/class_ManagerFactory.php +++ b/application/city/classes/factories/manager/class_ManagerFactory.php @@ -4,6 +4,7 @@ namespace Org\Mxchange\City\Factory\Manager; // Import framework stuff use Org\Mxchange\CoreFramework\Factory\ObjectFactory; +use Org\Mxchange\CoreFramework\Registry\Registry; /** * A factory class for managers diff --git a/application/city/classes/factories/states/city/class_CityStateFactory.php b/application/city/classes/factories/states/city/class_CityStateFactory.php index cf5cfcd..fd76097 100644 --- a/application/city/classes/factories/states/city/class_CityStateFactory.php +++ b/application/city/classes/factories/states/city/class_CityStateFactory.php @@ -2,6 +2,9 @@ // Own namespace namespace Org\Mxchange\City\Factory\State; +// Import own stuff +use Org\Mxchange\City\Daemon\Factory\CityDaemonFactory; + // Import framework stuff use Org\Mxchange\CoreFramework\Factory\ObjectFactory; diff --git a/application/city/classes/filter/bootstrap/city_daemon/class_CityDaemonBootstrap b/application/city/classes/filter/bootstrap/city_daemon/class_CityDaemonBootstrap index e9ff89b..cc8827b 100644 --- a/application/city/classes/filter/bootstrap/city_daemon/class_CityDaemonBootstrap +++ b/application/city/classes/filter/bootstrap/city_daemon/class_CityDaemonBootstrap @@ -2,7 +2,12 @@ // Own namespace namespace Org\Mxchange\City\Daemon\Filter\Bootstrap; +// Import own stuff +use Org\Mxchange\City\Daemon\Factory\CityDaemonFactory; +use Org\Mxchange\City\Filter\BaseCityFilter; + // Import framework stuff +use Org\Mxchange\CoreFramework\Filter\Filterable; use Org\Mxchange\CoreFramework\Request\Requestable; use Org\Mxchange\CoreFramework\Response\Responseable; diff --git a/application/city/classes/filter/bootstrap/city_daemon/class_CityDaemonBootstrapExtraBootstrappingFilter.php b/application/city/classes/filter/bootstrap/city_daemon/class_CityDaemonBootstrapExtraBootstrappingFilter.php index d1840eb..a9c9013 100644 --- a/application/city/classes/filter/bootstrap/city_daemon/class_CityDaemonBootstrapExtraBootstrappingFilter.php +++ b/application/city/classes/filter/bootstrap/city_daemon/class_CityDaemonBootstrapExtraBootstrappingFilter.php @@ -2,7 +2,12 @@ // Own namespace namespace Org\Mxchange\City\Daemon\Filter\Bootstrap; +// Import own stuff +use Org\Mxchange\City\Daemon\Factory\CityDaemonFactory; +use Org\Mxchange\City\Filter\BaseCityFilter; + // Import framework stuff +use Org\Mxchange\CoreFramework\Filter\Filterable; use Org\Mxchange\CoreFramework\Request\Requestable; use Org\Mxchange\CoreFramework\Response\Responseable; diff --git a/application/city/classes/filter/bootstrap/class_CityDaemonBootstrap b/application/city/classes/filter/bootstrap/class_CityDaemonBootstrap index 38b096f..c31cbc4 100644 --- a/application/city/classes/filter/bootstrap/class_CityDaemonBootstrap +++ b/application/city/classes/filter/bootstrap/class_CityDaemonBootstrap @@ -2,7 +2,12 @@ // Own namespace namespace Org\Mxchange\City\Daemon\Filter\Bootstrap; +// Import own stuff +use Org\Mxchange\City\Filter\BaseCityFilter; + // Import framework stuff +use Org\Mxchange\CoreFramework\Filter\Filterable; +use Org\Mxchange\CoreFramework\Registry\Registry; use Org\Mxchange\CoreFramework\Request\Requestable; use Org\Mxchange\CoreFramework\Response\Responseable; diff --git a/application/city/classes/filter/bootstrap/init/class_CityDaemonBootstrapInitDaemonFilter.php b/application/city/classes/filter/bootstrap/init/class_CityDaemonBootstrapInitDaemonFilter.php index 34aca07..5502409 100644 --- a/application/city/classes/filter/bootstrap/init/class_CityDaemonBootstrapInitDaemonFilter.php +++ b/application/city/classes/filter/bootstrap/init/class_CityDaemonBootstrapInitDaemonFilter.php @@ -2,7 +2,12 @@ // Own namespace namespace Org\Mxchange\City\Daemon\Filter\Bootstrap; +// Import own stuff +use Org\Mxchange\City\Daemon\Factory\CityDaemonFactory; +use Org\Mxchange\City\Filter\BaseCityFilter; + // Import framework stuff +use Org\Mxchange\CoreFramework\Filter\Filterable; use Org\Mxchange\CoreFramework\Request\Requestable; use Org\Mxchange\CoreFramework\Response\Responseable; diff --git a/application/city/classes/filter/city_daemon/class_CityDaemon b/application/city/classes/filter/city_daemon/class_CityDaemon index a91b265..e6d9538 100644 --- a/application/city/classes/filter/city_daemon/class_CityDaemon +++ b/application/city/classes/filter/city_daemon/class_CityDaemon @@ -2,7 +2,11 @@ // Own namespace namespace Org\Mxchange\City\Daemon\Filter; +// Import own stuff +use Org\Mxchange\City\Filter\BaseCityFilter; + // Import framework stuff +use Org\Mxchange\CoreFramework\Filter\Filterable; use Org\Mxchange\CoreFramework\Request\Requestable; use Org\Mxchange\CoreFramework\Response\Responseable; diff --git a/application/city/classes/filter/city_daemon/class_CityDaemonInitializationFilter.php b/application/city/classes/filter/city_daemon/class_CityDaemonInitializationFilter.php index e94f998..58d8960 100644 --- a/application/city/classes/filter/city_daemon/class_CityDaemonInitializationFilter.php +++ b/application/city/classes/filter/city_daemon/class_CityDaemonInitializationFilter.php @@ -2,7 +2,12 @@ // Own namespace namespace Org\Mxchange\City\Daemon\Filter\Initialization; +// Import own stuff +use Org\Mxchange\City\Daemon\Factory\CityDaemonFactory; +use Org\Mxchange\City\Filter\BaseCityFilter; + // Import framework stuff +use Org\Mxchange\CoreFramework\Filter\Filterable; use Org\Mxchange\CoreFramework\Request\Requestable; use Org\Mxchange\CoreFramework\Response\Responseable; diff --git a/application/city/classes/filter/city_daemon/class_CityDaemonPhpRequirementsFilter.php b/application/city/classes/filter/city_daemon/class_CityDaemonPhpRequirementsFilter.php index 31e68a3..d93c5cf 100644 --- a/application/city/classes/filter/city_daemon/class_CityDaemonPhpRequirementsFilter.php +++ b/application/city/classes/filter/city_daemon/class_CityDaemonPhpRequirementsFilter.php @@ -2,7 +2,11 @@ // Own namespace namespace Org\Mxchange\City\Daemon\Filter; +// Import own stuff +use Org\Mxchange\City\Filter\BaseCityFilter; + // Import framework stuff +use Org\Mxchange\CoreFramework\Filter\Filterable; use Org\Mxchange\CoreFramework\Request\Requestable; use Org\Mxchange\CoreFramework\Response\Responseable; diff --git a/application/city/classes/filter/city_daemon/class_CityDaemonWelcomeTeaserFilter.php b/application/city/classes/filter/city_daemon/class_CityDaemonWelcomeTeaserFilter.php index 45148ff..ba17da8 100644 --- a/application/city/classes/filter/city_daemon/class_CityDaemonWelcomeTeaserFilter.php +++ b/application/city/classes/filter/city_daemon/class_CityDaemonWelcomeTeaserFilter.php @@ -2,7 +2,12 @@ // Own namespace namespace Org\Mxchange\City\Daemon\Filter; +// Import own stuff +use Org\Mxchange\City\Daemon\Factory\CityDaemonFactory; +use Org\Mxchange\City\Filter\BaseCityFilter; + // Import framework stuff +use Org\Mxchange\CoreFramework\Filter\Filterable; use Org\Mxchange\CoreFramework\Request\Requestable; use Org\Mxchange\CoreFramework\Response\Responseable; diff --git a/application/city/classes/filter/class_ b/application/city/classes/filter/class_ index 14ac2dd..1f26eb1 100644 --- a/application/city/classes/filter/class_ +++ b/application/city/classes/filter/class_ @@ -2,7 +2,12 @@ // Own namespace namespace Org\Mxchange\City\!!!\Filter; +// Import own stuff +use Org\Mxchange\City\Filter\BaseCityFilter; + // Import framework stuff +use Org\Mxchange\CoreFramework\Filter\Filterable; +use Org\Mxchange\CoreFramework\Registry\Registry; use Org\Mxchange\CoreFramework\Request\Requestable; use Org\Mxchange\CoreFramework\Response\Responseable; diff --git a/application/city/classes/filter/class_BaseCityFilter.php b/application/city/classes/filter/class_BaseCityFilter.php index 8f36956..0e22c15 100644 --- a/application/city/classes/filter/class_BaseCityFilter.php +++ b/application/city/classes/filter/class_BaseCityFilter.php @@ -1,4 +1,12 @@ addInstance('login', $loginInstance); } } - -// -?> diff --git a/application/city/classes/manager/city_entities/districts/class_CityDistrictsManager.php b/application/city/classes/manager/city_entities/districts/class_CityDistrictsManager.php index b2bc775..63147d6 100644 --- a/application/city/classes/manager/city_entities/districts/class_CityDistrictsManager.php +++ b/application/city/classes/manager/city_entities/districts/class_CityDistrictsManager.php @@ -1,4 +1,10 @@ addCriteria('registered', date('Y-m-d H:i:s', time())); } } - -// -?> diff --git a/application/city/classes/states/city/active/class_CityActiveState.php b/application/city/classes/states/city/active/class_CityActiveState.php index bb3473a..56a7821 100644 --- a/application/city/classes/states/city/active/class_CityActiveState.php +++ b/application/city/classes/states/city/active/class_CityActiveState.php @@ -1,4 +1,10 @@ setConfigEntry('city_default_mode', 'default'); // CFG: NEWS-DOWNLOAD-FILTER -$cfg->setConfigEntry('news_download_filter', 'NewsDownloadFilter'); +$cfg->setConfigEntry('news_download_filter', 'Org\Mxchange\CoreFramework\Filter\News\NewsDownloadFilter'); // CFG: NEWS-PROCESS-FILTER -$cfg->setConfigEntry('news_process_filter', 'NewsProcessFilter'); +$cfg->setConfigEntry('news_process_filter', 'Org\Mxchange\CoreFramework\Filter\News\NewsProcessFilter'); // CFG: NEWS-READER-CLASS -$cfg->setConfigEntry('news_reader_class', 'ConsoleNewsReader'); +$cfg->setConfigEntry('news_reader_class', 'Org\Mxchange\CoreFramework\Reader\News\Console\ConsoleNewsReader'); // CFG: CITY-INFO-DB-WRAPPER-CLASS $cfg->setConfigEntry('city_info_db_wrapper_class', 'CityInformationDatabaseWrapper'); @@ -520,31 +520,31 @@ $cfg->setConfigEntry('default_city_console_controller', 'daemon'); $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'); +$cfg->setConfigEntry('city_daemon_php_requirements_filter', 'Org\Mxchange\City\Daemon\Filter\CityDaemonPhpRequirementsFilter'); // CFG: CITY-DAEMON-INITIALIZER-FILTER -$cfg->setConfigEntry('city_daemon_initializer_filter', 'CityDaemonInitializationFilter'); +$cfg->setConfigEntry('city_daemon_initializer_filter', 'Org\Mxchange\City\Daemon\Filter\Initialization\CityDaemonInitializationFilter'); // CFG: CITY-DAEMON-ACTIVATION-TASK-HANDLER-INITIALIZER-FILTER -$cfg->setConfigEntry('city_daemon_activation_task_handler_initializer_filter', 'CityDaemonTaskHandlerInitializerFilter'); +$cfg->setConfigEntry('city_daemon_activation_task_handler_initializer_filter', 'Org\Mxchange\City\Daemon\Filter\Initialization\Tasks\CityDaemonTaskHandlerInitializerFilter'); // CFG: CITY-DAEMON-WELCOME-TEASER-FILTER -$cfg->setConfigEntry('city_daemon_welcome_teaser_filter', 'CityDaemonWelcomeTeaserFilter'); +$cfg->setConfigEntry('city_daemon_welcome_teaser_filter', 'Org\Mxchange\City\Daemon\Filter\CityDaemonWelcomeTeaserFilter'); // CFG: CITY-DAEMON-BOOTSTRAP-INIT-DAEMON-FILTER -$cfg->setConfigEntry('city_daemon_bootstrap_init_daemon_filter', 'CityDaemonBootstrapInitDaemonFilter'); +$cfg->setConfigEntry('city_daemon_bootstrap_init_daemon_filter', 'Org\Mxchange\City\Daemon\Filter\Bootstrap\CityDaemonBootstrapInitDaemonFilter'); // CFG: CITY-DAEMON-BOOTSTRAP-EXTRA-BOOTSTRAPPING-FILTER -$cfg->setConfigEntry('city_daemon_bootstrap_extra_bootstrapping_filter', 'CityDaemonBootstrapExtraBootstrappingFilter'); +$cfg->setConfigEntry('city_daemon_bootstrap_extra_bootstrapping_filter', 'Org\Mxchange\City\Daemon\Filter\Bootstrap\CityDaemonBootstrapExtraBootstrappingFilter'); // CFG: CITY-DAEMON-SHUTDOWN-TASK-HANDLER-FILTER -$cfg->setConfigEntry('city_daemon_shutdown_task_handler_filter', 'CityDaemonShutdownTaskHandlerFilter'); +$cfg->setConfigEntry('city_daemon_shutdown_task_handler_filter', 'Org\Mxchange\City\Daemon\Filter\Shutdown\CityDaemonShutdownTaskHandlerFilter'); // CFG: CITY-DAEMON-SHUTDOWN-CITY-FILTER -$cfg->setConfigEntry('city_daemon_shutdown_city_filter', 'CityDaemonShutdownCityFilter'); +$cfg->setConfigEntry('city_daemon_shutdown_city_filter', 'Org\Mxchange\City\Daemon\Filter\Shutdown\CityDaemonShutdownCityFilter'); // CFG: NEWS-READER-DAEMON-CLASS -$cfg->setConfigEntry('news_reader_daemon_class', 'ConsoleNewsReader'); +$cfg->setConfigEntry('news_reader_daemon_class', 'Org\Mxchange\CoreFramework\Reader\News\Console\ConsoleNewsReader'); // CFG: NEWS-DAEMON-LIMIT $cfg->setConfigEntry('news_daemon_limit', 5); diff --git a/application/city/interfaces/database/frontend/city/class_CityInformationWrapper.php b/application/city/interfaces/database/frontend/city/class_CityInformationWrapper.php index 370dc04..74d85cc 100644 --- a/application/city/interfaces/database/frontend/city/class_CityInformationWrapper.php +++ b/application/city/interfaces/database/frontend/city/class_CityInformationWrapper.php @@ -4,6 +4,7 @@ namespace Org\Mxchange\City\Database\Frontend\Information; // Import own stuff use Org\Mxchange\City\Daemon\BaseCityDaemon; +use Org\Mxchange\City\Helper\CityHelper; // Import framework stuff use Org\Mxchange\CoreFramework\Request\Requestable; diff --git a/application/city/interfaces/helper/city/class_CityHelper.php b/application/city/interfaces/helper/city/class_CityHelper.php index 4c57cf6..1bdea86 100644 --- a/application/city/interfaces/helper/city/class_CityHelper.php +++ b/application/city/interfaces/helper/city/class_CityHelper.php @@ -3,6 +3,9 @@ namespace Org\Mxchange\City\Helper; // Import framework stuff +use Org\Mxchange\CoreFramework\Criteria\Add\AddableCriteria; +use Org\Mxchange\CoreFramework\Handler\Task\HandleableTask; +use Org\Mxchange\CoreFramework\Helper\Helper; use Org\Mxchange\CoreFramework\Request\Requestable; use Org\Mxchange\CoreFramework\Response\Responseable; diff --git a/core b/core index 1abe771..edbaec7 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 1abe7710d866014d74aebda110633e29bf907dee +Subproject commit edbaec7aa8e1019d10b7a3351e1629fed93740f4 -- 2.39.2