From aa417114c57727c4803c1ba3db8d6a067fb57756 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sat, 18 Feb 2023 05:10:31 +0100 Subject: [PATCH] Continued: - removed old " // END - " - updated copyright year to 2023 - updated 'core' framework --- application/city/class_ApplicationHelper.php | 4 +- application/city/classes/actions/class_ | 2 +- .../classes/actions/class_BaseCityAction.php | 2 +- .../city/class_HtmlCityLoginCityMapAction.php | 2 +- .../class_HtmlCityLoginGovernmentAction.php | 2 +- .../html/class_HtmlCityLoginLogoutAction.php | 2 +- .../html/class_HtmlCityLoginProfileAction.php | 2 +- ...class_HtmlCityLoginStatusProblemAction.php | 2 +- .../html/class_HtmlCityLoginWelcomeAction.php | 2 +- application/city/classes/city_daemon/class_ | 2 +- .../city_daemon/class_BaseCityDaemon.php | 6 +- .../class_SimulationDefaultCityDaemon.php | 2 +- application/city/classes/class_ | 2 +- application/city/classes/class_Base | 2 +- .../city/classes/class_BaseCitySystem.php | 2 +- .../class_CityConsoleDaemonCommand.php | 4 +- .../class_CityHtmlCityGuestLoginCommand.php | 2 +- .../html/class_CityHtmlCityMapCommand.php | 2 +- .../class_CityHtmlCityRegisterCommand.php | 2 +- .../class_CityHtmlCityUserLoginCommand.php | 2 +- .../html/class_CityHtmlConfirmCommand.php | 2 +- .../html/class_CityHtmlDoFormCommand.php | 2 +- .../html/class_CityHtmlHomeCommand.php | 6 +- .../html/class_CityHtmlLoginAreaCommand.php | 6 +- .../html/class_CityHtmlLoginCommand.php | 2 +- .../html/class_CityHtmlLoginFailedCommand.php | 2 +- .../html/class_CityHtmlLogoutCommand.php | 2 +- .../html/class_CityHtmlLogoutDoneCommand.php | 2 +- .../html/class_CityHtmlRegisterCommand.php | 2 +- .../html/class_CityHtmlResendLinkCommand.php | 2 +- ...class_CityConsoleDefaultNewsController.php | 6 +- .../html/class_CityHtmlConfirmController.php | 2 +- .../class_CityHtmlDefaultNewsController.php | 6 +- .../html/class_CityHtmlLoginController.php | 6 +- .../class_CityHtmlLoginFailedController.php | 6 +- .../html/class_CityHtmlLogoutController.php | 6 +- .../class_CityHtmlLogoutDoneController.php | 6 +- .../html/class_CityHtmlRegisterController.php | 6 +- .../form/class_CityHtmlDoFormController.php | 8 +-- .../class_CityHtmlLoginAreaController.php | 6 +- .../class_CityInformationDatabaseFrontend.php | 6 +- .../class_CityDistrictsDatabaseFrontend.php | 2 +- .../lots/class_CityLotsDatabaseFrontend.php | 2 +- .../class_CitySectionsDatabaseFrontend.php | 59 ++++++++++++------- .../class_CityGameOptionsDatabaseFrontend.php | 2 +- ...class_RegionInformationDatabaseWrapper.php | 2 +- .../class_RegionMapDatabaseFrontend.php | 2 +- .../city_daemon/class_CityDaemonFactory.php | 2 +- .../manager/class_ManagerFactory.php | 2 +- .../states/city/class_CityStateFactory.php | 2 +- ...aemonBootstrapExtraBootstrappingFilter.php | 2 +- .../bootstrap/class_CityDaemonBootstrap | 2 +- ...ss_CityDaemonBootstrapInitDaemonFilter.php | 2 +- .../filter/city_daemon/class_CityDaemon | 2 +- .../class_CityDaemonInitializationFilter.php | 2 +- .../class_CityDaemonPhpRequirementsFilter.php | 4 +- .../class_CityDaemonWelcomeTeaserFilter.php | 2 +- application/city/classes/filter/class_ | 2 +- .../classes/filter/class_BaseCityFilter.php | 8 +-- .../shutdown/city/class_CityDaemonShutdown | 2 +- .../class_CityDaemonShutdownCityFilter.php | 2 +- ...ss_CityDaemonShutdownTaskHandlerFilter.php | 2 +- ...CityDaemonTaskHandlerInitializerFilter.php | 2 +- .../verifier/class_CityNameVerifierFilter.php | 2 +- .../classes/login/class_CityGuestLogin.php | 6 +- .../classes/login/class_CityUserLogin.php | 6 +- .../login/helper/class_CityLoginHelper.php | 4 +- .../manager/city/class_CityManager.php | 2 +- .../districts/class_CityDistrictsManager.php | 2 +- .../lots/class_CityLotsManager.php | 2 +- .../sections/class_CitySectionsManager.php | 6 +- application/city/classes/manager/class_ | 2 +- .../classes/manager/class_BaseManager.php | 2 +- .../manager/game/class_GameOptionsManager.php | 2 +- .../manager/region/class_RegionManager.php | 2 +- .../manager/region/class_RegionMapManager.php | 2 +- application/city/classes/menu/class_City | 2 +- .../classes/menu/class_CityConfirmMenu.php | 2 +- .../city/classes/menu/class_CityHomeMenu.php | 2 +- .../classes/menu/class_CityLoginAreaMenu.php | 2 +- .../menu/class_CityLoginFailedMenu.php | 2 +- .../city/classes/menu/class_CityLoginMenu.php | 2 +- .../classes/menu/class_CityLogoutMenu.php | 2 +- .../classes/menu/class_CityRegisterMenu.php | 2 +- .../classes/menu/class_CityStatusMenu.php | 2 +- .../class_CityGovernmentFailedAreaMenu.php | 2 +- .../registration/class_CityRegistration.php | 8 +-- .../class_CityConsoleCommandResolver.php | 2 +- .../html/class_CityHtmlCommandResolver.php | 2 +- .../class_CityConsoleControllerResolver.php | 2 +- .../html/class_CityHtmlControllerResolver.php | 2 +- .../class_CityImageControllerResolver.php | 2 +- .../city/active/class_CityActiveState.php | 2 +- application/city/classes/states/city/class_ | 2 +- .../states/city/class_BaseCityState.php | 6 +- .../states/city/init/class_CityInitState.php | 2 +- .../city/classes/tasks/class_BaseCityTask.php | 2 +- .../class_CityDaemonBuildingGrowthTask.php | 4 +- .../classes/tasks/daemon/class_CityDaemon | 2 +- .../class_CityDaemonHouseholdGrowthTask.php | 4 +- .../class_CityDaemonMapExpanderTask.php | 4 +- application/city/config-local.php-dist | 2 +- application/city/config.php | 2 +- application/city/debug.php | 2 +- application/city/exceptions.php | 12 ++-- .../city/class_CityInformationFrontend.php | 2 +- .../districts/class_CityDistrictsFrontend.php | 2 +- .../lots/class_CityLotsFrontend.php | 2 +- .../sections/class_CitySectionsFrontend.php | 2 +- .../class_CityGameOptionsFrontend.php | 2 +- .../class_RegionInformationFrontend.php | 2 +- .../region/class_RegionMapFrontend.php | 2 +- .../helper/city/class_CityHelper.php | 2 +- .../manager/city/class_ManageableCity.php | 2 +- .../class_ManageableCityEntities.php | 2 +- .../class_ManageableCityDistricts.php | 2 +- .../lots/class_ManageableCityLots.php | 2 +- .../sections/class_ManageableCitySections.php | 2 +- .../interfaces/manager/class_Manageable.php | 2 +- .../manager/region/class_ManageableRegion.php | 2 +- .../region/class_ManageableRegionMap.php | 2 +- application/city/templates/menu/base_menu.xml | 2 +- .../templates/menu/generic_menu_entries.xml | 2 +- .../menu/login_area_menu_entries.xml | 2 +- contrib/update_year.sh | 4 ++ core | 2 +- 126 files changed, 219 insertions(+), 198 deletions(-) create mode 100755 contrib/update_year.sh diff --git a/application/city/class_ApplicationHelper.php b/application/city/class_ApplicationHelper.php index 4ccd98d..3d9c194 100644 --- a/application/city/class_ApplicationHelper.php +++ b/application/city/class_ApplicationHelper.php @@ -126,7 +126,7 @@ class ApplicationHelper extends BaseApplication implements ManageableApplication // Set it in request $requestInstance->setRequestElement('command', $commandName); - } // END - if + } // Get a controller resolver $resolverClass = sprintf( @@ -177,7 +177,7 @@ class ApplicationHelper extends BaseApplication implements ManageableApplication // Walk through all messages foreach ($messageList as $message) { exit(__METHOD__ . ':MSG:' . $message); - } // END - foreach + } } /** diff --git a/application/city/classes/actions/class_ b/application/city/classes/actions/class_ index f1ebf1a..aaa7d34 100644 --- a/application/city/classes/actions/class_ +++ b/application/city/classes/actions/class_ @@ -13,7 +13,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable; * * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2015, 2016 City Developer Team + * @copyright Copyright (c) 2015 - 2023 City Developer Team * @license GNU GPL 3.0 or any newer version * @link http://www.ship-simu.org * diff --git a/application/city/classes/actions/class_BaseCityAction.php b/application/city/classes/actions/class_BaseCityAction.php index ee069c8..bac7b84 100644 --- a/application/city/classes/actions/class_BaseCityAction.php +++ b/application/city/classes/actions/class_BaseCityAction.php @@ -12,7 +12,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable; * * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2015, 2016 City Developer Team + * @copyright Copyright (c) 2015 - 2023 City Developer Team * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/application/city/classes/actions/html/city/class_HtmlCityLoginCityMapAction.php b/application/city/classes/actions/html/city/class_HtmlCityLoginCityMapAction.php index 29f89cb..18ba3f7 100644 --- a/application/city/classes/actions/html/city/class_HtmlCityLoginCityMapAction.php +++ b/application/city/classes/actions/html/city/class_HtmlCityLoginCityMapAction.php @@ -13,7 +13,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable; * * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2015, 2016 City Developer Team + * @copyright Copyright (c) 2015 - 2023 City Developer Team * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/application/city/classes/actions/html/class_HtmlCityLoginGovernmentAction.php b/application/city/classes/actions/html/class_HtmlCityLoginGovernmentAction.php index 82ea314..38b4e48 100644 --- a/application/city/classes/actions/html/class_HtmlCityLoginGovernmentAction.php +++ b/application/city/classes/actions/html/class_HtmlCityLoginGovernmentAction.php @@ -13,7 +13,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable; * * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2015, 2016 City Developer Team + * @copyright Copyright (c) 2015 - 2023 City Developer Team * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/application/city/classes/actions/html/class_HtmlCityLoginLogoutAction.php b/application/city/classes/actions/html/class_HtmlCityLoginLogoutAction.php index e686d1b..4640291 100644 --- a/application/city/classes/actions/html/class_HtmlCityLoginLogoutAction.php +++ b/application/city/classes/actions/html/class_HtmlCityLoginLogoutAction.php @@ -14,7 +14,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable; * * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2015, 2016 City Developer Team + * @copyright Copyright (c) 2015 - 2023 City Developer Team * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/application/city/classes/actions/html/class_HtmlCityLoginProfileAction.php b/application/city/classes/actions/html/class_HtmlCityLoginProfileAction.php index e16f88e..0dbd50c 100644 --- a/application/city/classes/actions/html/class_HtmlCityLoginProfileAction.php +++ b/application/city/classes/actions/html/class_HtmlCityLoginProfileAction.php @@ -13,7 +13,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable; * * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2015, 2016 City Developer Team + * @copyright Copyright (c) 2015 - 2023 City Developer Team * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/application/city/classes/actions/html/class_HtmlCityLoginStatusProblemAction.php b/application/city/classes/actions/html/class_HtmlCityLoginStatusProblemAction.php index 968e45e..4803f4e 100644 --- a/application/city/classes/actions/html/class_HtmlCityLoginStatusProblemAction.php +++ b/application/city/classes/actions/html/class_HtmlCityLoginStatusProblemAction.php @@ -14,7 +14,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable; * * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2015, 2016 City Developer Team + * @copyright Copyright (c) 2015 - 2023 City Developer Team * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/application/city/classes/actions/html/class_HtmlCityLoginWelcomeAction.php b/application/city/classes/actions/html/class_HtmlCityLoginWelcomeAction.php index 10dee40..35680d5 100644 --- a/application/city/classes/actions/html/class_HtmlCityLoginWelcomeAction.php +++ b/application/city/classes/actions/html/class_HtmlCityLoginWelcomeAction.php @@ -13,7 +13,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable; * * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2015, 2016 City Developer Team + * @copyright Copyright (c) 2015 - 2023 City Developer Team * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/application/city/classes/city_daemon/class_ b/application/city/classes/city_daemon/class_ index c9184eb..bf92a57 100644 --- a/application/city/classes/city_daemon/class_ +++ b/application/city/classes/city_daemon/class_ @@ -15,7 +15,7 @@ use Org\Mxchange\CoreFramework\Request\Requestable; * * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2015, 2016 City Developer Team + * @copyright Copyright (c) 2015 - 2023 City Developer Team * @license GNU GPL 3.0 or any newer version * @link http://www.ship-simu.org * diff --git a/application/city/classes/city_daemon/class_BaseCityDaemon.php b/application/city/classes/city_daemon/class_BaseCityDaemon.php index b4e3b1c..4fc9391 100644 --- a/application/city/classes/city_daemon/class_BaseCityDaemon.php +++ b/application/city/classes/city_daemon/class_BaseCityDaemon.php @@ -29,7 +29,7 @@ use Org\Mxchange\CoreFramework\Traits\State\StateableTrait; * * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2015, 2016 City Developer Team + * @copyright Copyright (c) 2015 - 2023 City Developer Team * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * @@ -115,7 +115,7 @@ abstract class BaseCityDaemon extends BaseCitySystem implements Updateable, Adda // Output all lines self::createDebugInstance(__CLASS__)->debugOutput(' '); self::createDebugInstance(__CLASS__)->debugOutput($applicationInstance->getAppName() . ' v' . $applicationInstance->getAppVersion() . ' - ' . FrameworkBootstrap::getRequestInstance()->getRequestElement('mode') . ' daemon starting'); - self::createDebugInstance(__CLASS__)->debugOutput('Copyright (c) 2015, 2016 City Developer Team'); + self::createDebugInstance(__CLASS__)->debugOutput('Copyright (c) 2015 - 2023 City Developer Team'); self::createDebugInstance(__CLASS__)->debugOutput(' '); self::createDebugInstance(__CLASS__)->debugOutput('This program comes with ABSOLUTELY NO WARRANTY; for details see docs/COPYING.'); self::createDebugInstance(__CLASS__)->debugOutput('This is free software, and you are welcome to redistribute it under certain'); @@ -252,7 +252,7 @@ abstract class BaseCityDaemon extends BaseCitySystem implements Updateable, Adda // Output warning message /* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('CITY[' . __METHOD__ . ':' . __LINE__ . ']: addArrayToDataSet(): Element ' . $element . ' not found in CityData array.'); } - } // END - foreac + } } /** diff --git a/application/city/classes/city_daemon/default/class_SimulationDefaultCityDaemon.php b/application/city/classes/city_daemon/default/class_SimulationDefaultCityDaemon.php index 167ac8f..a2c693a 100644 --- a/application/city/classes/city_daemon/default/class_SimulationDefaultCityDaemon.php +++ b/application/city/classes/city_daemon/default/class_SimulationDefaultCityDaemon.php @@ -19,7 +19,7 @@ use Org\Mxchange\CoreFramework\Request\Requestable; * * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2015, 2016 City Developer Team + * @copyright Copyright (c) 2015 - 2023 City Developer Team * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/application/city/classes/class_ b/application/city/classes/class_ index 69af380..4a9e195 100644 --- a/application/city/classes/class_ +++ b/application/city/classes/class_ @@ -10,7 +10,7 @@ use Org\Mxchange\City\Generic\BaseCitySystem; * * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2015, 2016 City Developer Team + * @copyright Copyright (c) 2015 - 2023 City Developer Team * @license GNU GPL 3.0 or any newer version * @link http://www.ship-simu.org * diff --git a/application/city/classes/class_Base b/application/city/classes/class_Base index a3c6bd4..14d4d54 100644 --- a/application/city/classes/class_Base +++ b/application/city/classes/class_Base @@ -10,7 +10,7 @@ use Org\Mxchange\City\Generic\BaseCitySystem; * * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2015, 2016 City Developer Team + * @copyright Copyright (c) 2015 - 2023 City Developer Team * @license GNU GPL 3.0 or any newer version * @link http://www.ship-simu.org * diff --git a/application/city/classes/class_BaseCitySystem.php b/application/city/classes/class_BaseCitySystem.php index 13d1a29..16c92fb 100644 --- a/application/city/classes/class_BaseCitySystem.php +++ b/application/city/classes/class_BaseCitySystem.php @@ -13,7 +13,7 @@ use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem; * * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2015, 2016 City Developer Team + * @copyright Copyright (c) 2015 - 2023 City Developer Team * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/application/city/classes/commands/console/class_CityConsoleDaemonCommand.php b/application/city/classes/commands/console/class_CityConsoleDaemonCommand.php index df6f1e3..546bb29 100644 --- a/application/city/classes/commands/console/class_CityConsoleDaemonCommand.php +++ b/application/city/classes/commands/console/class_CityConsoleDaemonCommand.php @@ -21,7 +21,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable; * * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2015, 2016 City Developer Team + * @copyright Copyright (c) 2015 - 2023 City Developer Team * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * @@ -116,7 +116,7 @@ class CityConsoleDaemonCommand extends BaseCommand implements Commandable { while (($cityInstance->isCityActive()) && ($handlerInstance->hasTasksLeft())) { // Handle all tasks here $handlerInstance->handleTasks(); - } // END - while + } // Debug message self::createDebugInstance(__CLASS__)->debugOutput('MAIN: --- Leaving main loop. ---'); diff --git a/application/city/classes/commands/html/class_CityHtmlCityGuestLoginCommand.php b/application/city/classes/commands/html/class_CityHtmlCityGuestLoginCommand.php index e95e23d..96d65a8 100644 --- a/application/city/classes/commands/html/class_CityHtmlCityGuestLoginCommand.php +++ b/application/city/classes/commands/html/class_CityHtmlCityGuestLoginCommand.php @@ -16,7 +16,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable; * * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2015, 2016 City Developer Team + * @copyright Copyright (c) 2015 - 2023 City Developer Team * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/application/city/classes/commands/html/class_CityHtmlCityMapCommand.php b/application/city/classes/commands/html/class_CityHtmlCityMapCommand.php index b265c0f..841d916 100644 --- a/application/city/classes/commands/html/class_CityHtmlCityMapCommand.php +++ b/application/city/classes/commands/html/class_CityHtmlCityMapCommand.php @@ -20,7 +20,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable; * * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2015, 2016 City Developer Team + * @copyright Copyright (c) 2015 - 2023 City Developer Team * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/application/city/classes/commands/html/class_CityHtmlCityRegisterCommand.php b/application/city/classes/commands/html/class_CityHtmlCityRegisterCommand.php index 99c6b2f..a809f2c 100644 --- a/application/city/classes/commands/html/class_CityHtmlCityRegisterCommand.php +++ b/application/city/classes/commands/html/class_CityHtmlCityRegisterCommand.php @@ -16,7 +16,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable; * * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2015, 2016 City Developer Team + * @copyright Copyright (c) 2015 - 2023 City Developer Team * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/application/city/classes/commands/html/class_CityHtmlCityUserLoginCommand.php b/application/city/classes/commands/html/class_CityHtmlCityUserLoginCommand.php index 45341d4..fb64687 100644 --- a/application/city/classes/commands/html/class_CityHtmlCityUserLoginCommand.php +++ b/application/city/classes/commands/html/class_CityHtmlCityUserLoginCommand.php @@ -16,7 +16,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable; * * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2015, 2016 City Developer Team + * @copyright Copyright (c) 2015 - 2023 City Developer Team * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/application/city/classes/commands/html/class_CityHtmlConfirmCommand.php b/application/city/classes/commands/html/class_CityHtmlConfirmCommand.php index f8a5a85..77b3d41 100644 --- a/application/city/classes/commands/html/class_CityHtmlConfirmCommand.php +++ b/application/city/classes/commands/html/class_CityHtmlConfirmCommand.php @@ -21,7 +21,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable; * * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2015, 2016 City Developer Team + * @copyright Copyright (c) 2015 - 2023 City Developer Team * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/application/city/classes/commands/html/class_CityHtmlDoFormCommand.php b/application/city/classes/commands/html/class_CityHtmlDoFormCommand.php index 841a995..3f7c16c 100644 --- a/application/city/classes/commands/html/class_CityHtmlDoFormCommand.php +++ b/application/city/classes/commands/html/class_CityHtmlDoFormCommand.php @@ -15,7 +15,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable; * * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2015, 2016 City Developer Team + * @copyright Copyright (c) 2015 - 2023 City Developer Team * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/application/city/classes/commands/html/class_CityHtmlHomeCommand.php b/application/city/classes/commands/html/class_CityHtmlHomeCommand.php index 9c9b72c..552fb8b 100644 --- a/application/city/classes/commands/html/class_CityHtmlHomeCommand.php +++ b/application/city/classes/commands/html/class_CityHtmlHomeCommand.php @@ -16,7 +16,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable; * * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2015, 2016 City Developer Team + * @copyright Copyright (c) 2015 - 2023 City Developer Team * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * @@ -75,8 +75,8 @@ class CityHtmlHomeCommand extends BaseCommand implements Commandable { $response->sendRequestMethodNotAllowed(); // Bail out - exit(); - } // END - if + exit; + } /* * This is a generic HTML request, this means that a regular page with diff --git a/application/city/classes/commands/html/class_CityHtmlLoginAreaCommand.php b/application/city/classes/commands/html/class_CityHtmlLoginAreaCommand.php index d4f5a9f..d48e4af 100644 --- a/application/city/classes/commands/html/class_CityHtmlLoginAreaCommand.php +++ b/application/city/classes/commands/html/class_CityHtmlLoginAreaCommand.php @@ -17,7 +17,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable; * * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2015, 2016 City Developer Team + * @copyright Copyright (c) 2015 - 2023 City Developer Team * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * @@ -94,7 +94,7 @@ class CityHtmlLoginAreaCommand extends BaseCommand implements Commandable { if ($actionInstance instanceof PerformableAction) { // Execute the action (shall not output anything, see below why) $actionInstance->execute($requestInstance, $responseInstance); - } // END - if + } // Get the application instance $applicationInstance = ApplicationHelper::getSelfInstance(); @@ -193,7 +193,7 @@ class CityHtmlLoginAreaCommand extends BaseCommand implements Commandable { if ((is_string($actReq)) && (!empty($actReq))) { // Then use it with prefix $this->actionName = $this->convertDashesToUnderscores($applicationInstance->getAppShortName()) . '_login_' . $actReq; - } // END - if + } // Get a resolver $actionResolver = HtmlActionResolver::createHtmlActionResolver($this->actionName); diff --git a/application/city/classes/commands/html/class_CityHtmlLoginCommand.php b/application/city/classes/commands/html/class_CityHtmlLoginCommand.php index e6852fe..42e1206 100644 --- a/application/city/classes/commands/html/class_CityHtmlLoginCommand.php +++ b/application/city/classes/commands/html/class_CityHtmlLoginCommand.php @@ -20,7 +20,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable; * * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2015, 2016 City Developer Team + * @copyright Copyright (c) 2015 - 2023 City Developer Team * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/application/city/classes/commands/html/class_CityHtmlLoginFailedCommand.php b/application/city/classes/commands/html/class_CityHtmlLoginFailedCommand.php index 4ef43fa..5076e67 100644 --- a/application/city/classes/commands/html/class_CityHtmlLoginFailedCommand.php +++ b/application/city/classes/commands/html/class_CityHtmlLoginFailedCommand.php @@ -19,7 +19,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable; * * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2015, 2016 City Developer Team + * @copyright Copyright (c) 2015 - 2023 City Developer Team * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/application/city/classes/commands/html/class_CityHtmlLogoutCommand.php b/application/city/classes/commands/html/class_CityHtmlLogoutCommand.php index 5164679..4ae6237 100644 --- a/application/city/classes/commands/html/class_CityHtmlLogoutCommand.php +++ b/application/city/classes/commands/html/class_CityHtmlLogoutCommand.php @@ -16,7 +16,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable; * * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2015, 2016 City Developer Team + * @copyright Copyright (c) 2015 - 2023 City Developer Team * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/application/city/classes/commands/html/class_CityHtmlLogoutDoneCommand.php b/application/city/classes/commands/html/class_CityHtmlLogoutDoneCommand.php index 1b366fb..32afece 100644 --- a/application/city/classes/commands/html/class_CityHtmlLogoutDoneCommand.php +++ b/application/city/classes/commands/html/class_CityHtmlLogoutDoneCommand.php @@ -19,7 +19,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable; * * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2015, 2016 City Developer Team + * @copyright Copyright (c) 2015 - 2023 City Developer Team * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/application/city/classes/commands/html/class_CityHtmlRegisterCommand.php b/application/city/classes/commands/html/class_CityHtmlRegisterCommand.php index 13ddeb9..160e9b3 100644 --- a/application/city/classes/commands/html/class_CityHtmlRegisterCommand.php +++ b/application/city/classes/commands/html/class_CityHtmlRegisterCommand.php @@ -15,7 +15,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable; * * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2015, 2016 City Developer Team + * @copyright Copyright (c) 2015 - 2023 City Developer Team * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/application/city/classes/commands/html/class_CityHtmlResendLinkCommand.php b/application/city/classes/commands/html/class_CityHtmlResendLinkCommand.php index 972b8ab..3893083 100644 --- a/application/city/classes/commands/html/class_CityHtmlResendLinkCommand.php +++ b/application/city/classes/commands/html/class_CityHtmlResendLinkCommand.php @@ -20,7 +20,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable; * * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2015, 2016 City Developer Team + * @copyright Copyright (c) 2015 - 2023 City Developer Team * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/application/city/classes/controller/console/class_CityConsoleDefaultNewsController.php b/application/city/classes/controller/console/class_CityConsoleDefaultNewsController.php index ab46954..25b9c11 100644 --- a/application/city/classes/controller/console/class_CityConsoleDefaultNewsController.php +++ b/application/city/classes/controller/console/class_CityConsoleDefaultNewsController.php @@ -16,7 +16,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable; * * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2015, 2016 City Developer Team + * @copyright Copyright (c) 2015 - 2023 City Developer Team * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * @@ -44,9 +44,9 @@ class CityConsoleDefaultNewsController extends BaseController implements Control parent::__construct(__CLASS__); // Init additional filter chains - foreach (array('bootstrap', 'activation','shutdown') as $filterChain) { + foreach (['bootstrap', 'activation', 'shutdown'] as $filterChain) { $this->initFilterChain($filterChain); - } // END - foreach + } } /** diff --git a/application/city/classes/controller/html/class_CityHtmlConfirmController.php b/application/city/classes/controller/html/class_CityHtmlConfirmController.php index 9f87eb7..7f30f82 100644 --- a/application/city/classes/controller/html/class_CityHtmlConfirmController.php +++ b/application/city/classes/controller/html/class_CityHtmlConfirmController.php @@ -15,7 +15,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable; * * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2015, 2016 City Developer Team + * @copyright Copyright (c) 2015 - 2023 City Developer Team * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/application/city/classes/controller/html/class_CityHtmlDefaultNewsController.php b/application/city/classes/controller/html/class_CityHtmlDefaultNewsController.php index 4379326..8bc8900 100644 --- a/application/city/classes/controller/html/class_CityHtmlDefaultNewsController.php +++ b/application/city/classes/controller/html/class_CityHtmlDefaultNewsController.php @@ -15,7 +15,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable; * * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2015, 2016 City Developer Team + * @copyright Copyright (c) 2015 - 2023 City Developer Team * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * @@ -43,9 +43,9 @@ class CityHtmlDefaultNewsController extends BaseController implements Controller parent::__construct(__CLASS__); // Init additional filter chains - foreach (array('shutdown') as $filterChain) { + foreach (['shutdown'] as $filterChain) { $this->initFilterChain($filterChain); - } // END - foreach + } } /** diff --git a/application/city/classes/controller/html/class_CityHtmlLoginController.php b/application/city/classes/controller/html/class_CityHtmlLoginController.php index af17033..1f23d2b 100644 --- a/application/city/classes/controller/html/class_CityHtmlLoginController.php +++ b/application/city/classes/controller/html/class_CityHtmlLoginController.php @@ -15,7 +15,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable; * * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2015, 2016 City Developer Team + * @copyright Copyright (c) 2015 - 2023 City Developer Team * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * @@ -43,9 +43,9 @@ class CityHtmlLoginController extends BaseController implements Controller { parent::__construct(__CLASS__); // Init additional filter chains - foreach (array('shutdown') as $filterChain) { + foreach (['shutdown'] as $filterChain) { $this->initFilterChain($filterChain); - } // END - foreach + } } /** diff --git a/application/city/classes/controller/html/class_CityHtmlLoginFailedController.php b/application/city/classes/controller/html/class_CityHtmlLoginFailedController.php index 5881633..f9fe14c 100644 --- a/application/city/classes/controller/html/class_CityHtmlLoginFailedController.php +++ b/application/city/classes/controller/html/class_CityHtmlLoginFailedController.php @@ -14,7 +14,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable; * * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2015, 2016 City Developer Team + * @copyright Copyright (c) 2015 - 2023 City Developer Team * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * @@ -42,9 +42,9 @@ class CityHtmlLoginFailedController extends BaseController implements Controller parent::__construct(__CLASS__); // Init additional filter chains - foreach (array('shutdown') as $filterChain) { + foreach (['shutdown'] as $filterChain) { $this->initFilterChain($filterChain); - } // END - foreach + } } /** diff --git a/application/city/classes/controller/html/class_CityHtmlLogoutController.php b/application/city/classes/controller/html/class_CityHtmlLogoutController.php index a09ac8a..be68d86 100644 --- a/application/city/classes/controller/html/class_CityHtmlLogoutController.php +++ b/application/city/classes/controller/html/class_CityHtmlLogoutController.php @@ -14,7 +14,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable; * * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2015, 2016 City Developer Team + * @copyright Copyright (c) 2015 - 2023 City Developer Team * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * @todo This controller shall still provide some headlines for sidebars @@ -43,9 +43,9 @@ class CityHtmlLogoutController extends BaseController implements Controller { parent::__construct(__CLASS__); // Init additional filter chains - foreach (array('shutdown') as $filterChain) { + foreach (['shutdown'] as $filterChain) { $this->initFilterChain($filterChain); - } // END - foreach + } } /** diff --git a/application/city/classes/controller/html/class_CityHtmlLogoutDoneController.php b/application/city/classes/controller/html/class_CityHtmlLogoutDoneController.php index b98695e..585ca6e 100644 --- a/application/city/classes/controller/html/class_CityHtmlLogoutDoneController.php +++ b/application/city/classes/controller/html/class_CityHtmlLogoutDoneController.php @@ -14,7 +14,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable; * * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2015, 2016 City Developer Team + * @copyright Copyright (c) 2015 - 2023 City Developer Team * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * @@ -42,9 +42,9 @@ class CityHtmlLogoutDoneController extends BaseController implements Controller parent::__construct(__CLASS__); // Init additional filter chains - foreach (array('shutdown') as $filterChain) { + foreach (['shutdown'] as $filterChain) { $this->initFilterChain($filterChain); - } // END - foreach + } } /** diff --git a/application/city/classes/controller/html/class_CityHtmlRegisterController.php b/application/city/classes/controller/html/class_CityHtmlRegisterController.php index fe6b17b..86fb90a 100644 --- a/application/city/classes/controller/html/class_CityHtmlRegisterController.php +++ b/application/city/classes/controller/html/class_CityHtmlRegisterController.php @@ -14,7 +14,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable; * * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2015, 2016 City Developer Team + * @copyright Copyright (c) 2015 - 2023 City Developer Team * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * @@ -42,9 +42,9 @@ class CityHtmlRegisterController extends BaseController implements Controller { parent::__construct(__CLASS__); // Init additional filter chains - foreach (array('shutdown') as $filterChain) { + foreach (['shutdown'] as $filterChain) { $this->initFilterChain($filterChain); - } // END - foreach + } } /** diff --git a/application/city/classes/controller/html/form/class_CityHtmlDoFormController.php b/application/city/classes/controller/html/form/class_CityHtmlDoFormController.php index 5213548..3bc9d0a 100644 --- a/application/city/classes/controller/html/form/class_CityHtmlDoFormController.php +++ b/application/city/classes/controller/html/form/class_CityHtmlDoFormController.php @@ -14,7 +14,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable; * * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2015, 2016 City Developer Team + * @copyright Copyright (c) 2015 - 2023 City Developer Team * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * @@ -42,9 +42,9 @@ class CityHtmlDoFormController extends BaseController implements Controller { parent::__construct(__CLASS__); // Init additional filter chains - foreach (array('shutdown') as $filterChain) { + foreach (['shutdown'] as $filterChain) { $this->initFilterChain($filterChain); - } // END - foreach + } } /** @@ -106,7 +106,7 @@ class CityHtmlDoFormController extends BaseController implements Controller { // Execute *very* generic ppost filters $this->executePostFilters($requestInstance, $responseInstance); - } // END - if + } // Flush the buffer out $responseInstance->flushBuffer(); diff --git a/application/city/classes/controller/html/login/class_CityHtmlLoginAreaController.php b/application/city/classes/controller/html/login/class_CityHtmlLoginAreaController.php index 87acb0e..eab2712 100644 --- a/application/city/classes/controller/html/login/class_CityHtmlLoginAreaController.php +++ b/application/city/classes/controller/html/login/class_CityHtmlLoginAreaController.php @@ -15,7 +15,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable; * * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2015, 2016 City Developer Team + * @copyright Copyright (c) 2015 - 2023 City Developer Team * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * @@ -43,9 +43,9 @@ class CityHtmlLoginAreaController extends BaseController implements Controller { parent::__construct(__CLASS__); // Init additional filter chains - foreach (array('shutdown') as $filterChain) { + foreach (['shutdown'] as $filterChain) { $this->initFilterChain($filterChain); - } // END - foreach + } } /** diff --git a/application/city/classes/database/frontend/city/class_CityInformationDatabaseFrontend.php b/application/city/classes/database/frontend/city/class_CityInformationDatabaseFrontend.php index 77e4e5b..b643401 100644 --- a/application/city/classes/database/frontend/city/class_CityInformationDatabaseFrontend.php +++ b/application/city/classes/database/frontend/city/class_CityInformationDatabaseFrontend.php @@ -20,7 +20,7 @@ use Org\Mxchange\CoreFramework\Request\Requestable; * * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2015, 2016 City Developer Team + * @copyright Copyright (c) 2015 - 2023 City Developer Team * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * @@ -264,7 +264,7 @@ class CityInformationDatabaseFrontend extends BaseDatabaseFrontend implements Ci if ($resultInstance->count() == 0) { // Nothing found return $cityIds; - } // END - if + } // Now get all 'city_id' columns while ($resultInstance->next()) { @@ -276,7 +276,7 @@ class CityInformationDatabaseFrontend extends BaseDatabaseFrontend implements Ci // Add it to the array array_push($cityIds, $current[self::DB_COLUMN_CITY_ID]); - } // END - while + } // Return result return $cityIds; 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 7d78471..dcd474a 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 @@ -12,7 +12,7 @@ use Org\Mxchange\CoreFramework\Registry\Registerable; * * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2015, 2016 City Developer Team + * @copyright Copyright (c) 2015 - 2023 City Developer Team * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * 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 9059687..a719491 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 @@ -12,7 +12,7 @@ use Org\Mxchange\CoreFramework\Registry\Registerable; * * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2015, 2016 City Developer Team + * @copyright Copyright (c) 2015 - 2023 City Developer Team * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * 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 4044201..f860811 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 @@ -6,8 +6,12 @@ namespace Org\Mxchange\City\Database\Frontend\Sections; use Org\Mxchange\CoreFramework\Bootstrap\FrameworkBootstrap; use Org\Mxchange\CoreFramework\Database\Frontend\BaseDatabaseFrontend; use Org\Mxchange\CoreFramework\Factory\Object\ObjectFactory; +use Org\Mxchange\CoreFramework\Generic\FrameworkInterface; use Org\Mxchange\CoreFramework\Registry\Registerable; +// Import SPL stuff +use \InvalidArgumentException; + /** * A database frontend for city sections. Sections are the smalles entity of a * city. They can be connected with each other and form a lot. Therefore only @@ -21,7 +25,7 @@ use Org\Mxchange\CoreFramework\Registry\Registerable; * * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2015, 2016 City Developer Team + * @copyright Copyright (c) 2015 - 2023 City Developer Team * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * @@ -122,8 +126,16 @@ class CitySectionsDatabaseFrontend extends BaseDatabaseFrontend implements CityS * * @param $cityId City id to check * @return $isFound Whether the city id is found + * @throws InvalidArgumentException If a parameter as an invalid value */ public function ifCityHasSections (int $cityId) { + // Check parameter + /* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput(sprintf('CITY-SECTIONS-DATABASE-FRONTEND: cityId=%d - CALLED!', $cityId)); + if ($cityId < 1) { + // Throw IAE + throw new InvalidArgumentException(sprintf('cityId=%d is not a valid id', $cityId), FrameworkInterface::EXCEPTION_INVALID_ARGUMENT); + } + // Get search instance $searchInstance = ObjectFactory::createObjectByConfiguredName('search_criteria_class'); @@ -140,9 +152,11 @@ class CitySectionsDatabaseFrontend extends BaseDatabaseFrontend implements CityS $resultInstance = $this->doSelectByCriteria($searchInstance); // Check if there is one entry + /* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput(sprintf('CITY-SECTIONS-DATABASE-FRONTEND: resultInstance=%s', $resultInstance->__toString())); $isFound = $resultInstance->next(); // Return result + /* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput(sprintf('CITY-SECTIONS-DATABASE-FRONTEND: isFound=%d - EXIT!', intval($isFound))); return $isFound; } @@ -151,11 +165,20 @@ class CitySectionsDatabaseFrontend extends BaseDatabaseFrontend implements CityS * * @param $cityId City id to check * @return $ids Sections ids from initial expansion + * @throws InvalidArgumentException If a parameter as an invalid value + * @throws BadMethodCallException If the city has already sections but this method was invoked * @todo Add handling of water types to make a more cooler map */ public function doInitialCityExpansion (int $cityId) { - // Make sure this city has no sections - assert(!$this->ifCityHasSections($cityId)); + // Check parameter + /* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput(sprintf('CITY-SECTIONS-DATABASE-FRONTEND: cityId=%d - CALLED!', $cityId)); + if ($cityId < 1) { + // Throw IAE + throw new InvalidArgumentException(sprintf('cityId=%d is not a valid id', $cityId), FrameworkInterface::EXCEPTION_INVALID_ARGUMENT); + } elseif ($this->ifCityHasSections($cityId)) { + // Already has sections + throw new BadMethodCallException(sprintf('cityId=%d has already sections', $cityId), FrameworkInterface::EXCEPTION_BAD_METHOD_CALL); + } /* * "Cache" max "radius" for initial city expansion. It is not a real @@ -175,10 +198,8 @@ class CitySectionsDatabaseFrontend extends BaseDatabaseFrontend implements CityS // Calculate total sections $totalSections = (($radius + 1) * ($radius + 1) * $maxUp * ($maxDown + 1)); - // Debug message: - /* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('[' . __METHOD__ . ':' . __LINE__ . ']: radius=' . $radius . ',maxUp=' . $maxUp . ',maxDown=' . $maxDown . ',totalSections=' . $totalSections); - // Get data set instance + /* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput(sprintf('CITY-SECTIONS-DATABASE-FRONTEND: radius=%d,maxUp=%d,maxDown=%d,totalSections=%d', $radius, $maxUp, $maxDown, $totalSections)); $dataSetInstance = ObjectFactory::createObjectByConfiguredName('dataset_criteria_class', array(self::DB_TABLE_CITY_SECTIONS)); // Add values for "zero point" @@ -199,7 +220,7 @@ class CitySectionsDatabaseFrontend extends BaseDatabaseFrontend implements CityS $dataSetInstance->addCriteria(self::DB_COLUMN_SECTION_RESERVED , self::IS_NOT_RESERVED); // Set primary key to 'city_id'/'section_id' - $dataSetInstance->setPrimaryKeyCombined(array(self::DB_COLUMN_CITY_ID, self::DB_COLUMN_SECTION_ID)); + $dataSetInstance->setPrimaryKeyCombined([self::DB_COLUMN_CITY_ID, self::DB_COLUMN_SECTION_ID]); // Entry id for counting each entry $dataSetInstance->setUniqueKey(self::DB_COLUMN_ENTRY_ID); @@ -208,10 +229,10 @@ class CitySectionsDatabaseFrontend extends BaseDatabaseFrontend implements CityS $this->queryInsertDataSet($dataSetInstance); // Set section id to 2 as 1 is already initialized + init array - $sections = array(); + $sections = []; // Output message to ask for user's patience ... - self::createDebugInstance(__CLASS__)->debugOutput('[' . __METHOD__ . ':' . __LINE__ . ']: Writing ' . $totalSections . ' sections for city ' . $cityId . ' ... (this may takes some time)'); + self::createDebugInstance(__CLASS__)->debugOutput(sprintf('CITY-SECTIONS-DATABASE-FRONTEND: Writing %d sections for city %d ... (this may takes some time)', $totalSections, $cityId)); // Expand half of it to north/south (north=positive, south=negative) for ($north = 1; $north < round($radius / 2); $north++) { @@ -219,19 +240,17 @@ class CitySectionsDatabaseFrontend extends BaseDatabaseFrontend implements CityS for ($west = 1; $west < round($radius / 2); $west++) { // Expand up/down (including "zero point") for ($z = $maxDown; $z < ($maxUp + 1); $z++) { - // Debug message - //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('[' . __METHOD__ . ':' . __LINE__ . ']: north=' . $north . ',west=' . $west . ',z=' . $z); - // Fill array up with south/east/down ids + //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('[' . __METHOD__ . ':' . __LINE__ . ']: north=' . $north . ',west=' . $west . ',z=' . $z); $sections[($north * -1)][($west * -1)][$z]['type'] = self::SECTION_TYPE_EMPTY_LAND; $sections[($north * -1)][($west * -1)][$z]['sub'] = self::SECTION_SUB_TYPE_GRASS; // Fill up array with north/west/up ids (only air) $sections[$north][$west][$z]['type'] = self::SECTION_TYPE_AIR; $sections[$north][$west][$z]['sub'] = self::SECTION_SUB_TYPE_AIR; - } // END - for - } // END - for - } // END - for + } + } + } // Init section id with 2 as 1 is the "zero point" $sectionId = 2; @@ -242,10 +261,8 @@ class CitySectionsDatabaseFrontend extends BaseDatabaseFrontend implements CityS foreach ($sectionX as $y => $sectionY) { // Loop through up/down values foreach ($sectionY as $z => $sectionData) { - // Debug message - //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('[' . __METHOD__ . ':' . __LINE__ . ']: x=' . $x . ',y=' . $y . ',z=' . $z . ',sectionId=' . $sectionId); - // Set all coordinates for positive directions + //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('[' . __METHOD__ . ':' . __LINE__ . ']: x=' . $x . ',y=' . $y . ',z=' . $z . ',sectionId=' . $sectionId); $dataSetInstance->setCriteria(self::DB_COLUMN_SECTION_ID , $sectionId); $dataSetInstance->setCriteria(self::DB_COLUMN_SECTION_POSITION_X, $x); $dataSetInstance->setCriteria(self::DB_COLUMN_SECTION_POSITION_Y, $y); @@ -258,15 +275,15 @@ class CitySectionsDatabaseFrontend extends BaseDatabaseFrontend implements CityS // Count id up $sectionId++; - } // END - foreach + } // Debug message //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('[' . __METHOD__ . ':' . __LINE__ . ']: x=' . $x . ',y=' . $y . ' has been written.'); - } // END - foreach + } // Debug message //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('[' . __METHOD__ . ':' . __LINE__ . ']: x=' . $x . ' has been written.'); - } // END - foreach + } // Thank you for waiting! :-) self::createDebugInstance(__CLASS__)->debugOutput('[' . __METHOD__ . ':' . __LINE__ . ']: A total of ' . $totalSections . ' sections has been written for city id ' . $cityId . '.'); diff --git a/application/city/classes/database/frontend/game_options/class_CityGameOptionsDatabaseFrontend.php b/application/city/classes/database/frontend/game_options/class_CityGameOptionsDatabaseFrontend.php index 956cac2..16508f8 100644 --- a/application/city/classes/database/frontend/game_options/class_CityGameOptionsDatabaseFrontend.php +++ b/application/city/classes/database/frontend/game_options/class_CityGameOptionsDatabaseFrontend.php @@ -11,7 +11,7 @@ use Org\Mxchange\CoreFramework\Registry\Registerable; * * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2015, 2016 City Developer Team + * @copyright Copyright (c) 2015 - 2023 City Developer Team * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/application/city/classes/database/frontend/region/class_RegionInformationDatabaseWrapper.php b/application/city/classes/database/frontend/region/class_RegionInformationDatabaseWrapper.php index 6990652..83de450 100644 --- a/application/city/classes/database/frontend/region/class_RegionInformationDatabaseWrapper.php +++ b/application/city/classes/database/frontend/region/class_RegionInformationDatabaseWrapper.php @@ -22,7 +22,7 @@ use \BadMethodCallException; * * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2015, 2016 City Developer Team + * @copyright Copyright (c) 2015 - 2023 City Developer Team * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * 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 1b50f56..3b35fe6 100644 --- a/application/city/classes/database/frontend/region_map/class_RegionMapDatabaseFrontend.php +++ b/application/city/classes/database/frontend/region_map/class_RegionMapDatabaseFrontend.php @@ -13,7 +13,7 @@ use Org\Mxchange\CoreFramework\Registry\Registerable; * * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2015, 2016 City Developer Team + * @copyright Copyright (c) 2015 - 2023 City Developer Team * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/application/city/classes/factories/city_daemon/class_CityDaemonFactory.php b/application/city/classes/factories/city_daemon/class_CityDaemonFactory.php index 3984b23..bbe7c7e 100644 --- a/application/city/classes/factories/city_daemon/class_CityDaemonFactory.php +++ b/application/city/classes/factories/city_daemon/class_CityDaemonFactory.php @@ -16,7 +16,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable; * * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2015, 2016 City Developer Team + * @copyright Copyright (c) 2015 - 2023 City Developer Team * @license GNU GPL 3.0 or any newer version * @link http://www.ship-simu.org * diff --git a/application/city/classes/factories/manager/class_ManagerFactory.php b/application/city/classes/factories/manager/class_ManagerFactory.php index f07b6c8..f9b5a83 100644 --- a/application/city/classes/factories/manager/class_ManagerFactory.php +++ b/application/city/classes/factories/manager/class_ManagerFactory.php @@ -12,7 +12,7 @@ use Org\Mxchange\CoreFramework\Registry\GenericRegistry; * * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2015, 2016 City Developer Team + * @copyright Copyright (c) 2015 - 2023 City Developer Team * @license GNU GPL 3.0 or any newer version * @link http://www.ship-simu.org * diff --git a/application/city/classes/factories/states/city/class_CityStateFactory.php b/application/city/classes/factories/states/city/class_CityStateFactory.php index f87426f..3ae6a87 100644 --- a/application/city/classes/factories/states/city/class_CityStateFactory.php +++ b/application/city/classes/factories/states/city/class_CityStateFactory.php @@ -17,7 +17,7 @@ use \InvalidArgumentException; * * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2015, 2016 City Developer Team + * @copyright Copyright (c) 2015 - 2023 City Developer Team * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * 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 1ee22ac..0bf7255 100644 --- a/application/city/classes/filter/bootstrap/city_daemon/class_CityDaemonBootstrapExtraBootstrappingFilter.php +++ b/application/city/classes/filter/bootstrap/city_daemon/class_CityDaemonBootstrapExtraBootstrappingFilter.php @@ -16,7 +16,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable; * * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2015, 2016 City Developer Team + * @copyright Copyright (c) 2015 - 2023 City Developer Team * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/application/city/classes/filter/bootstrap/class_CityDaemonBootstrap b/application/city/classes/filter/bootstrap/class_CityDaemonBootstrap index 6c9a3ab..18a179f 100644 --- a/application/city/classes/filter/bootstrap/class_CityDaemonBootstrap +++ b/application/city/classes/filter/bootstrap/class_CityDaemonBootstrap @@ -16,7 +16,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable; * * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2015, 2016 City Developer Team + * @copyright Copyright (c) 2015 - 2023 City Developer Team * @license GNU GPL 3.0 or any newer version * @link http://www.ship-simu.org * diff --git a/application/city/classes/filter/bootstrap/init/class_CityDaemonBootstrapInitDaemonFilter.php b/application/city/classes/filter/bootstrap/init/class_CityDaemonBootstrapInitDaemonFilter.php index 6eff2c2..35432e6 100644 --- a/application/city/classes/filter/bootstrap/init/class_CityDaemonBootstrapInitDaemonFilter.php +++ b/application/city/classes/filter/bootstrap/init/class_CityDaemonBootstrapInitDaemonFilter.php @@ -16,7 +16,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable; * * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2015, 2016 City Developer Team + * @copyright Copyright (c) 2015 - 2023 City Developer Team * @license GNU GPL 3.0 or any newer version * @link http://www.ship-simu.org * diff --git a/application/city/classes/filter/city_daemon/class_CityDaemon b/application/city/classes/filter/city_daemon/class_CityDaemon index 52c4144..7cad5a6 100644 --- a/application/city/classes/filter/city_daemon/class_CityDaemon +++ b/application/city/classes/filter/city_daemon/class_CityDaemon @@ -15,7 +15,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable; * * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2015, 2016 City Developer Team + * @copyright Copyright (c) 2015 - 2023 City Developer Team * @license GNU GPL 3.0 or any newer version * @link http://www.ship-simu.org * diff --git a/application/city/classes/filter/city_daemon/class_CityDaemonInitializationFilter.php b/application/city/classes/filter/city_daemon/class_CityDaemonInitializationFilter.php index 78c8790..54b194f 100644 --- a/application/city/classes/filter/city_daemon/class_CityDaemonInitializationFilter.php +++ b/application/city/classes/filter/city_daemon/class_CityDaemonInitializationFilter.php @@ -16,7 +16,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable; * * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2015, 2016 City Developer Team + * @copyright Copyright (c) 2015 - 2023 City Developer Team * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/application/city/classes/filter/city_daemon/class_CityDaemonPhpRequirementsFilter.php b/application/city/classes/filter/city_daemon/class_CityDaemonPhpRequirementsFilter.php index 6358a46..0457722 100644 --- a/application/city/classes/filter/city_daemon/class_CityDaemonPhpRequirementsFilter.php +++ b/application/city/classes/filter/city_daemon/class_CityDaemonPhpRequirementsFilter.php @@ -16,7 +16,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable; * * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2015, 2016 City Developer Team + * @copyright Copyright (c) 2015 - 2023 City Developer Team * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * @@ -75,6 +75,6 @@ class CityDaemonPhpRequirementsFilter extends BaseCityFilter implements Filterab if ($checkPassed === FALSE) { // Throw an exception throw new FilterChainException($this, self::EXCEPTION_FILTER_CHAIN_INTERCEPTED); - } // END - if + } } } diff --git a/application/city/classes/filter/city_daemon/class_CityDaemonWelcomeTeaserFilter.php b/application/city/classes/filter/city_daemon/class_CityDaemonWelcomeTeaserFilter.php index 09c4386..2f11dc7 100644 --- a/application/city/classes/filter/city_daemon/class_CityDaemonWelcomeTeaserFilter.php +++ b/application/city/classes/filter/city_daemon/class_CityDaemonWelcomeTeaserFilter.php @@ -17,7 +17,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable; * * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2015, 2016 City Developer Team + * @copyright Copyright (c) 2015 - 2023 City Developer Team * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/application/city/classes/filter/class_ b/application/city/classes/filter/class_ index ef28947..854312f 100644 --- a/application/city/classes/filter/class_ +++ b/application/city/classes/filter/class_ @@ -16,7 +16,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable; * * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2015, 2016 City Developer Team + * @copyright Copyright (c) 2015 - 2023 City Developer Team * @license GNU GPL 3.0 or any newer version * @link http://www.ship-simu.org * diff --git a/application/city/classes/filter/class_BaseCityFilter.php b/application/city/classes/filter/class_BaseCityFilter.php index 9d35f48..6972b7f 100644 --- a/application/city/classes/filter/class_BaseCityFilter.php +++ b/application/city/classes/filter/class_BaseCityFilter.php @@ -12,7 +12,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable; * * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2015, 2016 City Developer Team + * @copyright Copyright (c) 2015 - 2023 City Developer Team * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * @@ -63,7 +63,7 @@ abstract class BaseCityFilter extends BaseFilter { * @return void * @todo Exceptions from renderXmlContent() are currently unhandled */ - protected function genericProcessMessage ($messageType, $messageContent, Receivable $packageInstance) { + protected function genericProcessMessage (string $messageType, string $messageContent, Receivable $packageInstance) { // Get a template instance from the factory $templateInstance = XmlTemplateEngineFactory::createXmlTemplateEngineInstance('city_' . $messageType . '_template_class'); @@ -93,14 +93,14 @@ abstract class BaseCityFilter extends BaseFilter { // Skip this part, don't write NULLs to the array continue; - } // END - if + } // Debug message //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput(str_replace('_', '-', strtoupper($messageType)) . '-TAG: key=' . $key . ',value=' . $value); // Set it now $this->dataXmlNodes[$key] = $value; - } // END - foreach + } // Construct an array for pushing it on next stack $messageArray = array( diff --git a/application/city/classes/filter/shutdown/city/class_CityDaemonShutdown b/application/city/classes/filter/shutdown/city/class_CityDaemonShutdown index 59333c9..2d77c20 100644 --- a/application/city/classes/filter/shutdown/city/class_CityDaemonShutdown +++ b/application/city/classes/filter/shutdown/city/class_CityDaemonShutdown @@ -16,7 +16,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable; * * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2015, 2016 City Developer Team + * @copyright Copyright (c) 2015 - 2023 City Developer Team * @license GNU GPL 3.0 or any newer version * @link http://www.ship-simu.org * diff --git a/application/city/classes/filter/shutdown/city/class_CityDaemonShutdownCityFilter.php b/application/city/classes/filter/shutdown/city/class_CityDaemonShutdownCityFilter.php index 61700e3..bb70af1 100644 --- a/application/city/classes/filter/shutdown/city/class_CityDaemonShutdownCityFilter.php +++ b/application/city/classes/filter/shutdown/city/class_CityDaemonShutdownCityFilter.php @@ -18,7 +18,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable; * * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2015, 2016 City Developer Team + * @copyright Copyright (c) 2015 - 2023 City Developer Team * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/application/city/classes/filter/shutdown/city/class_CityDaemonShutdownTaskHandlerFilter.php b/application/city/classes/filter/shutdown/city/class_CityDaemonShutdownTaskHandlerFilter.php index dd7e376..f577159 100644 --- a/application/city/classes/filter/shutdown/city/class_CityDaemonShutdownTaskHandlerFilter.php +++ b/application/city/classes/filter/shutdown/city/class_CityDaemonShutdownTaskHandlerFilter.php @@ -16,7 +16,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable; * * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2015, 2016 City Developer Team + * @copyright Copyright (c) 2015 - 2023 City Developer Team * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * 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 aa7e874..efafcc6 100644 --- a/application/city/classes/filter/task/city_daemon/class_CityDaemonTaskHandlerInitializerFilter.php +++ b/application/city/classes/filter/task/city_daemon/class_CityDaemonTaskHandlerInitializerFilter.php @@ -18,7 +18,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable; * * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2015, 2016 City Developer Team + * @copyright Copyright (c) 2015 - 2023 City Developer Team * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/application/city/classes/filter/verifier/class_CityNameVerifierFilter.php b/application/city/classes/filter/verifier/class_CityNameVerifierFilter.php index 97e3026..1c9feb8 100644 --- a/application/city/classes/filter/verifier/class_CityNameVerifierFilter.php +++ b/application/city/classes/filter/verifier/class_CityNameVerifierFilter.php @@ -20,7 +20,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable; * * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2015, 2016 City Developer Team + * @copyright Copyright (c) 2015 - 2023 City Developer Team * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/application/city/classes/login/class_CityGuestLogin.php b/application/city/classes/login/class_CityGuestLogin.php index 775b8ab..de87722 100644 --- a/application/city/classes/login/class_CityGuestLogin.php +++ b/application/city/classes/login/class_CityGuestLogin.php @@ -18,7 +18,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable; * * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2015, 2016 City Developer Team + * @copyright Copyright (c) 2015 - 2023 City Developer Team * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * @@ -86,7 +86,7 @@ class CityGuestLogin extends BaseFrameworkSystem implements LoginableUser, Regis if ($userInstance->ifPasswordHashMatches($requestInstance) === FALSE) { // Mismatching password throw new UserPasswordMismatchException(array($this, $userInstance), BaseUser::EXCEPTION_USER_PASS_MISMATCH); - } // END - if + } // Now do the real login. This can be cookie- or session-based login // which depends on the admins setting then on the user's taste. @@ -146,6 +146,6 @@ class CityGuestLogin extends BaseFrameworkSystem implements LoginableUser, Regis // Store the hash back in request FrameworkBootstrap::getRequestInstance()->setRequestElement('pass_hash', $this->hashedPassword); - } // END - if + } } } diff --git a/application/city/classes/login/class_CityUserLogin.php b/application/city/classes/login/class_CityUserLogin.php index 873946e..8ab2a45 100644 --- a/application/city/classes/login/class_CityUserLogin.php +++ b/application/city/classes/login/class_CityUserLogin.php @@ -18,7 +18,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable; * * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2015, 2016 City Developer Team + * @copyright Copyright (c) 2015 - 2023 City Developer Team * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * @@ -89,7 +89,7 @@ class CityUserLogin extends BaseFrameworkSystem implements LoginableUser, Regist if ($userInstance->ifPasswordHashMatches($requestInstance) === FALSE) { // Mismatching password throw new UserPasswordMismatchException(array($this, $userInstance), BaseUser::EXCEPTION_USER_PASS_MISMATCH); - } // END - if + } // @TODO What else? @@ -154,6 +154,6 @@ class CityUserLogin extends BaseFrameworkSystem implements LoginableUser, Regist // Store the hash back in request FrameworkBootstrap::getRequestInstance()->setRequestElement('pass_hash', $this->hashedPassword); - } // END - if + } } } diff --git a/application/city/classes/login/helper/class_CityLoginHelper.php b/application/city/classes/login/helper/class_CityLoginHelper.php index 65f92ba..45dad3d 100644 --- a/application/city/classes/login/helper/class_CityLoginHelper.php +++ b/application/city/classes/login/helper/class_CityLoginHelper.php @@ -26,7 +26,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable; * * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2015, 2016 City Developer Team + * @copyright Copyright (c) 2015 - 2023 City Developer Team * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * @@ -80,7 +80,7 @@ class CityLoginHelper extends BaseLoginHelper implements HelpableLogin { if (!$userInstance instanceof ManageableAccount) { // Thrown an exception here throw new NullPointerException($this, self::EXCEPTION_IS_NULL_POINTER); - } // END - if + } // Set default login method from config $helperInstance->setDefaultAuthMethod(); diff --git a/application/city/classes/manager/city/class_CityManager.php b/application/city/classes/manager/city/class_CityManager.php index 0a962d4..7635b16 100644 --- a/application/city/classes/manager/city/class_CityManager.php +++ b/application/city/classes/manager/city/class_CityManager.php @@ -17,7 +17,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable; * * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2015, 2016 City Developer Team + * @copyright Copyright (c) 2015 - 2023 City Developer Team * @license GNU GPL 3.0 or any newer version * @link http://www.ship-simu.org * 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 b4b26fa..2d8a087 100644 --- a/application/city/classes/manager/city_entities/districts/class_CityDistrictsManager.php +++ b/application/city/classes/manager/city_entities/districts/class_CityDistrictsManager.php @@ -14,7 +14,7 @@ use Org\Mxchange\CoreFramework\Registry\Registerable; * * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2015, 2016 City Developer Team + * @copyright Copyright (c) 2015 - 2023 City Developer Team * @license GNU GPL 3.0 or any newer version * @link http://www.ship-simu.org * diff --git a/application/city/classes/manager/city_entities/lots/class_CityLotsManager.php b/application/city/classes/manager/city_entities/lots/class_CityLotsManager.php index 8090ed0..3e74efc 100644 --- a/application/city/classes/manager/city_entities/lots/class_CityLotsManager.php +++ b/application/city/classes/manager/city_entities/lots/class_CityLotsManager.php @@ -14,7 +14,7 @@ use Org\Mxchange\CoreFramework\Registry\Registerable; * * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2015, 2016 City Developer Team + * @copyright Copyright (c) 2015 - 2023 City Developer Team * @license GNU GPL 3.0 or any newer version * @link http://www.ship-simu.org * diff --git a/application/city/classes/manager/city_entities/sections/class_CitySectionsManager.php b/application/city/classes/manager/city_entities/sections/class_CitySectionsManager.php index d9144a8..211aeb8 100644 --- a/application/city/classes/manager/city_entities/sections/class_CitySectionsManager.php +++ b/application/city/classes/manager/city_entities/sections/class_CitySectionsManager.php @@ -14,7 +14,7 @@ use Org\Mxchange\CoreFramework\Registry\Registerable; * * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2015, 2016 City Developer Team + * @copyright Copyright (c) 2015 - 2023 City Developer Team * @license GNU GPL 3.0 or any newer version * @link http://www.ship-simu.org * @@ -75,7 +75,7 @@ class CitySectionsManager extends BaseManager implements ManageableCitySections, if ($this->getFrontendInstance()->countTotalRows() == 0) { // This definedly requires expansion $requireExpansion = TRUE; - } // END - if + } // Return status return $requireExpansion; @@ -104,6 +104,6 @@ class CitySectionsManager extends BaseManager implements ManageableCitySections, } else { // @TODO Maybe some expansion is needed } - } // END - foreach + } } } diff --git a/application/city/classes/manager/class_ b/application/city/classes/manager/class_ index a8cb292..e35c2d7 100644 --- a/application/city/classes/manager/class_ +++ b/application/city/classes/manager/class_ @@ -11,7 +11,7 @@ use Org\Mxchange\CoreFramework\Registry\Registerable; * * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2015, 2016 City Developer Team + * @copyright Copyright (c) 2015 - 2023 City Developer Team * @license GNU GPL 3.0 or any newer version * @link http://www.ship-simu.org * diff --git a/application/city/classes/manager/class_BaseManager.php b/application/city/classes/manager/class_BaseManager.php index 251f265..7301cfe 100644 --- a/application/city/classes/manager/class_BaseManager.php +++ b/application/city/classes/manager/class_BaseManager.php @@ -14,7 +14,7 @@ use Org\Mxchange\CoreFramework\Traits\Database\Frontend\DatabaseFrontendTrait; * * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2015, 2016 City Developer Team + * @copyright Copyright (c) 2015 - 2023 City Developer Team * @license GNU GPL 3.0 or any newer version * @link http://www.ship-simu.org * diff --git a/application/city/classes/manager/game/class_GameOptionsManager.php b/application/city/classes/manager/game/class_GameOptionsManager.php index aa2ae4c..a828d18 100644 --- a/application/city/classes/manager/game/class_GameOptionsManager.php +++ b/application/city/classes/manager/game/class_GameOptionsManager.php @@ -10,7 +10,7 @@ use Org\Mxchange\CoreFramework\Factory\Database\Frontend\DatabaseFrontendFactory * * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2015, 2016 City Developer Team + * @copyright Copyright (c) 2015 - 2023 City Developer Team * @license GNU GPL 3.0 or any newer version * @link http://www.ship-simu.org * diff --git a/application/city/classes/manager/region/class_RegionManager.php b/application/city/classes/manager/region/class_RegionManager.php index b5cfaf1..37314a2 100644 --- a/application/city/classes/manager/region/class_RegionManager.php +++ b/application/city/classes/manager/region/class_RegionManager.php @@ -10,7 +10,7 @@ use Org\Mxchange\CoreFramework\Factory\Database\Frontend\DatabaseFrontendFactory * * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2015, 2016 City City Developer Team + * @copyright Copyright (c) 2015 - 2023 City City Developer Team * @license GNU GPL 3.0 or any newer version * @link http://www.ship-simu.org * diff --git a/application/city/classes/manager/region/class_RegionMapManager.php b/application/city/classes/manager/region/class_RegionMapManager.php index 1e3b774..6534db5 100644 --- a/application/city/classes/manager/region/class_RegionMapManager.php +++ b/application/city/classes/manager/region/class_RegionMapManager.php @@ -10,7 +10,7 @@ use Org\Mxchange\CoreFramework\Factory\Database\Frontend\DatabaseFrontendFactory * * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2015, 2016 City Developer Team + * @copyright Copyright (c) 2015 - 2023 City Developer Team * @license GNU GPL 3.0 or any newer version * @link http://www.ship-simu.org * diff --git a/application/city/classes/menu/class_City b/application/city/classes/menu/class_City index 84450b4..9be658b 100644 --- a/application/city/classes/menu/class_City +++ b/application/city/classes/menu/class_City @@ -4,7 +4,7 @@ * * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2015, 2016 City Developer Team + * @copyright Copyright (c) 2015 - 2023 City Developer Team * @license GNU GPL 3.0 or any newer version * @link http://www.ship-simu.org * diff --git a/application/city/classes/menu/class_CityConfirmMenu.php b/application/city/classes/menu/class_CityConfirmMenu.php index f4646ae..79dbf16 100644 --- a/application/city/classes/menu/class_CityConfirmMenu.php +++ b/application/city/classes/menu/class_CityConfirmMenu.php @@ -11,7 +11,7 @@ use Org\Mxchange\CoreFramework\Menu\RenderableMenu; * * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2015, 2016 City Developer Team + * @copyright Copyright (c) 2015 - 2023 City Developer Team * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/application/city/classes/menu/class_CityHomeMenu.php b/application/city/classes/menu/class_CityHomeMenu.php index c9ed8aa..0bd61bc 100644 --- a/application/city/classes/menu/class_CityHomeMenu.php +++ b/application/city/classes/menu/class_CityHomeMenu.php @@ -11,7 +11,7 @@ use Org\Mxchange\CoreFramework\Menu\RenderableMenu; * * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2015, 2016 City Developer Team + * @copyright Copyright (c) 2015 - 2023 City Developer Team * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/application/city/classes/menu/class_CityLoginAreaMenu.php b/application/city/classes/menu/class_CityLoginAreaMenu.php index f14095e..7666626 100644 --- a/application/city/classes/menu/class_CityLoginAreaMenu.php +++ b/application/city/classes/menu/class_CityLoginAreaMenu.php @@ -11,7 +11,7 @@ use Org\Mxchange\CoreFramework\Menu\RenderableMenu; * * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2015, 2016 City Developer Team + * @copyright Copyright (c) 2015 - 2023 City Developer Team * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/application/city/classes/menu/class_CityLoginFailedMenu.php b/application/city/classes/menu/class_CityLoginFailedMenu.php index fa17bfa..54cb87b 100644 --- a/application/city/classes/menu/class_CityLoginFailedMenu.php +++ b/application/city/classes/menu/class_CityLoginFailedMenu.php @@ -11,7 +11,7 @@ use Org\Mxchange\CoreFramework\Menu\RenderableMenu; * * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2015, 2016 City Developer Team + * @copyright Copyright (c) 2015 - 2023 City Developer Team * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/application/city/classes/menu/class_CityLoginMenu.php b/application/city/classes/menu/class_CityLoginMenu.php index f99c273..de59692 100644 --- a/application/city/classes/menu/class_CityLoginMenu.php +++ b/application/city/classes/menu/class_CityLoginMenu.php @@ -11,7 +11,7 @@ use Org\Mxchange\CoreFramework\Menu\RenderableMenu; * * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2015, 2016 City Developer Team + * @copyright Copyright (c) 2015 - 2023 City Developer Team * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/application/city/classes/menu/class_CityLogoutMenu.php b/application/city/classes/menu/class_CityLogoutMenu.php index f08c2a1..d01e134 100644 --- a/application/city/classes/menu/class_CityLogoutMenu.php +++ b/application/city/classes/menu/class_CityLogoutMenu.php @@ -11,7 +11,7 @@ use Org\Mxchange\CoreFramework\Menu\RenderableMenu; * * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2015, 2016 City Developer Team + * @copyright Copyright (c) 2015 - 2023 City Developer Team * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/application/city/classes/menu/class_CityRegisterMenu.php b/application/city/classes/menu/class_CityRegisterMenu.php index 4be38c2..5e35015 100644 --- a/application/city/classes/menu/class_CityRegisterMenu.php +++ b/application/city/classes/menu/class_CityRegisterMenu.php @@ -11,7 +11,7 @@ use Org\Mxchange\CoreFramework\Menu\RenderableMenu; * * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2015, 2016 City Developer Team + * @copyright Copyright (c) 2015 - 2023 City Developer Team * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/application/city/classes/menu/class_CityStatusMenu.php b/application/city/classes/menu/class_CityStatusMenu.php index c0e4b98..569db0d 100644 --- a/application/city/classes/menu/class_CityStatusMenu.php +++ b/application/city/classes/menu/class_CityStatusMenu.php @@ -11,7 +11,7 @@ use Org\Mxchange\CoreFramework\Menu\RenderableMenu; * * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2015, 2016 City Developer Team + * @copyright Copyright (c) 2015 - 2023 City Developer Team * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/application/city/classes/menu/government/class_CityGovernmentFailedAreaMenu.php b/application/city/classes/menu/government/class_CityGovernmentFailedAreaMenu.php index 830f676..7308a52 100644 --- a/application/city/classes/menu/government/class_CityGovernmentFailedAreaMenu.php +++ b/application/city/classes/menu/government/class_CityGovernmentFailedAreaMenu.php @@ -11,7 +11,7 @@ use Org\Mxchange\CoreFramework\Menu\RenderableMenu; * * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2015, 2016 City Developer Team + * @copyright Copyright (c) 2015 - 2023 City Developer Team * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/application/city/classes/registration/class_CityRegistration.php b/application/city/classes/registration/class_CityRegistration.php index 18f47ba..0400ef9 100644 --- a/application/city/classes/registration/class_CityRegistration.php +++ b/application/city/classes/registration/class_CityRegistration.php @@ -17,7 +17,7 @@ use Org\Mxchange\CoreFramework\Request\Requestable; * * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2015, 2016 City Developer Team + * @copyright Copyright (c) 2015 - 2023 City Developer Team * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * @@ -180,7 +180,7 @@ class CityRegistration extends BaseRegistration implements UserRegister { if (FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('confirm_email_enabled') === 'N') { // No confirmation of email needed $configEntry = 'user_status_confirmed'; - } // END - if + } // Add a lot elements to the dataset criteria foreach ($this->criteriaElements as $alias => $element) { @@ -203,8 +203,8 @@ class CityRegistration extends BaseRegistration implements UserRegister { if ((($element == 'username') || ($alias == 'username')) && (FrameworkBootstrap::getRequestInstance()->getRequestElement($element) == FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('guest_login_user'))) { // Yes, then set the config entry to guest status $configEntry = 'user_status_guest'; - } // END - if - } // END - foreach + } + } // Mark the username as unique key $criteriaInstance->setUniqueKey(UserDatabaseFrontend::DB_COLUMN_USERNAME); diff --git a/application/city/classes/resolver/command/console/class_CityConsoleCommandResolver.php b/application/city/classes/resolver/command/console/class_CityConsoleCommandResolver.php index 3089555..473dd68 100644 --- a/application/city/classes/resolver/command/console/class_CityConsoleCommandResolver.php +++ b/application/city/classes/resolver/command/console/class_CityConsoleCommandResolver.php @@ -11,7 +11,7 @@ use Org\Mxchange\CoreFramework\Resolver\Command\CommandResolver; * * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2015, 2016 City Developer Team + * @copyright Copyright (c) 2015 - 2023 City Developer Team * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/application/city/classes/resolver/command/html/class_CityHtmlCommandResolver.php b/application/city/classes/resolver/command/html/class_CityHtmlCommandResolver.php index 4b7cac4..52abef8 100644 --- a/application/city/classes/resolver/command/html/class_CityHtmlCommandResolver.php +++ b/application/city/classes/resolver/command/html/class_CityHtmlCommandResolver.php @@ -11,7 +11,7 @@ use Org\Mxchange\CoreFramework\Resolver\Command\CommandResolver; * * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2015, 2016 City Developer Team + * @copyright Copyright (c) 2015 - 2023 City Developer Team * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/application/city/classes/resolver/controller/console/class_CityConsoleControllerResolver.php b/application/city/classes/resolver/controller/console/class_CityConsoleControllerResolver.php index 4093a2d..8d34fca 100644 --- a/application/city/classes/resolver/controller/console/class_CityConsoleControllerResolver.php +++ b/application/city/classes/resolver/controller/console/class_CityConsoleControllerResolver.php @@ -12,7 +12,7 @@ use Org\Mxchange\CoreFramework\Resolver\Controller\ControllerResolver; * * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2015, 2016 City Developer Team + * @copyright Copyright (c) 2015 - 2023 City Developer Team * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/application/city/classes/resolver/controller/html/class_CityHtmlControllerResolver.php b/application/city/classes/resolver/controller/html/class_CityHtmlControllerResolver.php index d522506..dc5d55b 100644 --- a/application/city/classes/resolver/controller/html/class_CityHtmlControllerResolver.php +++ b/application/city/classes/resolver/controller/html/class_CityHtmlControllerResolver.php @@ -12,7 +12,7 @@ use Org\Mxchange\CoreFramework\Resolver\Controller\ControllerResolver; * * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2015, 2016 City Developer Team + * @copyright Copyright (c) 2015 - 2023 City Developer Team * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/application/city/classes/resolver/controller/image/class_CityImageControllerResolver.php b/application/city/classes/resolver/controller/image/class_CityImageControllerResolver.php index ebdca5b..492d704 100644 --- a/application/city/classes/resolver/controller/image/class_CityImageControllerResolver.php +++ b/application/city/classes/resolver/controller/image/class_CityImageControllerResolver.php @@ -12,7 +12,7 @@ use Org\Mxchange\CoreFramework\Resolver\Controller\ControllerResolver; * * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2015, 2016 City Developer Team + * @copyright Copyright (c) 2015 - 2023 City Developer Team * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/application/city/classes/states/city/active/class_CityActiveState.php b/application/city/classes/states/city/active/class_CityActiveState.php index 0b8b1ae..4cc5da1 100644 --- a/application/city/classes/states/city/active/class_CityActiveState.php +++ b/application/city/classes/states/city/active/class_CityActiveState.php @@ -14,7 +14,7 @@ use Org\Mxchange\CoreFramework\State\Stateable; * * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2015, 2016 City Developer Team + * @copyright Copyright (c) 2015 - 2023 City Developer Team * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/application/city/classes/states/city/class_ b/application/city/classes/states/city/class_ index 333ef1e..bffd03e 100644 --- a/application/city/classes/states/city/class_ +++ b/application/city/classes/states/city/class_ @@ -13,7 +13,7 @@ use Org\Mxchange\CoreFramework\State\Stateable; * * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2015, 2016 City Developer Team + * @copyright Copyright (c) 2015 - 2023 City Developer Team * @license GNU GPL 3.0 or any newer version * @link http://www.ship-simu.org * diff --git a/application/city/classes/states/city/class_BaseCityState.php b/application/city/classes/states/city/class_BaseCityState.php index 0394e00..86480f9 100644 --- a/application/city/classes/states/city/class_BaseCityState.php +++ b/application/city/classes/states/city/class_BaseCityState.php @@ -13,7 +13,7 @@ use Org\Mxchange\CoreFramework\State\BaseState; * * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2015, 2016 City Developer Team + * @copyright Copyright (c) 2015 - 2023 City Developer Team * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * @@ -54,7 +54,7 @@ abstract class BaseCityState extends BaseState { if (!$this instanceof CityActiveState) { // Throw the exception throw new UnexpectedStateException($this, self::EXCEPTION_INVALID_STATE); - } // END - if + } } /** @@ -69,6 +69,6 @@ abstract class BaseCityState extends BaseState { if (!$this instanceof CityInitState) { // Throw the exception throw new UnexpectedStateException($this, self::EXCEPTION_INVALID_STATE); - } // END - if + } } } diff --git a/application/city/classes/states/city/init/class_CityInitState.php b/application/city/classes/states/city/init/class_CityInitState.php index fe74f65..cf422ca 100644 --- a/application/city/classes/states/city/init/class_CityInitState.php +++ b/application/city/classes/states/city/init/class_CityInitState.php @@ -15,7 +15,7 @@ use Org\Mxchange\CoreFramework\State\Stateable; * * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2015, 2016 City Developer Team + * @copyright Copyright (c) 2015 - 2023 City Developer Team * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/application/city/classes/tasks/class_BaseCityTask.php b/application/city/classes/tasks/class_BaseCityTask.php index 55eb89e..46136e1 100644 --- a/application/city/classes/tasks/class_BaseCityTask.php +++ b/application/city/classes/tasks/class_BaseCityTask.php @@ -13,7 +13,7 @@ use Org\Mxchange\CoreFramework\Task\BaseTask; * * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2015, 2016 City Developer Team + * @copyright Copyright (c) 2015 - 2023 City Developer Team * @license GNU GPL 3.0 or any newer version * @link http://www.ship-simu.org * diff --git a/application/city/classes/tasks/daemon/building/class_CityDaemonBuildingGrowthTask.php b/application/city/classes/tasks/daemon/building/class_CityDaemonBuildingGrowthTask.php index ee4a3bf..58609c6 100644 --- a/application/city/classes/tasks/daemon/building/class_CityDaemonBuildingGrowthTask.php +++ b/application/city/classes/tasks/daemon/building/class_CityDaemonBuildingGrowthTask.php @@ -16,7 +16,7 @@ use Org\Mxchange\CoreFramework\Visitor\Visitor; * * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2015, 2016 City Developer Team + * @copyright Copyright (c) 2015 - 2023 City Developer Team * @license GNU GPL 3.0 or any newer version * @link http://www.ship-simu.org * @@ -89,7 +89,7 @@ class CityDaemonBuildingGrowthTask extends BaseCityTask implements Taskable, Vis if ($cityInstance->isBuildingPendingExpansion()) { // Expand the building $cityInstance->expandBuildings(); - } // END - if + } } /** diff --git a/application/city/classes/tasks/daemon/class_CityDaemon b/application/city/classes/tasks/daemon/class_CityDaemon index 073f377..ed0789c 100644 --- a/application/city/classes/tasks/daemon/class_CityDaemon +++ b/application/city/classes/tasks/daemon/class_CityDaemon @@ -13,7 +13,7 @@ use Org\Mxchange\CoreFramework\Visitor\Visitor; * * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2015, 2016 City Developer Team + * @copyright Copyright (c) 2015 - 2023 City Developer Team * @license GNU GPL 3.0 or any newer version * @link http://www.ship-simu.org * diff --git a/application/city/classes/tasks/daemon/household/class_CityDaemonHouseholdGrowthTask.php b/application/city/classes/tasks/daemon/household/class_CityDaemonHouseholdGrowthTask.php index d2d514d..c744450 100644 --- a/application/city/classes/tasks/daemon/household/class_CityDaemonHouseholdGrowthTask.php +++ b/application/city/classes/tasks/daemon/household/class_CityDaemonHouseholdGrowthTask.php @@ -16,7 +16,7 @@ use Org\Mxchange\CoreFramework\Visitor\Visitor; * * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2015, 2016 City Developer Team + * @copyright Copyright (c) 2015 - 2023 City Developer Team * @license GNU GPL 3.0 or any newer version * @link http://www.ship-simu.org * @@ -89,7 +89,7 @@ class CityDaemonHouseholdGrowthTask extends BaseCityTask implements Taskable, Vi if ($cityInstance->isHouseholdPendingExpansion()) { // Expand the house hold $cityInstance->expandHouseholds(); - } // END - if + } } /** diff --git a/application/city/classes/tasks/daemon/map_expander/class_CityDaemonMapExpanderTask.php b/application/city/classes/tasks/daemon/map_expander/class_CityDaemonMapExpanderTask.php index 41b51e9..e589ee1 100644 --- a/application/city/classes/tasks/daemon/map_expander/class_CityDaemonMapExpanderTask.php +++ b/application/city/classes/tasks/daemon/map_expander/class_CityDaemonMapExpanderTask.php @@ -16,7 +16,7 @@ use Org\Mxchange\CoreFramework\Visitor\Visitor; * * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2015, 2016 City Developer Team + * @copyright Copyright (c) 2015 - 2023 City Developer Team * @license GNU GPL 3.0 or any newer version * @link http://www.ship-simu.org * @@ -89,7 +89,7 @@ class CityDaemonMapExpanderTask extends BaseCityTask implements Taskable, Visita if ($cityInstance->isMapPendingExpansion()) { // Expand the map $cityInstance->expandMaps(); - } // END - if + } } /** diff --git a/application/city/config-local.php-dist b/application/city/config-local.php-dist index ac4c73c..6fd4e38 100644 --- a/application/city/config-local.php-dist +++ b/application/city/config-local.php-dist @@ -7,7 +7,7 @@ * * @author Roland Haeder * @version 0.0 - * @copyright Copyright (c) 2015, 2016 City Developer Team + * @copyright Copyright (c) 2015 - 2023 City Developer Team * @license GNU GPL 3.0 or any newer version * * This program is free software: you can redistribute it and/or modify diff --git a/application/city/config.php b/application/city/config.php index 9aa9346..f647f61 100644 --- a/application/city/config.php +++ b/application/city/config.php @@ -7,7 +7,7 @@ use Org\Mxchange\CoreFramework\Bootstrap\FrameworkBootstrap; * * @author Roland Haeder * @version 0.0 - * @copyright Copyright (c) 2015, 2016 City Developer Team + * @copyright Copyright (c) 2015 - 2023 City Developer Team * @license GNU GPL 3.0 or any newer version * * This program is free software: you can redistribute it and/or modify diff --git a/application/city/debug.php b/application/city/debug.php index 76a1339..c395716 100644 --- a/application/city/debug.php +++ b/application/city/debug.php @@ -4,7 +4,7 @@ * * @author Roland Haeder * @version 0.0 - * @copyright Copyright (c) 2015, 2016 City Developer Team + * @copyright Copyright (c) 2015 - 2023 City Developer Team * @license GNU GPL 3.0 or any newer version * * This program is free software: you can redistribute it and/or modify diff --git a/application/city/exceptions.php b/application/city/exceptions.php index 9bdbb44..f548876 100644 --- a/application/city/exceptions.php +++ b/application/city/exceptions.php @@ -44,7 +44,7 @@ function city_exception_handler ($exceptionInstance) { // Convert arguments type into human-readable foreach ($traceArray['args'] as $arg) { $argsString .= ', ' . gettype($arg); - } // END - foreach + } $argsString = substr($argsString, 2); } @@ -67,7 +67,7 @@ Line : %d\n", basename($traceArray['file']), $traceArray['line'] ); - } // END - foreach + } // Construct the message $message = sprintf("-------------------------------------------------------------------------------- @@ -117,14 +117,14 @@ function city_error_handler ($errno, $errstr, $errfile, $errline, array $errcont // Throw an exception here throw new FatalErrorException($message, BaseFrameworkSystem::EXCEPTION_FATAL_ERROR); -} // END - function +} // Assertion handler -function city_assert_handler ($file, $line, $code) { +function city_assert_handler (string $file, int $line, int $code) { // Empty code? if ($code === '') { $code = 'Unknown'; - } // END - if + } // Create message $message = sprintf('File: %s, Line: %s, Code: %s', @@ -138,7 +138,7 @@ function city_assert_handler ($file, $line, $code) { // Throw an exception here throw new AssertionException($message, BaseFrameworkSystem::EXCEPTION_ASSERTION_FAILED); -} // END - function +} // Set error handler //set_error_handler('city_error_handler'); diff --git a/application/city/interfaces/database/frontend/city/class_CityInformationFrontend.php b/application/city/interfaces/database/frontend/city/class_CityInformationFrontend.php index 153245e..77d95cc 100644 --- a/application/city/interfaces/database/frontend/city/class_CityInformationFrontend.php +++ b/application/city/interfaces/database/frontend/city/class_CityInformationFrontend.php @@ -15,7 +15,7 @@ use Org\Mxchange\CoreFramework\Request\Requestable; * * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2015, 2016 City Developer Team + * @copyright Copyright (c) 2015 - 2023 City Developer Team * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/application/city/interfaces/database/frontend/city_entities/districts/class_CityDistrictsFrontend.php b/application/city/interfaces/database/frontend/city_entities/districts/class_CityDistrictsFrontend.php index 383e138..d6f8dff 100644 --- a/application/city/interfaces/database/frontend/city_entities/districts/class_CityDistrictsFrontend.php +++ b/application/city/interfaces/database/frontend/city_entities/districts/class_CityDistrictsFrontend.php @@ -10,7 +10,7 @@ use Org\Mxchange\CoreFramework\Database\Frontend\DatabaseFrontend; * * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2015, 2016 City Developer Team + * @copyright Copyright (c) 2015 - 2023 City Developer Team * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/application/city/interfaces/database/frontend/city_entities/lots/class_CityLotsFrontend.php b/application/city/interfaces/database/frontend/city_entities/lots/class_CityLotsFrontend.php index 41e2d28..9b9c5ce 100644 --- a/application/city/interfaces/database/frontend/city_entities/lots/class_CityLotsFrontend.php +++ b/application/city/interfaces/database/frontend/city_entities/lots/class_CityLotsFrontend.php @@ -10,7 +10,7 @@ use Org\Mxchange\CoreFramework\Database\Frontend\DatabaseFrontend; * * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2015, 2016 City Developer Team + * @copyright Copyright (c) 2015 - 2023 City Developer Team * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/application/city/interfaces/database/frontend/city_entities/sections/class_CitySectionsFrontend.php b/application/city/interfaces/database/frontend/city_entities/sections/class_CitySectionsFrontend.php index f1bfd37..147bd4c 100644 --- a/application/city/interfaces/database/frontend/city_entities/sections/class_CitySectionsFrontend.php +++ b/application/city/interfaces/database/frontend/city_entities/sections/class_CitySectionsFrontend.php @@ -10,7 +10,7 @@ use Org\Mxchange\CoreFramework\Database\Frontend\DatabaseFrontend; * * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2015, 2016 City Developer Team + * @copyright Copyright (c) 2015 - 2023 City Developer Team * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/application/city/interfaces/database/frontend/game_options/class_CityGameOptionsFrontend.php b/application/city/interfaces/database/frontend/game_options/class_CityGameOptionsFrontend.php index 8882a07..d75876d 100644 --- a/application/city/interfaces/database/frontend/game_options/class_CityGameOptionsFrontend.php +++ b/application/city/interfaces/database/frontend/game_options/class_CityGameOptionsFrontend.php @@ -10,7 +10,7 @@ use Org\Mxchange\CoreFramework\Database\Frontend\DatabaseFrontend; * * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2015, 2016 City Developer Team + * @copyright Copyright (c) 2015 - 2023 City Developer Team * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/application/city/interfaces/database/frontend/region/class_RegionInformationFrontend.php b/application/city/interfaces/database/frontend/region/class_RegionInformationFrontend.php index 7a9d9ba..863c1dd 100644 --- a/application/city/interfaces/database/frontend/region/class_RegionInformationFrontend.php +++ b/application/city/interfaces/database/frontend/region/class_RegionInformationFrontend.php @@ -10,7 +10,7 @@ use Org\Mxchange\CoreFramework\Database\Frontend\DatabaseFrontend; * * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2015, 2016 City Developer Team + * @copyright Copyright (c) 2015 - 2023 City Developer Team * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/application/city/interfaces/database/frontend/region/class_RegionMapFrontend.php b/application/city/interfaces/database/frontend/region/class_RegionMapFrontend.php index 7624732..315e75c 100644 --- a/application/city/interfaces/database/frontend/region/class_RegionMapFrontend.php +++ b/application/city/interfaces/database/frontend/region/class_RegionMapFrontend.php @@ -10,7 +10,7 @@ use Org\Mxchange\CoreFramework\Database\Frontend\DatabaseFrontend; * * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2015, 2016 City Developer Team + * @copyright Copyright (c) 2015 - 2023 City Developer Team * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/application/city/interfaces/helper/city/class_CityHelper.php b/application/city/interfaces/helper/city/class_CityHelper.php index d5227be..e7bd0b6 100644 --- a/application/city/interfaces/helper/city/class_CityHelper.php +++ b/application/city/interfaces/helper/city/class_CityHelper.php @@ -14,7 +14,7 @@ use Org\Mxchange\CoreFramework\Response\Responseable; * * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2015, 2016 City Developer Team + * @copyright Copyright (c) 2015 - 2023 City Developer Team * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/application/city/interfaces/manager/city/class_ManageableCity.php b/application/city/interfaces/manager/city/class_ManageableCity.php index 6fe4dfc..2c21074 100644 --- a/application/city/interfaces/manager/city/class_ManageableCity.php +++ b/application/city/interfaces/manager/city/class_ManageableCity.php @@ -10,7 +10,7 @@ use Org\Mxchange\City\Manager\Manageable; * * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2015, 2016 City Developer Team + * @copyright Copyright (c) 2015 - 2023 City Developer Team * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/application/city/interfaces/manager/city_entities/class_ManageableCityEntities.php b/application/city/interfaces/manager/city_entities/class_ManageableCityEntities.php index 22be45f..0b4f2b3 100644 --- a/application/city/interfaces/manager/city_entities/class_ManageableCityEntities.php +++ b/application/city/interfaces/manager/city_entities/class_ManageableCityEntities.php @@ -10,7 +10,7 @@ use Org\Mxchange\City\Manager\Manageable; * * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2015, 2016 City Developer Team + * @copyright Copyright (c) 2015 - 2023 City Developer Team * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/application/city/interfaces/manager/city_entities/districts/class_ManageableCityDistricts.php b/application/city/interfaces/manager/city_entities/districts/class_ManageableCityDistricts.php index cfaf9eb..7c483a1 100644 --- a/application/city/interfaces/manager/city_entities/districts/class_ManageableCityDistricts.php +++ b/application/city/interfaces/manager/city_entities/districts/class_ManageableCityDistricts.php @@ -10,7 +10,7 @@ use Org\Mxchange\City\Manager\Entities\ManageableCityEntities; * * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2015, 2016 City Developer Team + * @copyright Copyright (c) 2015 - 2023 City Developer Team * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/application/city/interfaces/manager/city_entities/lots/class_ManageableCityLots.php b/application/city/interfaces/manager/city_entities/lots/class_ManageableCityLots.php index c48102f..1aac720 100644 --- a/application/city/interfaces/manager/city_entities/lots/class_ManageableCityLots.php +++ b/application/city/interfaces/manager/city_entities/lots/class_ManageableCityLots.php @@ -10,7 +10,7 @@ use Org\Mxchange\City\Manager\Entities\ManageableCityEntities; * * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2015, 2016 City Developer Team + * @copyright Copyright (c) 2015 - 2023 City Developer Team * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/application/city/interfaces/manager/city_entities/sections/class_ManageableCitySections.php b/application/city/interfaces/manager/city_entities/sections/class_ManageableCitySections.php index ad0d70b..9226754 100644 --- a/application/city/interfaces/manager/city_entities/sections/class_ManageableCitySections.php +++ b/application/city/interfaces/manager/city_entities/sections/class_ManageableCitySections.php @@ -10,7 +10,7 @@ use Org\Mxchange\City\Manager\Entities\ManageableCityEntities; * * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2015, 2016 City Developer Team + * @copyright Copyright (c) 2015 - 2023 City Developer Team * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/application/city/interfaces/manager/class_Manageable.php b/application/city/interfaces/manager/class_Manageable.php index ca95926..68ca92e 100644 --- a/application/city/interfaces/manager/class_Manageable.php +++ b/application/city/interfaces/manager/class_Manageable.php @@ -10,7 +10,7 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkInterface; * * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2015, 2016 City Developer Team + * @copyright Copyright (c) 2015 - 2023 City Developer Team * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/application/city/interfaces/manager/region/class_ManageableRegion.php b/application/city/interfaces/manager/region/class_ManageableRegion.php index 76a12fe..5ca9d5e 100644 --- a/application/city/interfaces/manager/region/class_ManageableRegion.php +++ b/application/city/interfaces/manager/region/class_ManageableRegion.php @@ -10,7 +10,7 @@ use Org\Mxchange\City\Manager\Manageable; * * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2015, 2016 City Developer Team + * @copyright Copyright (c) 2015 - 2023 City Developer Team * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/application/city/interfaces/manager/region/class_ManageableRegionMap.php b/application/city/interfaces/manager/region/class_ManageableRegionMap.php index 8923c55..47ed57b 100644 --- a/application/city/interfaces/manager/region/class_ManageableRegionMap.php +++ b/application/city/interfaces/manager/region/class_ManageableRegionMap.php @@ -10,7 +10,7 @@ use Org\Mxchange\City\Manager\Manageable; * * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2015, 2016 City Developer Team + * @copyright Copyright (c) 2015 - 2023 City Developer Team * @license GNU GPL 3.0 or any newer version * @link http://www.shipsimu.org * diff --git a/application/city/templates/menu/base_menu.xml b/application/city/templates/menu/base_menu.xml index 935fb1b..8791c14 100644 --- a/application/city/templates/menu/base_menu.xml +++ b/application/city/templates/menu/base_menu.xml @@ -4,7 +4,7 @@ A general menu XML file. This should be later converted to a DTD. @author Roland Haeder @version 0.0.0 -@copyright Copyright (c) 2015, 2016 City Developer Team +@copyright Copyright (c) 2015 - 2023 City Developer Team @license GNU GPL 3.0 or any newer version @link http://www.ship-simu.org diff --git a/application/city/templates/menu/generic_menu_entries.xml b/application/city/templates/menu/generic_menu_entries.xml index 5322809..b4e7d8b 100644 --- a/application/city/templates/menu/generic_menu_entries.xml +++ b/application/city/templates/menu/generic_menu_entries.xml @@ -4,7 +4,7 @@ Generic menu entries. You should not touch this template for smooth upgrades. @author Roland Haeder @version 0.0.0 -@copyright Copyright (c) 2015, 2016 City Developer Team +@copyright Copyright (c) 2015 - 2023 City Developer Team @license GNU GPL 3.0 or any newer version @link http://www.ship-simu.org diff --git a/application/city/templates/menu/login_area_menu_entries.xml b/application/city/templates/menu/login_area_menu_entries.xml index 57d79c8..c5bac68 100644 --- a/application/city/templates/menu/login_area_menu_entries.xml +++ b/application/city/templates/menu/login_area_menu_entries.xml @@ -4,7 +4,7 @@ Login area menu entries. You should not touch this template for smooth upgrades. @author Roland Haeder @version 0.0.0 -@copyright Copyright (c) 2015, 2016 City Developer Team +@copyright Copyright (c) 2015 - 2023 City Developer Team @license GNU GPL 3.0 or any newer version @link http://www.ship-simu.org diff --git a/contrib/update_year.sh b/contrib/update_year.sh new file mode 100755 index 0000000..d141f33 --- /dev/null +++ b/contrib/update_year.sh @@ -0,0 +1,4 @@ +#!/bin/sh + +# Really lame ... +find */ -type f -print0 | xargs -0 sed -i 's/2023 City/2024 City/g' diff --git a/core b/core index c20af2b..027c565 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit c20af2b1b05f92040a8cfabfb1d0c5cd2771f7c5 +Subproject commit 027c5659e968546a21be37e70d700c7e14cba993 -- 2.39.2