From 7c5d39a3b6bc1243d33c4273573e303ec8d0c296 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Tue, 6 Mar 2018 22:59:16 +0100 Subject: [PATCH] Continued: - added new namespaces to classes and config entries - imported classes/interfaces - initialized language system, not required for daemon but for website - updated 'core' framework to latest commit 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 | 6 ++ .../classes/menu/class_CityConfirmMenu.php | 7 ++ .../city/classes/menu/class_CityHomeMenu.php | 9 +++ .../classes/menu/class_CityLoginAreaMenu.php | 7 ++ .../menu/class_CityLoginFailedMenu.php | 7 ++ .../city/classes/menu/class_CityLoginMenu.php | 7 ++ .../classes/menu/class_CityLogoutMenu.php | 7 ++ .../classes/menu/class_CityRegisterMenu.php | 7 ++ .../classes/menu/class_CityStatusMenu.php | 7 ++ .../class_CityGovernmentFailedAreaMenu.php | 7 ++ application/city/config.php | 64 +++++++++---------- core | 2 +- 12 files changed, 104 insertions(+), 33 deletions(-) diff --git a/application/city/class_ApplicationHelper.php b/application/city/class_ApplicationHelper.php index 9ced8a1..794635c 100644 --- a/application/city/class_ApplicationHelper.php +++ b/application/city/class_ApplicationHelper.php @@ -219,6 +219,12 @@ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplica // Get a controller instance as well $this->setControllerInstance($resolverInstance->resolveController()); + // Initialize language system + $languageInstance = ObjectFactory::createObjectByConfiguredName('language_system_class'); + + // And set it here + $this->setLanguageInstance($languageInstance); + // Launch the test suite here $this->getControllerInstance()->handleRequest($requestInstance, $responseInstance); diff --git a/application/city/classes/menu/class_CityConfirmMenu.php b/application/city/classes/menu/class_CityConfirmMenu.php index 3a02036..f4646ae 100644 --- a/application/city/classes/menu/class_CityConfirmMenu.php +++ b/application/city/classes/menu/class_CityConfirmMenu.php @@ -1,4 +1,11 @@ . */ class CityHomeMenu extends BaseMenu implements RenderableMenu { + /** * Protected constructor * @@ -44,4 +52,5 @@ class CityHomeMenu extends BaseMenu implements RenderableMenu { // Return the prepared instance return $menuInstance; } + } diff --git a/application/city/classes/menu/class_CityLoginAreaMenu.php b/application/city/classes/menu/class_CityLoginAreaMenu.php index 52a5903..f14095e 100644 --- a/application/city/classes/menu/class_CityLoginAreaMenu.php +++ b/application/city/classes/menu/class_CityLoginAreaMenu.php @@ -1,4 +1,11 @@ setConfigEntry('news_reader_class', 'Org\Mxchange\CoreFramework\Reader\New $cfg->setConfigEntry('city_info_db_wrapper_class', 'Org\Mxchange\City\Database\Frontend\Information\CityInformationDatabaseWrapper'); // CFG: REGION-INFO-DB-WRAPPER-CLASS -$cfg->setConfigEntry('region_info_db_wrapper_class', 'RegionInformationDatabaseWrapper'); +$cfg->setConfigEntry('region_info_db_wrapper_class', 'Org\Mxchange\City\Database\Frontend\RegionInformation\RegionInformationDatabaseWrapper'); // CFG: GAME-OPTIONS-DB-WRAPPER-CLASS -$cfg->setConfigEntry('game_options_db_wrapper_class', 'CityGameOptionsDatabaseWrapper'); +$cfg->setConfigEntry('game_options_db_wrapper_class', 'Org\Mxchange\City\Database\Frontend\GameOptions\CityGameOptionsDatabaseWrapper'); // CFG: REGION-MAP-DB-WRAPPER-CLASS -$cfg->setConfigEntry('region_map_db_wrapper_class', 'RegionMapDatabaseWrapper'); +$cfg->setConfigEntry('region_map_db_wrapper_class', 'Org\Mxchange\City\Database\Frontend\Region\RegionMapDatabaseWrapper'); // CFG: CITY-SECTIONS-DB-WRAPPER-CLASS $cfg->setConfigEntry('city_sections_db_wrapper_class', 'Org\Mxchange\City\Database\Frontend\Sections\CitySectionsDatabaseWrapper'); @@ -80,8 +80,8 @@ $cfg->setConfigEntry('city_active_state_class', 'Org\Mxchange\City\State\Active\ // CFG: DEFAULT-HTML-COMMAND $cfg->setConfigEntry('default_html_command', 'home'); -// CFG: DEFAULT-CITY-HTML-COMMAND -$cfg->setConfigEntry('default_city_html_command', 'home'); +// CFG: DEFAULT-CITY-HTTP-COMMAND +$cfg->setConfigEntry('default_city_http_command', 'home'); // CFG: DEFAULT-HTML-CONTROLLER $cfg->setConfigEntry('default_html_controller', 'home'); @@ -90,43 +90,43 @@ $cfg->setConfigEntry('default_html_controller', 'home'); $cfg->setConfigEntry('default_city_html_controller', 'home'); // CFG: CITY-HTML-CMD-HOME-RESOLVER-CLASS -$cfg->setConfigEntry('city_html_cmd_home_resolver_class', 'CityHtmlCommandResolver'); +$cfg->setConfigEntry('city_html_cmd_home_resolver_class', 'Org\Mxchange\City\Resolver\Command\CityHtmlCommandResolver'); // CFG: CITY-HTML-CMD-REGISTER-RESOLVER-CLASS -$cfg->setConfigEntry('city_html_cmd_register_resolver_class', 'CityHtmlCommandResolver'); +$cfg->setConfigEntry('city_html_cmd_register_resolver_class', 'Org\Mxchange\City\Resolver\Command\CityHtmlCommandResolver'); // CFG: CITY-HTML-CMD-LOGIN-RESOLVER-CLASS -$cfg->setConfigEntry('city_html_cmd_login_resolver_class', 'CityHtmlCommandResolver'); +$cfg->setConfigEntry('city_html_cmd_login_resolver_class', 'Org\Mxchange\City\Resolver\Command\CityHtmlCommandResolver'); // CFG: CITY-HTML-CMD-LOGIN-FAILED-RESOLVER-CLASS -$cfg->setConfigEntry('city_html_cmd_login_failed_resolver_class', 'CityHtmlCommandResolver'); +$cfg->setConfigEntry('city_html_cmd_login_failed_resolver_class', 'Org\Mxchange\City\Resolver\Command\CityHtmlCommandResolver'); // CFG: CITY-HTML-CMD-LOGOUT-DONE-RESOLVER-CLASS -$cfg->setConfigEntry('city_html_cmd_logout_done_resolver_class', 'HtmlCommandResolver'); +$cfg->setConfigEntry('city_html_cmd_logout_done_resolver_class', 'Org\Mxchange\City\Resolver\Command\CityHtmlCommandResolver'); // CFG: NEWS-READER-HOME-CLASS -$cfg->setConfigEntry('news_reader_home_class', 'DefaultNewsReader'); +$cfg->setConfigEntry('news_reader_home_class', 'Org\Mxchange\CoreFramework\Reader\News\DefaultNewsReader'); // CFG: NEWS-READER-REGISTER-CLASS -$cfg->setConfigEntry('news_reader_register_class', 'DefaultNewsReader'); +$cfg->setConfigEntry('news_reader_register_class', 'Org\Mxchange\CoreFramework\Reader\News\DefaultNewsReader'); // CFG: NEWS-READER-LOGIN-AREA-CLASS -$cfg->setConfigEntry('news_reader_login_area_class', 'DefaultNewsReader'); +$cfg->setConfigEntry('news_reader_login_area_class', 'Org\Mxchange\CoreFramework\Reader\News\DefaultNewsReader'); // CFG: NEWS-READER-LOGIN-AREA-PROFILE-CLASS -$cfg->setConfigEntry('news_reader_login_area_profile_class', 'DefaultNewsReader'); +$cfg->setConfigEntry('news_reader_login_area_profile_class', 'Org\Mxchange\CoreFramework\Reader\News\DefaultNewsReader'); // CFG: NEWS-READER-LOGIN-AREA-STATUS-PROBLEM-CLASS -$cfg->setConfigEntry('news_reader_login_area_status_problem_class', 'DefaultNewsReader'); +$cfg->setConfigEntry('news_reader_login_area_status_problem_class', 'Org\Mxchange\CoreFramework\Reader\News\DefaultNewsReader'); // CFG: NEWS-READER-LOGIN-AREA-CITY-MAP-CLASS -$cfg->setConfigEntry('news_reader_login_area_city_map_class', 'DefaultNewsReader'); +$cfg->setConfigEntry('news_reader_login_area_city_map_class', 'Org\Mxchange\CoreFramework\Reader\News\DefaultNewsReader'); // CFG: NEWS-READER-LOGIN-AREA-GOVERNMENT-CLASS -$cfg->setConfigEntry('news_reader_login_area_government_class', 'DefaultNewsReader'); +$cfg->setConfigEntry('news_reader_login_area_government_class', 'Org\Mxchange\CoreFramework\Reader\News\DefaultNewsReader'); // CFG: NEWS-READER-LOGIN-AREA-LOGOUT-CLASS -$cfg->setConfigEntry('news_reader_login_area_logout_class', 'DefaultNewsReader'); +$cfg->setConfigEntry('news_reader_login_area_logout_class', 'Org\Mxchange\CoreFramework\Reader\News\DefaultNewsReader'); // CFG: NEWS-HOME-LIMIT $cfg->setConfigEntry('news_home_limit', 10); @@ -138,31 +138,31 @@ $cfg->setConfigEntry('news_register_limit', 5); $cfg->setConfigEntry('news_login_area_limit', 5); // CFG: CITY-HOME-MENU-CLASS -$cfg->setConfigEntry('city_home_menu_class', 'CityHomeMenu'); +$cfg->setConfigEntry('city_home_menu_class', 'Org\Mxchange\City\Menu\General\CityHomeMenu'); // CFG: CITY-REGISTER-MENU-CLASS -$cfg->setConfigEntry('city_register_menu_class', 'CityRegisterMenu'); +$cfg->setConfigEntry('city_register_menu_class', 'Org\Mxchange\City\Menu\Guest\CityRegisterMenu'); // CFG: LOGIN-FAILED-MENU-CLASS -$cfg->setConfigEntry('login_failed_menu_class', 'CityLoginFailedMenu'); +$cfg->setConfigEntry('login_failed_menu_class', 'Org\Mxchange\City\Menu\Guest\CityLoginFailedMenu'); // CFG: STATUS-MENU-CLASS -$cfg->setConfigEntry('status_menu_class', 'CityStatusMenu'); +$cfg->setConfigEntry('status_menu_class', 'Org\Mxchange\City\Menu\General\CityStatusMenu'); // CFG: LOGIN-MENU-CLASS -$cfg->setConfigEntry('login_menu_class', 'CityLoginMenu'); +$cfg->setConfigEntry('login_menu_class', 'Org\Mxchange\City\Menu\Login\CityLoginMenu'); // CFG: LOGOUT-MENU-CLASS -$cfg->setConfigEntry('logout_menu_class', 'CityLogoutMenu'); +$cfg->setConfigEntry('logout_menu_class', 'Org\Mxchange\City\Menu\Login\CityLogoutMenu'); // CFG: REGISTER-MENU-CLASS -$cfg->setConfigEntry('register_menu_class', 'CityRegisterMenu'); +$cfg->setConfigEntry('register_menu_class', 'Org\Mxchange\City\Menu\Guest\CityRegisterMenu'); // CFG: CONFIRM-MENU-CLASS -$cfg->setConfigEntry('confirm_menu_class', 'CityConfirmMenu'); +$cfg->setConfigEntry('confirm_menu_class', 'Org\Mxchange\City\Menu\Guest\CityConfirmMenu'); // CFG: LOGIN-AREA-MENU-CLASS -$cfg->setConfigEntry('login_area_menu_class', 'CityLoginAreaMenu'); +$cfg->setConfigEntry('login_area_menu_class', 'Org\Mxchange\City\Menu\Login\CityLoginAreaMenu'); // CFG: GOVERNMENT-FAILED-AREA-MENU-CLASS $cfg->setConfigEntry('government_failed_area_menu_class', 'CityGovernmentFailedAreaMenu'); @@ -321,19 +321,19 @@ $cfg->setConfigEntry('city_name_verifier_filter', 'CityNameVerifierFilter'); $cfg->setConfigEntry('user_status_filter', 'UserStatusVerifierFilter'); // CFG: CITY-HTML-CMD-DO-FORM-RESOLVER-CLASS -$cfg->setConfigEntry('city_html_cmd_do_form_resolver_class', 'CityHtmlCommandResolver'); +$cfg->setConfigEntry('city_html_cmd_do_form_resolver_class', 'Org\Mxchange\City\Resolver\Command\CityHtmlCommandResolver'); // CFG: CITY-HTML-CMD-LOGIN-AREA-RESOLVER-CLASS -$cfg->setConfigEntry('city_html_cmd_login_area_resolver_class', 'CityHtmlCommandResolver'); +$cfg->setConfigEntry('city_html_cmd_login_area_resolver_class', 'Org\Mxchange\City\Resolver\Command\CityHtmlCommandResolver'); // CFG: CITY-HTML-CMD-CONFIRM-RESOLVER-CLASS -$cfg->setConfigEntry('city_html_cmd_confirm_resolver_class', 'CityHtmlCommandResolver'); +$cfg->setConfigEntry('city_html_cmd_confirm_resolver_class', 'Org\Mxchange\City\Resolver\Command\CityHtmlCommandResolver'); // CFG: CITY-HTML-CMD-PROBLEM-RESOLVER-CLASS -$cfg->setConfigEntry('city_html_cmd_problem_resolver_class', 'CityHtmlCommandResolver'); +$cfg->setConfigEntry('city_html_cmd_problem_resolver_class', 'Org\Mxchange\City\Resolver\Command\CityHtmlCommandResolver'); // CFG: CITY-HTML-CMD-LOGOUT-RESOLVER-CLASS -$cfg->setConfigEntry('city_html_cmd_logout_resolver_class', 'CityHtmlCommandResolver'); +$cfg->setConfigEntry('city_html_cmd_logout_resolver_class', 'Org\Mxchange\City\Resolver\Command\CityHtmlCommandResolver'); // CFG: EMAIL-CHANGE-ALLOWED $cfg->setConfigEntry('email_change_allowed', 'Y'); diff --git a/core b/core index 5135152..2f930fd 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 5135152658d9678af5871e0cd9ad86c259ad1e5c +Subproject commit 2f930fd62f97e06a6b90afb971cce6343522f9b9 -- 2.39.5