From 0b9976904b63e57186a5ee2943dab1abbe96f07d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Wed, 2 Dec 2020 02:13:48 +0100 Subject: [PATCH] Continued: - renamed "Wrapper" to "Frontend" - added missing trait for above instance - removed all .htaccess files - updated core framework MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- application/.htaccess | 1 - application/city/.htaccess | 1 - application/city/classes/.htaccess | 1 - application/city/classes/actions/.htaccess | 1 - .../classes/actions/class_BaseCityAction.php | 2 +- .../city/classes/actions/html/.htaccess | 1 - .../city/classes/actions/html/city/.htaccess | 1 - .../city/classes/city_daemon/.htaccess | 1 - .../city_daemon/class_BaseCityDaemon.php | 34 +++++++++++-------- .../classes/city_daemon/default/.htaccess | 1 - .../city/classes/class_BaseCitySystem.php | 2 +- application/city/classes/commands/.htaccess | 1 - .../city/classes/commands/console/.htaccess | 1 - .../city/classes/commands/html/.htaccess | 1 - .../html/class_CityHtmlConfirmCommand.php | 4 +-- .../html/class_CityHtmlResendLinkCommand.php | 4 +-- application/city/classes/controller/.htaccess | 1 - .../city/classes/controller/console/.htaccess | 1 - .../city/classes/controller/html/.htaccess | 1 - .../classes/controller/html/form/.htaccess | 1 - .../classes/controller/html/login/.htaccess | 1 - application/city/classes/database/.htaccess | 1 - .../city/classes/database/frontend/.htaccess | 1 - .../classes/database/frontend/city/.htaccess | 1 - ...class_CityInformationDatabaseFrontend.php} | 28 +++++++-------- .../database/frontend/city_entities/.htaccess | 1 - .../city_entities/districts/.htaccess | 1 - ...> class_CityDistrictsDatabaseFrontend.php} | 20 +++++------ .../frontend/city_entities/lots/.htaccess | 1 - ...php => class_CityLotsDatabaseFrontend.php} | 20 +++++------ .../frontend/city_entities/sections/.htaccess | 1 - ...=> class_CitySectionsDatabaseFrontend.php} | 22 ++++++------ .../database/frontend/game_options/.htaccess | 1 - ...class_CityGameOptionsDatabaseFrontend.php} | 18 +++++----- .../database/frontend/region/.htaccess | 1 - ...class_RegionInformationDatabaseWrapper.php | 22 ++++++------ .../database/frontend/region_map/.htaccess | 1 - ...hp => class_RegionMapDatabaseFrontend.php} | 18 +++++----- application/city/classes/factories/.htaccess | 1 - .../classes/factories/city_daemon/.htaccess | 1 - .../city/classes/factories/manager/.htaccess | 1 - .../city/classes/factories/states/.htaccess | 1 - .../classes/factories/states/city/.htaccess | 1 - application/city/classes/filter/.htaccess | 1 - .../city/classes/filter/bootstrap/.htaccess | 1 - .../filter/bootstrap/city_daemon/.htaccess | 1 - .../classes/filter/bootstrap/init/.htaccess | 1 - .../city/classes/filter/city_daemon/.htaccess | 1 - .../classes/filter/class_BaseCityFilter.php | 2 +- .../city/classes/filter/shutdown/.htaccess | 1 - .../classes/filter/shutdown/city/.htaccess | 1 - .../city/classes/filter/task/.htaccess | 1 - .../classes/filter/task/city_daemon/.htaccess | 1 - .../city/classes/filter/verifier/.htaccess | 1 - .../verifier/class_CityNameVerifierFilter.php | 6 ++-- application/city/classes/login/.htaccess | 1 - .../city/classes/login/helper/.htaccess | 1 - application/city/classes/manager/.htaccess | 1 - .../city/classes/manager/city/.htaccess | 1 - .../manager/city/class_CityManager.php | 24 ++++++------- .../classes/manager/city_entities/.htaccess | 1 - .../manager/city_entities/districts/.htaccess | 1 - .../districts/class_CityDistrictsManager.php | 14 ++++---- .../manager/city_entities/lots/.htaccess | 1 - .../lots/class_CityLotsManager.php | 14 ++++---- .../manager/city_entities/sections/.htaccess | 1 - .../sections/class_CitySectionsManager.php | 26 +++++++------- .../classes/manager/class_BaseManager.php | 6 +++- .../city/classes/manager/game/.htaccess | 1 - .../manager/game/class_GameOptionsManager.php | 8 ++--- .../city/classes/manager/region/.htaccess | 1 - .../manager/region/class_RegionManager.php | 14 ++++---- .../manager/region/class_RegionMapManager.php | 8 ++--- application/city/classes/menu/.htaccess | 1 - .../city/classes/menu/government/.htaccess | 1 - .../city/classes/registration/.htaccess | 1 - .../registration/class_CityRegistration.php | 14 ++++---- application/city/classes/resolver/.htaccess | 1 - .../city/classes/resolver/command/.htaccess | 1 - .../resolver/command/console/.htaccess | 1 - .../classes/resolver/command/html/.htaccess | 1 - .../classes/resolver/controller/.htaccess | 1 - .../resolver/controller/console/.htaccess | 1 - .../resolver/controller/html/.htaccess | 1 - .../resolver/controller/image/.htaccess | 1 - application/city/classes/states/.htaccess | 1 - .../city/classes/states/city/.htaccess | 1 - .../city/classes/states/city/active/.htaccess | 1 - .../states/city/class_BaseCityState.php | 2 +- .../city/classes/states/city/init/.htaccess | 1 - application/city/classes/tasks/.htaccess | 1 - .../city/classes/tasks/class_BaseCityTask.php | 2 +- .../city/classes/tasks/daemon/.htaccess | 1 - .../classes/tasks/daemon/building/.htaccess | 1 - .../classes/tasks/daemon/household/.htaccess | 1 - .../tasks/daemon/map_expander/.htaccess | 1 - application/city/classes/visitor/.htaccess | 1 - .../city/classes/visitor/tasks/.htaccess | 1 - application/city/config.php | 20 +++++------ application/city/exceptions/.htaccess | 1 - application/city/interfaces/.htaccess | 1 - .../city/interfaces/database/.htaccess | 1 - .../interfaces/database/frontend/.htaccess | 1 - .../database/frontend/city/.htaccess | 1 - ....php => class_CityInformationFrontend.php} | 8 ++--- .../database/frontend/city_entities/.htaccess | 1 - .../city_entities/districts/.htaccess | 1 - ...er.php => class_CityDistrictsFrontend.php} | 8 ++--- .../frontend/city_entities/lots/.htaccess | 1 - ...Wrapper.php => class_CityLotsFrontend.php} | 8 ++--- .../frontend/city_entities/sections/.htaccess | 1 - ...per.php => class_CitySectionsFrontend.php} | 10 +++--- .../database/frontend/game_options/.htaccess | 1 - ....php => class_CityGameOptionsFrontend.php} | 6 ++-- .../database/frontend/region/.htaccess | 1 - ...hp => class_RegionInformationFrontend.php} | 6 ++-- ...rapper.php => class_RegionMapFrontend.php} | 6 ++-- application/city/interfaces/helper/.htaccess | 1 - .../city/interfaces/helper/city/.htaccess | 1 - application/city/interfaces/manager/.htaccess | 1 - .../city/interfaces/manager/city/.htaccess | 1 - .../manager/city/class_ManageableCity.php | 2 +- .../manager/city_entities/.htaccess | 1 - .../manager/city_entities/districts/.htaccess | 1 - .../manager/city_entities/lots/.htaccess | 1 - .../manager/city_entities/sections/.htaccess | 1 - .../city/interfaces/manager/region/.htaccess | 1 - application/city/language/.htaccess | 1 - application/city/templates/.htaccess | 1 - application/city/templates/code/.htaccess | 1 - application/city/templates/emails/.htaccess | 1 - application/city/templates/html/.htaccess | 1 - application/city/templates/image/.htaccess | 1 - application/city/templates/menu/.htaccess | 1 - core | 2 +- 135 files changed, 213 insertions(+), 297 deletions(-) delete mode 100644 application/.htaccess delete mode 100644 application/city/.htaccess delete mode 100644 application/city/classes/.htaccess delete mode 100644 application/city/classes/actions/.htaccess delete mode 100644 application/city/classes/actions/html/.htaccess delete mode 100644 application/city/classes/actions/html/city/.htaccess delete mode 100644 application/city/classes/city_daemon/.htaccess delete mode 100644 application/city/classes/city_daemon/default/.htaccess delete mode 100644 application/city/classes/commands/.htaccess delete mode 100644 application/city/classes/commands/console/.htaccess delete mode 100644 application/city/classes/commands/html/.htaccess delete mode 100644 application/city/classes/controller/.htaccess delete mode 100644 application/city/classes/controller/console/.htaccess delete mode 100644 application/city/classes/controller/html/.htaccess delete mode 100644 application/city/classes/controller/html/form/.htaccess delete mode 100644 application/city/classes/controller/html/login/.htaccess delete mode 100644 application/city/classes/database/.htaccess delete mode 100644 application/city/classes/database/frontend/.htaccess delete mode 100644 application/city/classes/database/frontend/city/.htaccess rename application/city/classes/database/frontend/city/{class_CityInformationDatabaseWrapper.php => class_CityInformationDatabaseFrontend.php} (88%) delete mode 100644 application/city/classes/database/frontend/city_entities/.htaccess delete mode 100644 application/city/classes/database/frontend/city_entities/districts/.htaccess rename application/city/classes/database/frontend/city_entities/districts/{class_CityDistrictsDatabaseWrapper.php => class_CityDistrictsDatabaseFrontend.php} (78%) delete mode 100644 application/city/classes/database/frontend/city_entities/lots/.htaccess rename application/city/classes/database/frontend/city_entities/lots/{class_CityLotsDatabaseWrapper.php => class_CityLotsDatabaseFrontend.php} (79%) delete mode 100644 application/city/classes/database/frontend/city_entities/sections/.htaccess rename application/city/classes/database/frontend/city_entities/sections/{class_CitySectionsDatabaseWrapper.php => class_CitySectionsDatabaseFrontend.php} (93%) delete mode 100644 application/city/classes/database/frontend/game_options/.htaccess rename application/city/classes/database/frontend/game_options/{class_CityGameOptionsDatabaseWrapper.php => class_CityGameOptionsDatabaseFrontend.php} (72%) delete mode 100644 application/city/classes/database/frontend/region/.htaccess delete mode 100644 application/city/classes/database/frontend/region_map/.htaccess rename application/city/classes/database/frontend/region_map/{class_RegionMapDatabaseWrapper.php => class_RegionMapDatabaseFrontend.php} (83%) delete mode 100644 application/city/classes/factories/.htaccess delete mode 100644 application/city/classes/factories/city_daemon/.htaccess delete mode 100644 application/city/classes/factories/manager/.htaccess delete mode 100644 application/city/classes/factories/states/.htaccess delete mode 100644 application/city/classes/factories/states/city/.htaccess delete mode 100644 application/city/classes/filter/.htaccess delete mode 100644 application/city/classes/filter/bootstrap/.htaccess delete mode 100644 application/city/classes/filter/bootstrap/city_daemon/.htaccess delete mode 100644 application/city/classes/filter/bootstrap/init/.htaccess delete mode 100644 application/city/classes/filter/city_daemon/.htaccess delete mode 100644 application/city/classes/filter/shutdown/.htaccess delete mode 100644 application/city/classes/filter/shutdown/city/.htaccess delete mode 100644 application/city/classes/filter/task/.htaccess delete mode 100644 application/city/classes/filter/task/city_daemon/.htaccess delete mode 100644 application/city/classes/filter/verifier/.htaccess delete mode 100644 application/city/classes/login/.htaccess delete mode 100644 application/city/classes/login/helper/.htaccess delete mode 100644 application/city/classes/manager/.htaccess delete mode 100644 application/city/classes/manager/city/.htaccess delete mode 100644 application/city/classes/manager/city_entities/.htaccess delete mode 100644 application/city/classes/manager/city_entities/districts/.htaccess delete mode 100644 application/city/classes/manager/city_entities/lots/.htaccess delete mode 100644 application/city/classes/manager/city_entities/sections/.htaccess delete mode 100644 application/city/classes/manager/game/.htaccess delete mode 100644 application/city/classes/manager/region/.htaccess delete mode 100644 application/city/classes/menu/.htaccess delete mode 100644 application/city/classes/menu/government/.htaccess delete mode 100644 application/city/classes/registration/.htaccess delete mode 100644 application/city/classes/resolver/.htaccess delete mode 100644 application/city/classes/resolver/command/.htaccess delete mode 100644 application/city/classes/resolver/command/console/.htaccess delete mode 100644 application/city/classes/resolver/command/html/.htaccess delete mode 100644 application/city/classes/resolver/controller/.htaccess delete mode 100644 application/city/classes/resolver/controller/console/.htaccess delete mode 100644 application/city/classes/resolver/controller/html/.htaccess delete mode 100644 application/city/classes/resolver/controller/image/.htaccess delete mode 100644 application/city/classes/states/.htaccess delete mode 100644 application/city/classes/states/city/.htaccess delete mode 100644 application/city/classes/states/city/active/.htaccess delete mode 100644 application/city/classes/states/city/init/.htaccess delete mode 100644 application/city/classes/tasks/.htaccess delete mode 100644 application/city/classes/tasks/daemon/.htaccess delete mode 100644 application/city/classes/tasks/daemon/building/.htaccess delete mode 100644 application/city/classes/tasks/daemon/household/.htaccess delete mode 100644 application/city/classes/tasks/daemon/map_expander/.htaccess delete mode 100644 application/city/classes/visitor/.htaccess delete mode 100644 application/city/classes/visitor/tasks/.htaccess delete mode 100644 application/city/exceptions/.htaccess delete mode 100644 application/city/interfaces/.htaccess delete mode 100644 application/city/interfaces/database/.htaccess delete mode 100644 application/city/interfaces/database/frontend/.htaccess delete mode 100644 application/city/interfaces/database/frontend/city/.htaccess rename application/city/interfaces/database/frontend/city/{class_CityInformationWrapper.php => class_CityInformationFrontend.php} (92%) delete mode 100644 application/city/interfaces/database/frontend/city_entities/.htaccess delete mode 100644 application/city/interfaces/database/frontend/city_entities/districts/.htaccess rename application/city/interfaces/database/frontend/city_entities/districts/{class_CityDistrictsWrapper.php => class_CityDistrictsFrontend.php} (83%) delete mode 100644 application/city/interfaces/database/frontend/city_entities/lots/.htaccess rename application/city/interfaces/database/frontend/city_entities/lots/{class_CityLotsWrapper.php => class_CityLotsFrontend.php} (84%) delete mode 100644 application/city/interfaces/database/frontend/city_entities/sections/.htaccess rename application/city/interfaces/database/frontend/city_entities/sections/{class_CitySectionsWrapper.php => class_CitySectionsFrontend.php} (83%) delete mode 100644 application/city/interfaces/database/frontend/game_options/.htaccess rename application/city/interfaces/database/frontend/game_options/{class_CityGameOptionsWrapper.php => class_CityGameOptionsFrontend.php} (84%) delete mode 100644 application/city/interfaces/database/frontend/region/.htaccess rename application/city/interfaces/database/frontend/region/{class_RegionInformationWrapper.php => class_RegionInformationFrontend.php} (90%) rename application/city/interfaces/database/frontend/region/{class_RegionMapWrapper.php => class_RegionMapFrontend.php} (84%) delete mode 100644 application/city/interfaces/helper/.htaccess delete mode 100644 application/city/interfaces/helper/city/.htaccess delete mode 100644 application/city/interfaces/manager/.htaccess delete mode 100644 application/city/interfaces/manager/city/.htaccess delete mode 100644 application/city/interfaces/manager/city_entities/.htaccess delete mode 100644 application/city/interfaces/manager/city_entities/districts/.htaccess delete mode 100644 application/city/interfaces/manager/city_entities/lots/.htaccess delete mode 100644 application/city/interfaces/manager/city_entities/sections/.htaccess delete mode 100644 application/city/interfaces/manager/region/.htaccess delete mode 100644 application/city/language/.htaccess delete mode 100644 application/city/templates/.htaccess delete mode 100644 application/city/templates/code/.htaccess delete mode 100644 application/city/templates/emails/.htaccess delete mode 100644 application/city/templates/html/.htaccess delete mode 100644 application/city/templates/image/.htaccess delete mode 100644 application/city/templates/menu/.htaccess diff --git a/application/.htaccess b/application/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/city/.htaccess b/application/city/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/city/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/city/classes/.htaccess b/application/city/classes/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/city/classes/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/city/classes/actions/.htaccess b/application/city/classes/actions/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/city/classes/actions/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/city/classes/actions/class_BaseCityAction.php b/application/city/classes/actions/class_BaseCityAction.php index 595c4d4..ee069c8 100644 --- a/application/city/classes/actions/class_BaseCityAction.php +++ b/application/city/classes/actions/class_BaseCityAction.php @@ -36,7 +36,7 @@ abstract class BaseCityAction extends BaseAction { * @param $className Name of the class * @return void */ - protected function __construct ($className) { + protected function __construct (string $className) { // Call parent constructor parent::__construct($className); } diff --git a/application/city/classes/actions/html/.htaccess b/application/city/classes/actions/html/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/city/classes/actions/html/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/city/classes/actions/html/city/.htaccess b/application/city/classes/actions/html/city/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/city/classes/actions/html/city/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/city/classes/city_daemon/.htaccess b/application/city/classes/city_daemon/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/city/classes/city_daemon/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/city/classes/city_daemon/class_BaseCityDaemon.php b/application/city/classes/city_daemon/class_BaseCityDaemon.php index 5e743d1..ded79a3 100644 --- a/application/city/classes/city_daemon/class_BaseCityDaemon.php +++ b/application/city/classes/city_daemon/class_BaseCityDaemon.php @@ -6,19 +6,21 @@ namespace Org\Mxchange\City\Daemon; use Org\Mxchange\City\Factory\Manager\ManagerFactory; use Org\Mxchange\City\Factory\State\CityStateFactory; use Org\Mxchange\City\Generic\BaseCitySystem; -use Org\Mxchange\City\Database\Frontend\Information\CityInformationDatabaseWrapper; +use Org\Mxchange\City\Database\Frontend\Information\CityInformationDatabaseFrontend; // Import framework stuff use Org\Mxchange\CoreFramework\Bootstrap\FrameworkBootstrap; use Org\Mxchange\CoreFramework\Criteria\Add\AddableCriteria; use Org\Mxchange\CoreFramework\Criteria\Storing\StoreableCriteria; -use Org\Mxchange\CoreFramework\Database\Frontend\User\UserDatabaseWrapper; +use Org\Mxchange\CoreFramework\Database\Frontend\User\UserDatabaseFrontend; use Org\Mxchange\CoreFramework\Database\Updateable; -use Org\Mxchange\CoreFramework\Factory\Database\Wrapper\DatabaseWrapperFactory; +use Org\Mxchange\CoreFramework\Factory\Database\Frontend\DatabaseFrontendFactory; use Org\Mxchange\CoreFramework\Factory\ObjectFactory; use Org\Mxchange\CoreFramework\Registry\GenericRegistry;; use Org\Mxchange\CoreFramework\Request\Requestable; use Org\Mxchange\CoreFramework\Response\Responseable; +use Org\Mxchange\CoreFramework\Traits\Crypto\CryptoTrait; +use Org\Mxchange\CoreFramework\Traits\Database\Frontend\DatabaseFrontendTrait; /** * A general City class @@ -43,6 +45,10 @@ use Org\Mxchange\CoreFramework\Response\Responseable; * along with this program. If not, see . */ abstract class BaseCityDaemon extends BaseCitySystem implements Updateable, AddableCriteria { + // Load traits + use CryptoTrait; + use DatabaseFrontendTrait; + /** * City types */ @@ -60,15 +66,15 @@ abstract class BaseCityDaemon extends BaseCitySystem implements Updateable, Adda * @param $className Name of the class * @return void */ - protected function __construct ($className) { + protected function __construct (string $className) { // Call parent constructor parent::__construct($className); - // Get a wrapper instance - $wrapperInstance = DatabaseWrapperFactory::createWrapperByConfiguredName('city_info_db_wrapper_class'); + // Get a frontend instance + $frontendInstance = DatabaseFrontendFactory::createFrontendByConfiguredName('city_info_db_frontend_class'); // Set it here - $this->setWrapperInstance($wrapperInstance); + $this->setFrontendInstance($frontendInstance); // Get a crypto instance $cryptoInstance = ObjectFactory::createObjectByConfiguredName('crypto_class'); @@ -126,11 +132,11 @@ abstract class BaseCityDaemon extends BaseCitySystem implements Updateable, Adda assert($requestInstance instanceof Requestable); // Add City number and type - $criteriaInstance->addCriteria(CityInformationDatabaseWrapper::DB_COLUMN_CITY_ID , 1); - $criteriaInstance->addCriteria(CityInformationDatabaseWrapper::DB_COLUMN_CITY_MODE, $requestInstance->getRequestElement('mode')); + $criteriaInstance->addCriteria(CityInformationDatabaseFrontend::DB_COLUMN_CITY_ID , 1); + $criteriaInstance->addCriteria(CityInformationDatabaseFrontend::DB_COLUMN_CITY_MODE, $requestInstance->getRequestElement('mode')); // Add the City id - $criteriaInstance->addCriteria(CityInformationDatabaseWrapper::DB_COLUMN_CITY_ID, $this->getCityId()); + $criteriaInstance->addCriteria(CityInformationDatabaseFrontend::DB_COLUMN_CITY_ID, $this->getCityId()); } /** @@ -151,7 +157,7 @@ abstract class BaseCityDaemon extends BaseCitySystem implements Updateable, Adda $searchInstance = ObjectFactory::createObjectByConfiguredName('search_criteria_class'); // Add search criteria - $searchInstance->addCriteria(UserDatabaseWrapper::DB_COLUMN_USERNAME, $this->getUserName()); + $searchInstance->addCriteria(UserDatabaseFrontend::DB_COLUMN_USERNAME, $this->getUserName()); $searchInstance->setLimit(1); // Now get another criteria @@ -163,8 +169,8 @@ abstract class BaseCityDaemon extends BaseCitySystem implements Updateable, Adda // Add the search criteria for searching for the right entry $updateInstance->setSearchInstance($searchInstance); - // Set wrapper class name - $updateInstance->setWrapperConfigEntry('user_db_wrapper_class'); + // Set frontend class name + $updateInstance->setFrontendConfigEntry('user_db_frontend_class'); // Remember the update in database result $this->getResultInstance()->add2UpdateQueue($updateInstance); @@ -234,7 +240,7 @@ abstract class BaseCityDaemon extends BaseCitySystem implements Updateable, Adda */ public function addArrayToDataSet (StoreableCriteria $dataSetInstance, array $cityData) { // Add all data the array provides - foreach (CityInformationDatabaseWrapper::getAllElements() as $element) { + foreach (CityInformationDatabaseFrontend::getAllElements() as $element) { // Is the element there? if (isset($cityData[$element])) { // Add it diff --git a/application/city/classes/city_daemon/default/.htaccess b/application/city/classes/city_daemon/default/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/city/classes/city_daemon/default/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/city/classes/class_BaseCitySystem.php b/application/city/classes/class_BaseCitySystem.php index 084a716..13d1a29 100644 --- a/application/city/classes/class_BaseCitySystem.php +++ b/application/city/classes/class_BaseCitySystem.php @@ -49,7 +49,7 @@ abstract class BaseCitySystem extends BaseFrameworkSystem { * @param $className Name of the class * @return void */ - protected function __construct ($className) { + protected function __construct (string $className) { // Call parent constructor parent::__construct($className); } diff --git a/application/city/classes/commands/.htaccess b/application/city/classes/commands/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/city/classes/commands/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/city/classes/commands/console/.htaccess b/application/city/classes/commands/console/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/city/classes/commands/console/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/city/classes/commands/html/.htaccess b/application/city/classes/commands/html/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/city/classes/commands/html/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/city/classes/commands/html/class_CityHtmlConfirmCommand.php b/application/city/classes/commands/html/class_CityHtmlConfirmCommand.php index 8888756..50b0566 100644 --- a/application/city/classes/commands/html/class_CityHtmlConfirmCommand.php +++ b/application/city/classes/commands/html/class_CityHtmlConfirmCommand.php @@ -7,7 +7,7 @@ use Org\Mxchange\CoreFramework\Bootstrap\FrameworkBootstrap; use Org\Mxchange\CoreFramework\Command\BaseCommand; use Org\Mxchange\CoreFramework\Command\Commandable; use Org\Mxchange\CoreFramework\Controller\Controller; -use Org\Mxchange\CoreFramework\Database\Frontend\User\UserDatabaseWrapper; +use Org\Mxchange\CoreFramework\Database\Frontend\User\UserDatabaseFrontend; use Org\Mxchange\CoreFramework\Factory\ObjectFactory; use Org\Mxchange\CoreFramework\Generic\NullPointerException; use Org\Mxchange\CoreFramework\Registry\GenericRegistry; @@ -123,7 +123,7 @@ class CityHtmlConfirmCommand extends BaseCommand implements Commandable { } // Set username - $templateInstance->assignVariable('username', $userInstance->getField(UserDatabaseWrapper::DB_COLUMN_USERNAME)); + $templateInstance->assignVariable('username', $userInstance->getField(UserDatabaseFrontend::DB_COLUMN_USERNAME)); // Construct the menu in every command. We could do this in BaseCommand class. But this means // *every* command has a navigation system and that is want we don't want. diff --git a/application/city/classes/commands/html/class_CityHtmlResendLinkCommand.php b/application/city/classes/commands/html/class_CityHtmlResendLinkCommand.php index 55f82f0..5107e75 100644 --- a/application/city/classes/commands/html/class_CityHtmlResendLinkCommand.php +++ b/application/city/classes/commands/html/class_CityHtmlResendLinkCommand.php @@ -7,7 +7,7 @@ use Org\Mxchange\CoreFramework\Bootstrap\FrameworkBootstrap; use Org\Mxchange\CoreFramework\Command\BaseCommand; use Org\Mxchange\CoreFramework\Command\Commandable; use Org\Mxchange\CoreFramework\Controller\Controller; -use Org\Mxchange\CoreFramework\Database\Frontend\User\UserDatabaseWrapper; +use Org\Mxchange\CoreFramework\Database\Frontend\User\UserDatabaseFrontend; use Org\Mxchange\CoreFramework\Factory\ObjectFactory; use Org\Mxchange\CoreFramework\Registry\GenericRegistry; use Org\Mxchange\CoreFramework\Request\Requestable; @@ -91,7 +91,7 @@ class CityHtmlResendLinkCommand extends BaseCommand implements Commandable { $hashedString = $cryptoInstance->hashString($cryptoInstance->encryptString($randomString)); // Update the user class - $userInstance->updateDatabaseField(UserDatabaseWrapper::DB_COLUMN_CONFIRM_HASH, $hashedString); + $userInstance->updateDatabaseField(UserDatabaseFrontend::DB_COLUMN_CONFIRM_HASH, $hashedString); // Re-set config entry to mailer engine FrameworkBootstrap::getConfigurationInstance()->setConfigEntry('html_template_class', FrameworkBootstrap::getConfigurationInstance()->getConfigEntry('mail_template_class')); diff --git a/application/city/classes/controller/.htaccess b/application/city/classes/controller/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/city/classes/controller/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/city/classes/controller/console/.htaccess b/application/city/classes/controller/console/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/city/classes/controller/console/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/city/classes/controller/html/.htaccess b/application/city/classes/controller/html/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/city/classes/controller/html/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/city/classes/controller/html/form/.htaccess b/application/city/classes/controller/html/form/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/city/classes/controller/html/form/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/city/classes/controller/html/login/.htaccess b/application/city/classes/controller/html/login/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/city/classes/controller/html/login/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/city/classes/database/.htaccess b/application/city/classes/database/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/city/classes/database/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/city/classes/database/frontend/.htaccess b/application/city/classes/database/frontend/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/city/classes/database/frontend/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/city/classes/database/frontend/city/.htaccess b/application/city/classes/database/frontend/city/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/city/classes/database/frontend/city/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/city/classes/database/frontend/city/class_CityInformationDatabaseWrapper.php b/application/city/classes/database/frontend/city/class_CityInformationDatabaseFrontend.php similarity index 88% rename from application/city/classes/database/frontend/city/class_CityInformationDatabaseWrapper.php rename to application/city/classes/database/frontend/city/class_CityInformationDatabaseFrontend.php index 7963d17..1a795ef 100644 --- a/application/city/classes/database/frontend/city/class_CityInformationDatabaseWrapper.php +++ b/application/city/classes/database/frontend/city/class_CityInformationDatabaseFrontend.php @@ -9,14 +9,14 @@ use Org\Mxchange\City\Helper\CityHelper; use Org\Mxchange\City\Manager\City\ManageableCity; // Import framework stuff -use Org\Mxchange\CoreFramework\Database\Frontend\BaseDatabaseWrapper; +use Org\Mxchange\CoreFramework\Database\Frontend\BaseDatabaseFrontend; use Org\Mxchange\CoreFramework\Factory\ObjectFactory; use Org\Mxchange\CoreFramework\Registry\GenericRegistry; use Org\Mxchange\CoreFramework\Registry\Registerable; use Org\Mxchange\CoreFramework\Request\Requestable; /** - * A database wrapper for city informations + * A database frontend for city informations * * @author Roland Haeder * @version 0.0.0 @@ -37,7 +37,7 @@ use Org\Mxchange\CoreFramework\Request\Requestable; * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -class CityInformationDatabaseWrapper extends BaseDatabaseWrapper implements CityInformationWrapper, Registerable { +class CityInformationDatabaseFrontend extends BaseDatabaseFrontend implements CityInformationFrontend, Registerable { // Constants for database table names const DB_TABLE_CITY_INFORMATION = 'city_data'; @@ -59,19 +59,19 @@ class CityInformationDatabaseWrapper extends BaseDatabaseWrapper implements City } /** - * Creates an instance of this database wrapper by a provided user class + * Creates an instance of this database frontend by a provided user class * - * @return $wrapperInstance An instance of the created wrapper class + * @return $frontendInstance An instance of the created frontend class */ - public static final function createCityInformationDatabaseWrapper () { + public static final function createCityInformationDatabaseFrontend () { // Get a new instance - $wrapperInstance = new CityInformationDatabaseWrapper(); + $frontendInstance = new CityInformationDatabaseFrontend(); // Set (primary!) table name - $wrapperInstance->setTableName(self::DB_TABLE_CITY_INFORMATION); + $frontendInstance->setTableName(self::DB_TABLE_CITY_INFORMATION); // Return the instance - return $wrapperInstance; + return $frontendInstance; } /** @@ -85,8 +85,8 @@ class CityInformationDatabaseWrapper extends BaseDatabaseWrapper implements City $searchInstance = ObjectFactory::createObjectByConfiguredName('search_criteria_class'); // Search for the city number one which is hard-coded the default - $searchInstance->addCriteria(CityInformationDatabaseWrapper::DB_COLUMN_CITY_ID , 1); - $searchInstance->addCriteria(CityInformationDatabaseWrapper::DB_COLUMN_CITY_MODE, $cityInstance->getRequestInstance()->getRequestElement('mode')); + $searchInstance->addCriteria(CityInformationDatabaseFrontend::DB_COLUMN_CITY_ID , 1); + $searchInstance->addCriteria(CityInformationDatabaseFrontend::DB_COLUMN_CITY_MODE, $cityInstance->getRequestInstance()->getRequestElement('mode')); $searchInstance->setLimit(1); // Get a result back @@ -152,7 +152,7 @@ class CityInformationDatabaseWrapper extends BaseDatabaseWrapper implements City $searchInstance = ObjectFactory::createObjectByConfiguredName('search_criteria_class'); // Search for user's cities - $searchInstance->addCriteria(CityInformationDatabaseWrapper::DB_COLUMN_CITY_USER_ID, $userInstance->getUserId()); + $searchInstance->addCriteria(CityInformationDatabaseFrontend::DB_COLUMN_CITY_USER_ID, $userInstance->getUserId()); // Get a result back $resultInstance = $this->doSelectByCriteria($searchInstance); @@ -179,12 +179,12 @@ class CityInformationDatabaseWrapper extends BaseDatabaseWrapper implements City * @para $cityName Name of city * @return $isTaken Whether the given city name is taken */ - public function ifCityExists ($cityName) { + public function ifCityExists (string $cityName) { // Now get a search criteria instance $searchInstance = ObjectFactory::createObjectByConfiguredName('search_criteria_class'); // Search for the city number one which is hard-coded the default - $searchInstance->addCriteria(CityInformationDatabaseWrapper::DB_COLUMN_CITY_NAME, $cityName); + $searchInstance->addCriteria(CityInformationDatabaseFrontend::DB_COLUMN_CITY_NAME, $cityName); $searchInstance->setLimit(1); // Get a result back diff --git a/application/city/classes/database/frontend/city_entities/.htaccess b/application/city/classes/database/frontend/city_entities/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/city/classes/database/frontend/city_entities/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/city/classes/database/frontend/city_entities/districts/.htaccess b/application/city/classes/database/frontend/city_entities/districts/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/city/classes/database/frontend/city_entities/districts/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/city/classes/database/frontend/city_entities/districts/class_CityDistrictsDatabaseWrapper.php b/application/city/classes/database/frontend/city_entities/districts/class_CityDistrictsDatabaseFrontend.php similarity index 78% rename from application/city/classes/database/frontend/city_entities/districts/class_CityDistrictsDatabaseWrapper.php rename to application/city/classes/database/frontend/city_entities/districts/class_CityDistrictsDatabaseFrontend.php index b7722a6..758abf1 100644 --- a/application/city/classes/database/frontend/city_entities/districts/class_CityDistrictsDatabaseWrapper.php +++ b/application/city/classes/database/frontend/city_entities/districts/class_CityDistrictsDatabaseFrontend.php @@ -3,12 +3,12 @@ namespace Org\Mxchange\City\Database\Frontend\Districts; // Import framework stuff -use Org\Mxchange\CoreFramework\Database\Frontend\BaseDatabaseWrapper; +use Org\Mxchange\CoreFramework\Database\Frontend\BaseDatabaseFrontend; use Org\Mxchange\CoreFramework\Factory\ObjectFactory; use Org\Mxchange\CoreFramework\Registry\Registerable; /** - * A database wrapper for city districts + * A database frontend for city districts * * @author Roland Haeder * @version 0.0.0 @@ -29,7 +29,7 @@ use Org\Mxchange\CoreFramework\Registry\Registerable; * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -class CityDistrictsDatabaseWrapper extends BaseDatabaseWrapper implements CityDistrictsWrapper, Registerable { +class CityDistrictsDatabaseFrontend extends BaseDatabaseFrontend implements CityDistrictsFrontend, Registerable { // Constants for database table names const DB_TABLE_CITY_DISTRICTS = 'city_districts'; @@ -48,19 +48,19 @@ class CityDistrictsDatabaseWrapper extends BaseDatabaseWrapper implements CityDi } /** - * Creates an instance of this database wrapper by a provided user class + * Creates an instance of this database frontend by a provided user class * - * @return $wrapperInstance An instance of the created wrapper class + * @return $frontendInstance An instance of the created frontend class */ - public static final function createCityDistrictsDatabaseWrapper () { + public static final function createCityDistrictsDatabaseFrontend () { // Get a new instance - $wrapperInstance = new CityDistrictsDatabaseWrapper(); + $frontendInstance = new CityDistrictsDatabaseFrontend(); // Set (primary!) table name - $wrapperInstance->setTableName(self::DB_TABLE_CITY_DISTRICTS); + $frontendInstance->setTableName(self::DB_TABLE_CITY_DISTRICTS); // Return the instance - return $wrapperInstance; + return $frontendInstance; } /** @@ -69,7 +69,7 @@ class CityDistrictsDatabaseWrapper extends BaseDatabaseWrapper implements CityDi * @param $cityId City id to check * @return $isFound Whether the city id is found */ - public function ifCityHasDistricts ($cityId) { + public function ifCityHasDistricts (int $cityId) { // Get search instance $searchInstance = ObjectFactory::createObjectByConfiguredName('search_criteria_class'); diff --git a/application/city/classes/database/frontend/city_entities/lots/.htaccess b/application/city/classes/database/frontend/city_entities/lots/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/city/classes/database/frontend/city_entities/lots/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/city/classes/database/frontend/city_entities/lots/class_CityLotsDatabaseWrapper.php b/application/city/classes/database/frontend/city_entities/lots/class_CityLotsDatabaseFrontend.php similarity index 79% rename from application/city/classes/database/frontend/city_entities/lots/class_CityLotsDatabaseWrapper.php rename to application/city/classes/database/frontend/city_entities/lots/class_CityLotsDatabaseFrontend.php index 9f07157..1cf4ab5 100644 --- a/application/city/classes/database/frontend/city_entities/lots/class_CityLotsDatabaseWrapper.php +++ b/application/city/classes/database/frontend/city_entities/lots/class_CityLotsDatabaseFrontend.php @@ -3,12 +3,12 @@ namespace Org\Mxchange\City\Database\Frontend\Lots; // Import framework stuff -use Org\Mxchange\CoreFramework\Database\Frontend\BaseDatabaseWrapper; +use Org\Mxchange\CoreFramework\Database\Frontend\BaseDatabaseFrontend; use Org\Mxchange\CoreFramework\Factory\ObjectFactory; use Org\Mxchange\CoreFramework\Registry\Registerable; /** - * A database wrapper for city lots + * A database frontend for city lots * * @author Roland Haeder * @version 0.0.0 @@ -29,7 +29,7 @@ use Org\Mxchange\CoreFramework\Registry\Registerable; * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -class CityLotsDatabaseWrapper extends BaseDatabaseWrapper implements CityLotsWrapper, Registerable { +class CityLotsDatabaseFrontend extends BaseDatabaseFrontend implements CityLotsFrontend, Registerable { // Constants for database table names const DB_TABLE_CITY_LOTS = 'city_lots'; @@ -49,19 +49,19 @@ class CityLotsDatabaseWrapper extends BaseDatabaseWrapper implements CityLotsWra } /** - * Creates an instance of this database wrapper by a provided user class + * Creates an instance of this database frontend by a provided user class * - * @return $wrapperInstance An instance of the created wrapper class + * @return $frontendInstance An instance of the created frontend class */ - public static final function createCityLotsDatabaseWrapper () { + public static final function createCityLotsDatabaseFrontend () { // Get a new instance - $wrapperInstance = new CityLotsDatabaseWrapper(); + $frontendInstance = new CityLotsDatabaseFrontend(); // Set (primary!) table name - $wrapperInstance->setTableName(self::DB_TABLE_CITY_LOTS); + $frontendInstance->setTableName(self::DB_TABLE_CITY_LOTS); // Return the instance - return $wrapperInstance; + return $frontendInstance; } /** @@ -70,7 +70,7 @@ class CityLotsDatabaseWrapper extends BaseDatabaseWrapper implements CityLotsWra * @param $cityId City id to check * @return $isFound Whether the city id is found */ - public function ifCityHasLots ($cityId) { + public function ifCityHasLots (int $cityId) { // Get search instance $searchInstance = ObjectFactory::createObjectByConfiguredName('search_criteria_class'); diff --git a/application/city/classes/database/frontend/city_entities/sections/.htaccess b/application/city/classes/database/frontend/city_entities/sections/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/city/classes/database/frontend/city_entities/sections/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/city/classes/database/frontend/city_entities/sections/class_CitySectionsDatabaseWrapper.php b/application/city/classes/database/frontend/city_entities/sections/class_CitySectionsDatabaseFrontend.php similarity index 93% rename from application/city/classes/database/frontend/city_entities/sections/class_CitySectionsDatabaseWrapper.php rename to application/city/classes/database/frontend/city_entities/sections/class_CitySectionsDatabaseFrontend.php index 2b4d671..dc4004f 100644 --- a/application/city/classes/database/frontend/city_entities/sections/class_CitySectionsDatabaseWrapper.php +++ b/application/city/classes/database/frontend/city_entities/sections/class_CitySectionsDatabaseFrontend.php @@ -4,12 +4,12 @@ namespace Org\Mxchange\City\Database\Frontend\Sections; // Import framework stuff use Org\Mxchange\CoreFramework\Bootstrap\FrameworkBootstrap; -use Org\Mxchange\CoreFramework\Database\Frontend\BaseDatabaseWrapper; +use Org\Mxchange\CoreFramework\Database\Frontend\BaseDatabaseFrontend; use Org\Mxchange\CoreFramework\Factory\ObjectFactory; use Org\Mxchange\CoreFramework\Registry\Registerable; /** - * A database wrapper for city sections. Sections are the smalles entity of a + * 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 * sections of same type (and sub type) can be linked combined, else you will * something really strange, a residential building with some industry parts @@ -38,7 +38,7 @@ use Org\Mxchange\CoreFramework\Registry\Registerable; * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -class CitySectionsDatabaseWrapper extends BaseDatabaseWrapper implements CitySectionsWrapper, Registerable { +class CitySectionsDatabaseFrontend extends BaseDatabaseFrontend implements CitySectionsFrontend, Registerable { // Constants for database table names const DB_TABLE_CITY_SECTIONS = 'city_sections'; @@ -102,19 +102,19 @@ class CitySectionsDatabaseWrapper extends BaseDatabaseWrapper implements CitySec } /** - * Creates an instance of this database wrapper by a provided user class + * Creates an instance of this database frontend by a provided user class * - * @return $wrapperInstance An instance of the created wrapper class + * @return $frontendInstance An instance of the created frontend class */ - public static final function createCitySectionsDatabaseWrapper () { + public static final function createCitySectionsDatabaseFrontend () { // Get a new instance - $wrapperInstance = new CitySectionsDatabaseWrapper(); + $frontendInstance = new CitySectionsDatabaseFrontend(); // Set (primary!) table name - $wrapperInstance->setTableName(self::DB_TABLE_CITY_SECTIONS); + $frontendInstance->setTableName(self::DB_TABLE_CITY_SECTIONS); // Return the instance - return $wrapperInstance; + return $frontendInstance; } /** @@ -123,7 +123,7 @@ class CitySectionsDatabaseWrapper extends BaseDatabaseWrapper implements CitySec * @param $cityId City id to check * @return $isFound Whether the city id is found */ - public function ifCityHasSections ($cityId) { + public function ifCityHasSections (int $cityId) { // Get search instance $searchInstance = ObjectFactory::createObjectByConfiguredName('search_criteria_class'); @@ -153,7 +153,7 @@ class CitySectionsDatabaseWrapper extends BaseDatabaseWrapper implements CitySec * @return $ids Sections ids from initial expansion * @todo Add handling of water types to make a more cooler map */ - public function doInitialCityExpansion ($cityId) { + public function doInitialCityExpansion (int $cityId) { // Make sure this city has no sections assert(!$this->ifCityHasSections($cityId)); diff --git a/application/city/classes/database/frontend/game_options/.htaccess b/application/city/classes/database/frontend/game_options/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/city/classes/database/frontend/game_options/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/city/classes/database/frontend/game_options/class_CityGameOptionsDatabaseWrapper.php b/application/city/classes/database/frontend/game_options/class_CityGameOptionsDatabaseFrontend.php similarity index 72% rename from application/city/classes/database/frontend/game_options/class_CityGameOptionsDatabaseWrapper.php rename to application/city/classes/database/frontend/game_options/class_CityGameOptionsDatabaseFrontend.php index 4250491..956cac2 100644 --- a/application/city/classes/database/frontend/game_options/class_CityGameOptionsDatabaseWrapper.php +++ b/application/city/classes/database/frontend/game_options/class_CityGameOptionsDatabaseFrontend.php @@ -3,11 +3,11 @@ namespace Org\Mxchange\City\Database\Frontend\GameOptions; // Import framework stuff -use Org\Mxchange\CoreFramework\Database\Frontend\BaseDatabaseWrapper; +use Org\Mxchange\CoreFramework\Database\Frontend\BaseDatabaseFrontend; use Org\Mxchange\CoreFramework\Registry\Registerable; /** - * A database wrapper for game options + * A database frontend for game options * * @author Roland Haeder * @version 0.0.0 @@ -28,7 +28,7 @@ use Org\Mxchange\CoreFramework\Registry\Registerable; * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -class CityGameOptionsDatabaseWrapper extends BaseDatabaseWrapper implements CityGameOptionsWrapper, Registerable { +class CityGameOptionsDatabaseFrontend extends BaseDatabaseFrontend implements CityGameOptionsFrontend, Registerable { // Constants for database table names const DB_TABLE_GAME_OPTION_INFORMATION = 'game_options'; @@ -48,18 +48,18 @@ class CityGameOptionsDatabaseWrapper extends BaseDatabaseWrapper implements City } /** - * Creates an instance of this database wrapper by a provided user class + * Creates an instance of this database frontend by a provided user class * - * @return $wrapperInstance An instance of the created wrapper class + * @return $frontendInstance An instance of the created frontend class */ - public static final function createCityGameOptionsDatabaseWrapper () { + public static final function createCityGameOptionsDatabaseFrontend () { // Get a new instance - $wrapperInstance = new CityGameOptionsDatabaseWrapper(); + $frontendInstance = new CityGameOptionsDatabaseFrontend(); // Set (primary!) table name - $wrapperInstance->setTableName(self::DB_TABLE_GAME_OPTION_INFORMATION); + $frontendInstance->setTableName(self::DB_TABLE_GAME_OPTION_INFORMATION); // Return the instance - return $wrapperInstance; + return $frontendInstance; } } diff --git a/application/city/classes/database/frontend/region/.htaccess b/application/city/classes/database/frontend/region/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/city/classes/database/frontend/region/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/city/classes/database/frontend/region/class_RegionInformationDatabaseWrapper.php b/application/city/classes/database/frontend/region/class_RegionInformationDatabaseWrapper.php index 3938f93..a670a21 100644 --- a/application/city/classes/database/frontend/region/class_RegionInformationDatabaseWrapper.php +++ b/application/city/classes/database/frontend/region/class_RegionInformationDatabaseWrapper.php @@ -6,13 +6,13 @@ namespace Org\Mxchange\City\Database\Frontend\RegionInformation; use Org\Mxchange\City\Factory\Manager\ManagerFactory; // Import framework stuff -use Org\Mxchange\CoreFramework\Database\Frontend\BaseDatabaseWrapper; +use Org\Mxchange\CoreFramework\Database\Frontend\BaseDatabaseFrontend; use Org\Mxchange\CoreFramework\Factory\ObjectFactory; use Org\Mxchange\CoreFramework\Registry\GenericRegistry; use Org\Mxchange\CoreFramework\Registry\Registerable; /** - * A database wrapper for region informations + * A database frontend for region informations * * @author Roland Haeder * @version 0.0.0 @@ -33,7 +33,7 @@ use Org\Mxchange\CoreFramework\Registry\Registerable; * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -class RegionInformationDatabaseWrapper extends BaseDatabaseWrapper implements RegionInformationWrapper, Registerable { +class RegionInformationDatabaseFrontend extends BaseDatabaseFrontend implements RegionInformationFrontend, Registerable { // Constants for database table names const DB_TABLE_REGION_INFORMATION = 'region_data'; @@ -53,19 +53,19 @@ class RegionInformationDatabaseWrapper extends BaseDatabaseWrapper implements Re } /** - * Creates an instance of this database wrapper by a provided user class + * Creates an instance of this database frontend by a provided user class * - * @return $wrapperInstance An instance of the created wrapper class + * @return $frontendInstance An instance of the created frontend class */ - public static final function createRegionInformationDatabaseWrapper () { + public static final function createRegionInformationDatabaseFrontend () { // Get a new instance - $wrapperInstance = new RegionInformationDatabaseWrapper(); + $frontendInstance = new RegionInformationDatabaseFrontend(); // Set (primary!) table name - $wrapperInstance->setTableName(self::DB_TABLE_REGION_INFORMATION); + $frontendInstance->setTableName(self::DB_TABLE_REGION_INFORMATION); // Return the instance - return $wrapperInstance; + return $frontendInstance; } /** @@ -96,7 +96,7 @@ class RegionInformationDatabaseWrapper extends BaseDatabaseWrapper implements Re $searchInstance = ObjectFactory::createObjectByConfiguredName('search_criteria_class'); // Search for user's cities - $searchInstance->addCriteria(RegionInformationDatabaseWrapper::DB_COLUMN_REGION_USER_ID, $userInstance->getUserId()); + $searchInstance->addCriteria(RegionInformationDatabaseFrontend::DB_COLUMN_REGION_USER_ID, $userInstance->getUserId()); // Get a result back $resultInstance = $this->doSelectByCriteria($searchInstance); @@ -128,7 +128,7 @@ class RegionInformationDatabaseWrapper extends BaseDatabaseWrapper implements Re $searchInstance = ObjectFactory::createObjectByConfiguredName('search_criteria_class'); // Search for the region number one which is hard-coded the default - $searchInstance->addCriteria(RegionInformationDatabaseWrapper::DB_COLUMN_REGION_NAME, $regionName); + $searchInstance->addCriteria(RegionInformationDatabaseFrontend::DB_COLUMN_REGION_NAME, $regionName); $searchInstance->setLimit(1); // Get a result back diff --git a/application/city/classes/database/frontend/region_map/.htaccess b/application/city/classes/database/frontend/region_map/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/city/classes/database/frontend/region_map/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/city/classes/database/frontend/region_map/class_RegionMapDatabaseWrapper.php b/application/city/classes/database/frontend/region_map/class_RegionMapDatabaseFrontend.php similarity index 83% rename from application/city/classes/database/frontend/region_map/class_RegionMapDatabaseWrapper.php rename to application/city/classes/database/frontend/region_map/class_RegionMapDatabaseFrontend.php index 9c2a2c2..6ddbdba 100644 --- a/application/city/classes/database/frontend/region_map/class_RegionMapDatabaseWrapper.php +++ b/application/city/classes/database/frontend/region_map/class_RegionMapDatabaseFrontend.php @@ -3,13 +3,13 @@ namespace Org\Mxchange\City\Database\Frontend\Region; // Import framework stuff -use Org\Mxchange\CoreFramework\Database\Frontend\BaseDatabaseWrapper; +use Org\Mxchange\CoreFramework\Database\Frontend\BaseDatabaseFrontend; use Org\Mxchange\CoreFramework\Factory\ObjectFactory; use Org\Mxchange\CoreFramework\Registry\GenericRegistry; use Org\Mxchange\CoreFramework\Registry\Registerable; /** - * A database wrapper for region maps + * A database frontend for region maps * * @author Roland Haeder * @version 0.0.0 @@ -30,7 +30,7 @@ use Org\Mxchange\CoreFramework\Registry\Registerable; * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -class RegionMapDatabaseWrapper extends BaseDatabaseWrapper implements RegionMapWrapper, Registerable { +class RegionMapDatabaseFrontend extends BaseDatabaseFrontend implements RegionMapFrontend, Registerable { // Constants for database table names const DB_TABLE_REGION_MAP = 'region_map'; @@ -48,19 +48,19 @@ class RegionMapDatabaseWrapper extends BaseDatabaseWrapper implements RegionMapW } /** - * Creates an instance of this database wrapper by a provided user class + * Creates an instance of this database frontend by a provided user class * - * @return $wrapperInstance An instance of the created wrapper class + * @return $frontendInstance An instance of the created frontend class */ - public static final function createRegionMapDatabaseWrapper () { + public static final function createRegionMapDatabaseFrontend () { // Get a new instance - $wrapperInstance = new RegionMapDatabaseWrapper(); + $frontendInstance = new RegionMapDatabaseFrontend(); // Set (primary!) table name - $wrapperInstance->setTableName(self::DB_TABLE_REGION_MAP); + $frontendInstance->setTableName(self::DB_TABLE_REGION_MAP); // Return the instance - return $wrapperInstance; + return $frontendInstance; } /** diff --git a/application/city/classes/factories/.htaccess b/application/city/classes/factories/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/city/classes/factories/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/city/classes/factories/city_daemon/.htaccess b/application/city/classes/factories/city_daemon/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/city/classes/factories/city_daemon/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/city/classes/factories/manager/.htaccess b/application/city/classes/factories/manager/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/city/classes/factories/manager/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/city/classes/factories/states/.htaccess b/application/city/classes/factories/states/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/city/classes/factories/states/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/city/classes/factories/states/city/.htaccess b/application/city/classes/factories/states/city/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/city/classes/factories/states/city/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/city/classes/filter/.htaccess b/application/city/classes/filter/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/city/classes/filter/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/city/classes/filter/bootstrap/.htaccess b/application/city/classes/filter/bootstrap/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/city/classes/filter/bootstrap/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/city/classes/filter/bootstrap/city_daemon/.htaccess b/application/city/classes/filter/bootstrap/city_daemon/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/city/classes/filter/bootstrap/city_daemon/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/city/classes/filter/bootstrap/init/.htaccess b/application/city/classes/filter/bootstrap/init/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/city/classes/filter/bootstrap/init/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/city/classes/filter/city_daemon/.htaccess b/application/city/classes/filter/city_daemon/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/city/classes/filter/city_daemon/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/city/classes/filter/class_BaseCityFilter.php b/application/city/classes/filter/class_BaseCityFilter.php index 2c99486..9d35f48 100644 --- a/application/city/classes/filter/class_BaseCityFilter.php +++ b/application/city/classes/filter/class_BaseCityFilter.php @@ -41,7 +41,7 @@ abstract class BaseCityFilter extends BaseFilter { * @param $className Real name of class * @return void */ - protected function __construct ($className) { + protected function __construct (string $className) { // Call parent constructor parent::__construct($className); } diff --git a/application/city/classes/filter/shutdown/.htaccess b/application/city/classes/filter/shutdown/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/city/classes/filter/shutdown/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/city/classes/filter/shutdown/city/.htaccess b/application/city/classes/filter/shutdown/city/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/city/classes/filter/shutdown/city/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/city/classes/filter/task/.htaccess b/application/city/classes/filter/task/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/city/classes/filter/task/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/city/classes/filter/task/city_daemon/.htaccess b/application/city/classes/filter/task/city_daemon/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/city/classes/filter/task/city_daemon/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/city/classes/filter/verifier/.htaccess b/application/city/classes/filter/verifier/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/city/classes/filter/verifier/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/city/classes/filter/verifier/class_CityNameVerifierFilter.php b/application/city/classes/filter/verifier/class_CityNameVerifierFilter.php index 6e0263b..cb9e6ca 100644 --- a/application/city/classes/filter/verifier/class_CityNameVerifierFilter.php +++ b/application/city/classes/filter/verifier/class_CityNameVerifierFilter.php @@ -3,7 +3,7 @@ namespace Org\Mxchange\City\Filter\Verifier; // Import application-specific stuff -use Org\Mxchange\City\Database\Frontend\Information\CityInformationDatabaseWrapper; +use Org\Mxchange\City\Database\Frontend\Information\CityInformationDatabaseFrontend; use Org\Mxchange\City\Factory\Manager\ManagerFactory; // Import framework stuff @@ -71,7 +71,7 @@ class CityNameVerifierFilter extends BaseFilter implements Filterable { */ public function execute (Requestable $requestInstance, Responseable $responseInstance) { // Get city name from request - $cityName = $requestInstance->getRequestElement(CityInformationDatabaseWrapper::DB_COLUMN_CITY_NAME); + $cityName = $requestInstance->getRequestElement(CityInformationDatabaseFrontend::DB_COLUMN_CITY_NAME); // Is the city name set? if (is_null($cityName)) { @@ -110,7 +110,7 @@ class CityNameVerifierFilter extends BaseFilter implements Filterable { * @param $cityName Cityname to check for existence * @return $alreadyTaken Whether the city name has been taken */ - private function ifCityNameIsTaken ($cityName) { + private function ifCityNameIsTaken (string $cityName) { // Get a new instance $managerInstance = ManagerFactory::createManagerByType('city'); diff --git a/application/city/classes/login/.htaccess b/application/city/classes/login/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/city/classes/login/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/city/classes/login/helper/.htaccess b/application/city/classes/login/helper/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/city/classes/login/helper/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/city/classes/manager/.htaccess b/application/city/classes/manager/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/city/classes/manager/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/city/classes/manager/city/.htaccess b/application/city/classes/manager/city/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/city/classes/manager/city/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/city/classes/manager/city/class_CityManager.php b/application/city/classes/manager/city/class_CityManager.php index 6d79528..0a962d4 100644 --- a/application/city/classes/manager/city/class_CityManager.php +++ b/application/city/classes/manager/city/class_CityManager.php @@ -3,12 +3,12 @@ namespace Org\Mxchange\City\Manager\City; // Import application-specific stuff -use Org\Mxchange\City\Database\Frontend\Information\CityInformationDatabaseWrapper; +use Org\Mxchange\City\Database\Frontend\Information\CityInformationDatabaseFrontend; use Org\Mxchange\City\Factory\Manager\ManagerFactory; // Import framework stuff use Org\Mxchange\CoreFramework\Bootstrap\FrameworkBootstrap; -use Org\Mxchange\CoreFramework\Factory\Database\Wrapper\DatabaseWrapperFactory; +use Org\Mxchange\CoreFramework\Factory\Database\Frontend\DatabaseFrontendFactory; use Org\Mxchange\CoreFramework\Request\Requestable; use Org\Mxchange\CoreFramework\Response\Responseable; @@ -54,11 +54,11 @@ class CityManager extends BaseManager implements ManageableCity { // Get new instance $managerInstance = new CityManager(); - // Get database wrapper - $wrapperInstance = DatabaseWrapperFactory::createWrapperByConfiguredName('city_info_db_wrapper_class'); + // Get database frontend + $frontendInstance = DatabaseFrontendFactory::createFrontendByConfiguredName('city_info_db_frontend_class'); // And set it here - $managerInstance->setWrapperInstance($wrapperInstance); + $managerInstance->setFrontendInstance($frontendInstance); // Return the prepared instance return $managerInstance; @@ -71,7 +71,7 @@ class CityManager extends BaseManager implements ManageableCity { */ public function isCityAlreadyFounded () { // Check if the currently set user has already founded a city - $isFounded = $this->getWrapperInstance()->ifUserHasFoundedCity(); + $isFounded = $this->getFrontendInstance()->ifUserHasFoundedCity(); // Return result return $isFounded; @@ -83,9 +83,9 @@ class CityManager extends BaseManager implements ManageableCity { * @para $cityName Name of city * @return $isTaken Whether the given city name is already taken */ - public function ifCityNameExists ($cityName) { + public function ifCityNameExists (string $cityName) { // Check if the given city name is taken - $isTaken = $this->getWrapperInstance()->ifCityExists($cityName); + $isTaken = $this->getFrontendInstance()->ifCityExists($cityName); // Return result return $isTaken; @@ -99,10 +99,10 @@ class CityManager extends BaseManager implements ManageableCity { public function foundFirstCity () { // Check on request instance and 'city_name' element assert(FrameworkBootstrap::getRequestInstance() instanceof Requestable); - assert(FrameworkBootstrap::getRequestInstance()->isRequestElementSet(CityInformationDatabaseWrapper::DB_COLUMN_CITY_NAME)); + assert(FrameworkBootstrap::getRequestInstance()->isRequestElementSet(CityInformationDatabaseFrontend::DB_COLUMN_CITY_NAME)); // Get city name - $cityName = FrameworkBootstrap::getRequestInstance()->getRequestElement(CityInformationDatabaseWrapper::DB_COLUMN_CITY_NAME); + $cityName = FrameworkBootstrap::getRequestInstance()->getRequestElement(CityInformationDatabaseFrontend::DB_COLUMN_CITY_NAME); // Some pre-checks assert(!$this->isCityAlreadyFounded()); @@ -122,10 +122,10 @@ class CityManager extends BaseManager implements ManageableCity { $regionData = $regionResultInstance->current(); // Add region id from it - FrameworkBootstrap::getRequestInstance()->setRequestElement(CityInformationDatabaseWrapper::DB_COLUMN_CITY_REGION_ID, $regionData[RegionInformationDatabaseWrapper::DB_COLUMN_REGION_ID]); + FrameworkBootstrap::getRequestInstance()->setRequestElement(CityInformationDatabaseFrontend::DB_COLUMN_CITY_REGION_ID, $regionData[RegionInformationDatabaseFrontend::DB_COLUMN_REGION_ID]); // Then create the first city - $this->getWrapperInstance()->createCityByRequest(FrameworkBootstrap::getRequestInstance()); + $this->getFrontendInstance()->createCityByRequest(FrameworkBootstrap::getRequestInstance()); } /** diff --git a/application/city/classes/manager/city_entities/.htaccess b/application/city/classes/manager/city_entities/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/city/classes/manager/city_entities/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/city/classes/manager/city_entities/districts/.htaccess b/application/city/classes/manager/city_entities/districts/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/city/classes/manager/city_entities/districts/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all 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 038e22e..b4b26fa 100644 --- a/application/city/classes/manager/city_entities/districts/class_CityDistrictsManager.php +++ b/application/city/classes/manager/city_entities/districts/class_CityDistrictsManager.php @@ -2,9 +2,11 @@ // Own namespace namespace Org\Mxchange\City\Manager\Entities\Districts; +// Import application-specific stuff +use Org\Mxchange\City\Manager\BaseManager; + // Import framework stuff -use Org\Mxchange\CoreFramework\Factory\Database\Wrapper\DatabaseWrapperFactory; -use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem; +use Org\Mxchange\CoreFramework\Factory\Database\Frontend\DatabaseFrontendFactory; use Org\Mxchange\CoreFramework\Registry\Registerable; /** @@ -29,7 +31,7 @@ use Org\Mxchange\CoreFramework\Registry\Registerable; * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -class CityDistrictsManager extends BaseFrameworkSystem implements ManageableCityDistricts, Registerable { +class CityDistrictsManager extends BaseManager implements ManageableCityDistricts, Registerable { /** * Protected constructor * @@ -49,11 +51,11 @@ class CityDistrictsManager extends BaseFrameworkSystem implements ManageableCity // Get new instance $managerInstance = new CityDistrictsManager(); - // Get database wrapper - $wrapperInstance = DatabaseWrapperFactory::createWrapperByConfiguredName('city_districts_db_wrapper_class'); + // Get database frontend + $frontendInstance = DatabaseFrontendFactory::createFrontendByConfiguredName('city_districts_db_frontend_class'); // And set it here - $managerInstance->setWrapperInstance($wrapperInstance); + $managerInstance->setFrontendInstance($frontendInstance); // Return the prepared instance return $managerInstance; diff --git a/application/city/classes/manager/city_entities/lots/.htaccess b/application/city/classes/manager/city_entities/lots/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/city/classes/manager/city_entities/lots/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all 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 9a03e67..8090ed0 100644 --- a/application/city/classes/manager/city_entities/lots/class_CityLotsManager.php +++ b/application/city/classes/manager/city_entities/lots/class_CityLotsManager.php @@ -2,9 +2,11 @@ // Own namespace namespace Org\Mxchange\City\Manager\Entities\Lots; +// Import application-specific stuff +use Org\Mxchange\City\Manager\BaseManager; + // Import framework stuff -use Org\Mxchange\CoreFramework\Factory\Database\Wrapper\DatabaseWrapperFactory; -use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem; +use Org\Mxchange\CoreFramework\Factory\Database\Frontend\DatabaseFrontendFactory; use Org\Mxchange\CoreFramework\Registry\Registerable; /** @@ -29,7 +31,7 @@ use Org\Mxchange\CoreFramework\Registry\Registerable; * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -class CityLotsManager extends BaseFrameworkSystem implements ManageableCityLots, Registerable { +class CityLotsManager extends BaseManager implements ManageableCityLots, Registerable { /** * Protected constructor * @@ -49,11 +51,11 @@ class CityLotsManager extends BaseFrameworkSystem implements ManageableCityLots, // Get new instance $managerInstance = new CityLotsManager(); - // Get database wrapper - $wrapperInstance = DatabaseWrapperFactory::createWrapperByConfiguredName('city_lots_db_wrapper_class'); + // Get database frontend + $frontendInstance = DatabaseFrontendFactory::createFrontendByConfiguredName('city_lots_db_frontend_class'); // And set it here - $managerInstance->setWrapperInstance($wrapperInstance); + $managerInstance->setFrontendInstance($frontendInstance); // Return the prepared instance return $managerInstance; diff --git a/application/city/classes/manager/city_entities/sections/.htaccess b/application/city/classes/manager/city_entities/sections/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/city/classes/manager/city_entities/sections/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all 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 9f74e31..d9144a8 100644 --- a/application/city/classes/manager/city_entities/sections/class_CitySectionsManager.php +++ b/application/city/classes/manager/city_entities/sections/class_CitySectionsManager.php @@ -2,9 +2,11 @@ // Own namespace namespace Org\Mxchange\City\Manager\Entities\Sections; +// Load application-specific stuff +use Org\Mxchange\City\Manager\BaseManager; + // Import framework stuff -use Org\Mxchange\CoreFramework\Factory\Database\Wrapper\DatabaseWrapperFactory; -use Org\Mxchange\CoreFramework\Object\BaseFrameworkSystem; +use Org\Mxchange\CoreFramework\Factory\Database\Frontend\DatabaseFrontendFactory; use Org\Mxchange\CoreFramework\Registry\Registerable; /** @@ -29,7 +31,7 @@ use Org\Mxchange\CoreFramework\Registry\Registerable; * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -class CitySectionsManager extends BaseFrameworkSystem implements ManageableCitySections, Registerable { +class CitySectionsManager extends BaseManager implements ManageableCitySections, Registerable { /** * Protected constructor * @@ -49,11 +51,11 @@ class CitySectionsManager extends BaseFrameworkSystem implements ManageableCityS // Get new instance $managerInstance = new CitySectionsManager(); - // Get database wrapper - $wrapperInstance = DatabaseWrapperFactory::createWrapperByConfiguredName('city_sections_db_wrapper_class'); + // Get database frontend + $frontendInstance = DatabaseFrontendFactory::createFrontendByConfiguredName('city_sections_db_frontend_class'); // And set it here - $managerInstance->setWrapperInstance($wrapperInstance); + $managerInstance->setFrontendInstance($frontendInstance); // Return the prepared instance return $managerInstance; @@ -70,7 +72,7 @@ class CitySectionsManager extends BaseFrameworkSystem implements ManageableCityS $requireExpansion = FALSE; // First, a simple check if the sections table contains any entries at all - if ($this->getWrapperInstance()->countTotalRows() == 0) { + if ($this->getFrontendInstance()->countTotalRows() == 0) { // This definedly requires expansion $requireExpansion = TRUE; } // END - if @@ -87,18 +89,18 @@ class CitySectionsManager extends BaseFrameworkSystem implements ManageableCityS * @todo z-coordinate not used */ public function expandMaps () { - // Get a city info wrapper instance - $cityWrapperInstance = DatabaseWrapperFactory::createWrapperByConfiguredName('city_info_db_wrapper_class'); + // Get a city info frontend instance + $cityFrontendInstance = DatabaseFrontendFactory::createFrontendByConfiguredName('city_info_db_frontend_class'); // Get all city ids from it - $cityIds = $cityWrapperInstance->getAllCityIds(); + $cityIds = $cityFrontendInstance->getAllCityIds(); // Now check all ids foreach ($cityIds as $cityId) { // Does this id have any sections - if (!$this->getWrapperInstance()->ifCityHasSections($cityId)) { + if (!$this->getFrontendInstance()->ifCityHasSections($cityId)) { // Nothing found, so it is a brand-new city that needs first initialization - $sections = $this->getWrapperInstance()->doInitialCityExpansion($cityId); + $sections = $this->getFrontendInstance()->doInitialCityExpansion($cityId); } else { // @TODO Maybe some expansion is needed } diff --git a/application/city/classes/manager/class_BaseManager.php b/application/city/classes/manager/class_BaseManager.php index 4fc07fa..251f265 100644 --- a/application/city/classes/manager/class_BaseManager.php +++ b/application/city/classes/manager/class_BaseManager.php @@ -7,6 +7,7 @@ use Org\Mxchange\City\Generic\BaseCitySystem; // Import framework stuff use Org\Mxchange\CoreFramework\Registry\Registerable; +use Org\Mxchange\CoreFramework\Traits\Database\Frontend\DatabaseFrontendTrait; /** * A general Manager class @@ -31,13 +32,16 @@ use Org\Mxchange\CoreFramework\Registry\Registerable; * along with this program. If not, see . */ abstract class BaseManager extends BaseCitySystem implements Manageable, Registerable { + // Load traits + use DatabaseFrontendTrait; + /** * Protected constructor * * @param $className Name of the class * @return void */ - protected function __construct ($className) { + protected function __construct (string $className) { // Call parent constructor parent::__construct($className); } diff --git a/application/city/classes/manager/game/.htaccess b/application/city/classes/manager/game/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/city/classes/manager/game/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/city/classes/manager/game/class_GameOptionsManager.php b/application/city/classes/manager/game/class_GameOptionsManager.php index 6eea04d..aa2ae4c 100644 --- a/application/city/classes/manager/game/class_GameOptionsManager.php +++ b/application/city/classes/manager/game/class_GameOptionsManager.php @@ -3,7 +3,7 @@ namespace Org\Mxchange\City\Manager\Region; // Import framework stuff -use Org\Mxchange\CoreFramework\Factory\Database\Wrapper\DatabaseWrapperFactory; +use Org\Mxchange\CoreFramework\Factory\Database\Frontend\DatabaseFrontendFactory; /** * A game manager @@ -47,11 +47,11 @@ class GameOptionsManager extends BaseManager implements ManageableGame { // Get new instance $managerInstance = new GameOptionsManager(); - // Get database wrapper - $wrapperInstance = DatabaseWrapperFactory::createWrapperByConfiguredName('game_options_db_wrapper_class'); + // Get database frontend + $frontendInstance = DatabaseFrontendFactory::createFrontendByConfiguredName('game_options_db_frontend_class'); // And set it here - $managerInstance->setWrapperInstance($wrapperInstance); + $managerInstance->setFrontendInstance($frontendInstance); // Return the prepared instance return $managerInstance; diff --git a/application/city/classes/manager/region/.htaccess b/application/city/classes/manager/region/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/city/classes/manager/region/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/city/classes/manager/region/class_RegionManager.php b/application/city/classes/manager/region/class_RegionManager.php index 1872cf5..b5cfaf1 100644 --- a/application/city/classes/manager/region/class_RegionManager.php +++ b/application/city/classes/manager/region/class_RegionManager.php @@ -3,7 +3,7 @@ namespace Org\Mxchange\City\Manager\Region; // Import framework stuff -use Org\Mxchange\CoreFramework\Factory\Database\Wrapper\DatabaseWrapperFactory; +use Org\Mxchange\CoreFramework\Factory\Database\Frontend\DatabaseFrontendFactory; /** * A Region manager @@ -47,11 +47,11 @@ class RegionManager extends BaseManager implements ManageableRegion { // Get new instance $managerInstance = new RegionManager(); - // Get database wrapper - $wrapperInstance = DatabaseWrapperFactory::createWrapperByConfiguredName('region_info_db_wrapper_class'); + // Get database frontend + $frontendInstance = DatabaseFrontendFactory::createFrontendByConfiguredName('region_info_db_frontend_class'); // And set it here - $managerInstance->setWrapperInstance($wrapperInstance); + $managerInstance->setFrontendInstance($frontendInstance); // Return the prepared instance return $managerInstance; @@ -64,7 +64,7 @@ class RegionManager extends BaseManager implements ManageableRegion { */ public function ifUserHasCreatedRegion () { // Check if the currently set user has already founded a region - $isFounded = $this->getWrapperInstance()->ifUserHasCreatedRegion(); + $isFounded = $this->getFrontendInstance()->ifUserHasCreatedRegion(); // Return result return $isFounded; @@ -78,7 +78,7 @@ class RegionManager extends BaseManager implements ManageableRegion { */ public function ifRegionNameExists ($regionName) { // Check if the given region name is taken - $isTaken = $this->getWrapperInstance()->ifRegionExists($regionName); + $isTaken = $this->getFrontendInstance()->ifRegionExists($regionName); // Return result return $isTaken; @@ -99,7 +99,7 @@ class RegionManager extends BaseManager implements ManageableRegion { assert(!$this->ifRegionNameExists($regionName)); // First region can now be created - $this->getWrapperInstance()->createRegionByName($regionName); + $this->getFrontendInstance()->createRegionByName($regionName); // Then try to find it assert($this->ifRegionNameExists($regionName)); diff --git a/application/city/classes/manager/region/class_RegionMapManager.php b/application/city/classes/manager/region/class_RegionMapManager.php index 9b894cb..1e3b774 100644 --- a/application/city/classes/manager/region/class_RegionMapManager.php +++ b/application/city/classes/manager/region/class_RegionMapManager.php @@ -3,7 +3,7 @@ namespace Org\Mxchange\City\Manager\RegionMap; // Import framework stuff -use Org\Mxchange\CoreFramework\Factory\Database\Wrapper\DatabaseWrapperFactory; +use Org\Mxchange\CoreFramework\Factory\Database\Frontend\DatabaseFrontendFactory; /** * A region map manager @@ -47,11 +47,11 @@ class RegionMapManager extends BaseManager implements ManageableRegionMap { // Get new instance $managerInstance = new RegionMapManager(); - // Get database wrapper - $wrapperInstance = DatabaseWrapperFactory::createWrapperByConfiguredName('region_map_db_wrapper_class'); + // Get database frontend + $frontendInstance = DatabaseFrontendFactory::createFrontendByConfiguredName('region_map_db_frontend_class'); // And set it here - $managerInstance->setWrapperInstance($wrapperInstance); + $managerInstance->setFrontendInstance($frontendInstance); // Return the prepared instance return $managerInstance; diff --git a/application/city/classes/menu/.htaccess b/application/city/classes/menu/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/city/classes/menu/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/city/classes/menu/government/.htaccess b/application/city/classes/menu/government/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/city/classes/menu/government/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/city/classes/registration/.htaccess b/application/city/classes/registration/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/city/classes/registration/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/city/classes/registration/class_CityRegistration.php b/application/city/classes/registration/class_CityRegistration.php index 5c1e74b..5e2680d 100644 --- a/application/city/classes/registration/class_CityRegistration.php +++ b/application/city/classes/registration/class_CityRegistration.php @@ -5,8 +5,8 @@ namespace Org\Mxchange\City\Registration; // Import framework stuff use Org\Mxchange\CoreFramework\Bootstrap\FrameworkBootstrap; use Org\Mxchange\CoreFramework\Criteria\Storing\StoreableCriteria; -use Org\Mxchange\CoreFramework\Database\Frontend\User\UserDatabaseWrapper; -use Org\Mxchange\CoreFramework\Factory\Database\Wrapper\DatabaseWrapperFactory; +use Org\Mxchange\CoreFramework\Database\Frontend\User\UserDatabaseFrontend; +use Org\Mxchange\CoreFramework\Factory\Database\Frontend\DatabaseFrontendFactory; use Org\Mxchange\CoreFramework\Factory\ObjectFactory; use Org\Mxchange\CoreFramework\Registration\BaseRegistration; use Org\Mxchange\CoreFramework\Registration\User\UserRegister; @@ -132,11 +132,11 @@ class CityRegistration extends BaseRegistration implements UserRegister { * @todo Maybe add more things to perform */ public function registerNewUser () { - // Get a user database wrapper - $wrapperInstance = DatabaseWrapperFactory::createWrapperByConfiguredName('user_db_wrapper_class'); + // Get a user database frontend + $frontendInstance = DatabaseFrontendFactory::createFrontendByConfiguredName('user_db_frontend_class'); // Use this instance to insert the whole registration instance - $wrapperInstance->insertRegistrationObject($this); + $frontendInstance->insertRegistrationObject($this); } /** @@ -207,10 +207,10 @@ class CityRegistration extends BaseRegistration implements UserRegister { } // END - foreach // Mark the username as unique key - $criteriaInstance->setUniqueKey(UserDatabaseWrapper::DB_COLUMN_USERNAME); + $criteriaInstance->setUniqueKey(UserDatabaseFrontend::DB_COLUMN_USERNAME); // Add account status as configured - $criteriaInstance->addConfiguredCriteria(UserDatabaseWrapper::DB_COLUMN_USER_STATUS, $configEntry); + $criteriaInstance->addConfiguredCriteria(UserDatabaseFrontend::DB_COLUMN_USER_STATUS, $configEntry); // Include registration timestamp $criteriaInstance->addCriteria('registered', date('Y-m-d H:i:s', time())); diff --git a/application/city/classes/resolver/.htaccess b/application/city/classes/resolver/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/city/classes/resolver/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/city/classes/resolver/command/.htaccess b/application/city/classes/resolver/command/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/city/classes/resolver/command/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/city/classes/resolver/command/console/.htaccess b/application/city/classes/resolver/command/console/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/city/classes/resolver/command/console/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/city/classes/resolver/command/html/.htaccess b/application/city/classes/resolver/command/html/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/city/classes/resolver/command/html/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/city/classes/resolver/controller/.htaccess b/application/city/classes/resolver/controller/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/city/classes/resolver/controller/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/city/classes/resolver/controller/console/.htaccess b/application/city/classes/resolver/controller/console/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/city/classes/resolver/controller/console/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/city/classes/resolver/controller/html/.htaccess b/application/city/classes/resolver/controller/html/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/city/classes/resolver/controller/html/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/city/classes/resolver/controller/image/.htaccess b/application/city/classes/resolver/controller/image/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/city/classes/resolver/controller/image/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/city/classes/states/.htaccess b/application/city/classes/states/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/city/classes/states/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/city/classes/states/city/.htaccess b/application/city/classes/states/city/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/city/classes/states/city/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/city/classes/states/city/active/.htaccess b/application/city/classes/states/city/active/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/city/classes/states/city/active/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/city/classes/states/city/class_BaseCityState.php b/application/city/classes/states/city/class_BaseCityState.php index 11e8dd6..0394e00 100644 --- a/application/city/classes/states/city/class_BaseCityState.php +++ b/application/city/classes/states/city/class_BaseCityState.php @@ -37,7 +37,7 @@ abstract class BaseCityState extends BaseState { * @param $className Name of the class * @return void */ - protected function __construct ($className) { + protected function __construct (string $className) { // Call parent constructor parent::__construct($className); } diff --git a/application/city/classes/states/city/init/.htaccess b/application/city/classes/states/city/init/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/city/classes/states/city/init/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/city/classes/tasks/.htaccess b/application/city/classes/tasks/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/city/classes/tasks/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/city/classes/tasks/class_BaseCityTask.php b/application/city/classes/tasks/class_BaseCityTask.php index a489bbd..55eb89e 100644 --- a/application/city/classes/tasks/class_BaseCityTask.php +++ b/application/city/classes/tasks/class_BaseCityTask.php @@ -42,7 +42,7 @@ abstract class BaseCityTask extends BaseTask { * @param $className Name of the class * @return void */ - protected function __construct ($className) { + protected function __construct (string $className) { // Call parent constructor parent::__construct($className); } diff --git a/application/city/classes/tasks/daemon/.htaccess b/application/city/classes/tasks/daemon/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/city/classes/tasks/daemon/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/city/classes/tasks/daemon/building/.htaccess b/application/city/classes/tasks/daemon/building/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/city/classes/tasks/daemon/building/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/city/classes/tasks/daemon/household/.htaccess b/application/city/classes/tasks/daemon/household/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/city/classes/tasks/daemon/household/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/city/classes/tasks/daemon/map_expander/.htaccess b/application/city/classes/tasks/daemon/map_expander/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/city/classes/tasks/daemon/map_expander/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/city/classes/visitor/.htaccess b/application/city/classes/visitor/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/city/classes/visitor/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/city/classes/visitor/tasks/.htaccess b/application/city/classes/visitor/tasks/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/city/classes/visitor/tasks/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/city/config.php b/application/city/config.php index 6a602fd..9aa9346 100644 --- a/application/city/config.php +++ b/application/city/config.php @@ -44,25 +44,25 @@ $cfg->setConfigEntry('news_process_filter_class', 'Org\Mxchange\CoreFramework\Fi $cfg->setConfigEntry('news_reader_class', 'Org\Mxchange\CoreFramework\Reader\News\Console\ConsoleNewsReader'); // CFG: CITY-INFO-DB-WRAPPER-CLASS -$cfg->setConfigEntry('city_info_db_wrapper_class', 'Org\Mxchange\City\Database\Frontend\Information\CityInformationDatabaseWrapper'); +$cfg->setConfigEntry('city_info_db_frontend_class', 'Org\Mxchange\City\Database\Frontend\Information\CityInformationDatabaseFrontend'); // CFG: REGION-INFO-DB-WRAPPER-CLASS -$cfg->setConfigEntry('region_info_db_wrapper_class', 'Org\Mxchange\City\Database\Frontend\RegionInformation\RegionInformationDatabaseWrapper'); +$cfg->setConfigEntry('region_info_db_frontend_class', 'Org\Mxchange\City\Database\Frontend\RegionInformation\RegionInformationDatabaseFrontend'); // CFG: GAME-OPTIONS-DB-WRAPPER-CLASS -$cfg->setConfigEntry('game_options_db_wrapper_class', 'Org\Mxchange\City\Database\Frontend\GameOptions\CityGameOptionsDatabaseWrapper'); +$cfg->setConfigEntry('game_options_db_frontend_class', 'Org\Mxchange\City\Database\Frontend\GameOptions\CityGameOptionsDatabaseFrontend'); // CFG: REGION-MAP-DB-WRAPPER-CLASS -$cfg->setConfigEntry('region_map_db_wrapper_class', 'Org\Mxchange\City\Database\Frontend\Region\RegionMapDatabaseWrapper'); +$cfg->setConfigEntry('region_map_db_frontend_class', 'Org\Mxchange\City\Database\Frontend\Region\RegionMapDatabaseFrontend'); // CFG: CITY-SECTIONS-DB-WRAPPER-CLASS -$cfg->setConfigEntry('city_sections_db_wrapper_class', 'Org\Mxchange\City\Database\Frontend\Sections\CitySectionsDatabaseWrapper'); +$cfg->setConfigEntry('city_sections_db_frontend_class', 'Org\Mxchange\City\Database\Frontend\Sections\CitySectionsDatabaseFrontend'); // CFG: CITY-LOTS-DB-WRAPPER-CLASS -$cfg->setConfigEntry('city_lots_db_wrapper_class', 'Org\Mxchange\City\Database\Frontend\Lots\CityLotsDatabaseWrapper'); +$cfg->setConfigEntry('city_lots_db_frontend_class', 'Org\Mxchange\City\Database\Frontend\Lots\CityLotsDatabaseFrontend'); // CFG: CITY-DISTRICTS-DB-WRAPPER-CLASS -$cfg->setConfigEntry('city_districts_db_wrapper_class', 'Org\Mxchange\City\Database\Frontend\Districts\CityDistrictsDatabaseWrapper'); +$cfg->setConfigEntry('city_districts_db_frontend_class', 'Org\Mxchange\City\Database\Frontend\Districts\CityDistrictsDatabaseFrontend'); // CFG: CITY-INIT-STATE-CLASS $cfg->setConfigEntry('city_init_state_class', 'Org\Mxchange\City\State\Init\CityInitState'); @@ -468,13 +468,13 @@ $cfg->setConfigEntry('government_class', 'SimplifiedGovernment'); $cfg->setConfigEntry('bank_class', 'MoneyBank'); // CFG: USER-POINTS-DB-WRAPPER-CLASS -$cfg->setConfigEntry('user_points_db_wrapper_class', 'Org\Mxchange\CoreFramework\Database\Frontend\Points\UserPointsDatabaseWrapper'); +$cfg->setConfigEntry('user_points_db_frontend_class', 'Org\Mxchange\CoreFramework\Database\Frontend\Points\UserPointsDatabaseFrontend'); // CFG: USER-GOVERNMENT-WRAPPER-CLASS -$cfg->setConfigEntry('user_government_wrapper_class', 'UserGovernmentDatabaseWrapper'); +$cfg->setConfigEntry('user_government_frontend_class', 'UserGovernmentDatabaseFrontend'); // CFG: PAYMENT-DB-WRAPPER-CLASS -$cfg->setConfigEntry('payment_db_wrapper_class', 'Org\Mxchange\CoreFramework\Database\Frontend\PaymentsDatabaseWrapper'); +$cfg->setConfigEntry('payment_db_frontend_class', 'Org\Mxchange\CoreFramework\Database\Frontend\PaymentsDatabaseFrontend'); // CFG: LOGIN-ENABLED $cfg->setConfigEntry('login_enabled', 'Y'); diff --git a/application/city/exceptions/.htaccess b/application/city/exceptions/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/city/exceptions/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/city/interfaces/.htaccess b/application/city/interfaces/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/city/interfaces/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/city/interfaces/database/.htaccess b/application/city/interfaces/database/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/city/interfaces/database/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/city/interfaces/database/frontend/.htaccess b/application/city/interfaces/database/frontend/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/city/interfaces/database/frontend/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/city/interfaces/database/frontend/city/.htaccess b/application/city/interfaces/database/frontend/city/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/city/interfaces/database/frontend/city/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/city/interfaces/database/frontend/city/class_CityInformationWrapper.php b/application/city/interfaces/database/frontend/city/class_CityInformationFrontend.php similarity index 92% rename from application/city/interfaces/database/frontend/city/class_CityInformationWrapper.php rename to application/city/interfaces/database/frontend/city/class_CityInformationFrontend.php index 2de42b2..153245e 100644 --- a/application/city/interfaces/database/frontend/city/class_CityInformationWrapper.php +++ b/application/city/interfaces/database/frontend/city/class_CityInformationFrontend.php @@ -7,11 +7,11 @@ use Org\Mxchange\City\Daemon\BaseCityDaemon; use Org\Mxchange\City\Helper\CityHelper; // Import framework stuff -use Org\Mxchange\CoreFramework\Database\Frontend\DatabaseWrapper; +use Org\Mxchange\CoreFramework\Database\Frontend\DatabaseFrontend; use Org\Mxchange\CoreFramework\Request\Requestable; /** - * An interface for city-information (database) wrapper + * An interface for city-information (database) frontend * * @author Roland Haeder * @version 0.0.0 @@ -32,7 +32,7 @@ use Org\Mxchange\CoreFramework\Request\Requestable; * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -interface CityInformationWrapper extends DatabaseWrapper { +interface CityInformationFrontend extends DatabaseFrontend { /** * 'Registers' a new city id along with data provided in the city instance. * This may sound confusing but avoids double code very nicely... @@ -72,7 +72,7 @@ interface CityInformationWrapper extends DatabaseWrapper { * @para $cityName Name of city * @return $isTaken Whether the given city name is taken */ - function ifCityExists ($cityName); + function ifCityExists (string $cityName); /** * Creates a city from given request diff --git a/application/city/interfaces/database/frontend/city_entities/.htaccess b/application/city/interfaces/database/frontend/city_entities/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/city/interfaces/database/frontend/city_entities/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/city/interfaces/database/frontend/city_entities/districts/.htaccess b/application/city/interfaces/database/frontend/city_entities/districts/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/city/interfaces/database/frontend/city_entities/districts/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/city/interfaces/database/frontend/city_entities/districts/class_CityDistrictsWrapper.php b/application/city/interfaces/database/frontend/city_entities/districts/class_CityDistrictsFrontend.php similarity index 83% rename from application/city/interfaces/database/frontend/city_entities/districts/class_CityDistrictsWrapper.php rename to application/city/interfaces/database/frontend/city_entities/districts/class_CityDistrictsFrontend.php index 510bab2..383e138 100644 --- a/application/city/interfaces/database/frontend/city_entities/districts/class_CityDistrictsWrapper.php +++ b/application/city/interfaces/database/frontend/city_entities/districts/class_CityDistrictsFrontend.php @@ -3,10 +3,10 @@ namespace Org\Mxchange\City\Database\Frontend\Districts; // Import framework stuff -use Org\Mxchange\CoreFramework\Database\Frontend\DatabaseWrapper; +use Org\Mxchange\CoreFramework\Database\Frontend\DatabaseFrontend; /** - * An interface for city districts (database) wrapper + * An interface for city districts (database) frontend * * @author Roland Haeder * @version 0.0.0 @@ -27,12 +27,12 @@ use Org\Mxchange\CoreFramework\Database\Frontend\DatabaseWrapper; * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -interface CityDistrictsWrapper extends DatabaseWrapper { +interface CityDistrictsFrontend extends DatabaseFrontend { /** * Checks if the given city id is found in districts table * * @param $cityId City id to check * @return $isFound Whether the city id is found */ - function ifCityHasDistricts ($cityId); + function ifCityHasDistricts (int $cityId); } diff --git a/application/city/interfaces/database/frontend/city_entities/lots/.htaccess b/application/city/interfaces/database/frontend/city_entities/lots/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/city/interfaces/database/frontend/city_entities/lots/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/city/interfaces/database/frontend/city_entities/lots/class_CityLotsWrapper.php b/application/city/interfaces/database/frontend/city_entities/lots/class_CityLotsFrontend.php similarity index 84% rename from application/city/interfaces/database/frontend/city_entities/lots/class_CityLotsWrapper.php rename to application/city/interfaces/database/frontend/city_entities/lots/class_CityLotsFrontend.php index 93760a6..41e2d28 100644 --- a/application/city/interfaces/database/frontend/city_entities/lots/class_CityLotsWrapper.php +++ b/application/city/interfaces/database/frontend/city_entities/lots/class_CityLotsFrontend.php @@ -3,10 +3,10 @@ namespace Org\Mxchange\City\Database\Frontend\Lots; // Import framework stuff -use Org\Mxchange\CoreFramework\Database\Frontend\DatabaseWrapper; +use Org\Mxchange\CoreFramework\Database\Frontend\DatabaseFrontend; /** - * An interface for city lots (database) wrapper + * An interface for city lots (database) frontend * * @author Roland Haeder * @version 0.0.0 @@ -27,12 +27,12 @@ use Org\Mxchange\CoreFramework\Database\Frontend\DatabaseWrapper; * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -interface CityLotsWrapper extends DatabaseWrapper { +interface CityLotsFrontend extends DatabaseFrontend { /** * Checks if the given city id is found in lots table * * @param $cityId City id to check * @return $isFound Whether the city id is found */ - function ifCityHasLots ($cityId); + function ifCityHasLots (int $cityId); } diff --git a/application/city/interfaces/database/frontend/city_entities/sections/.htaccess b/application/city/interfaces/database/frontend/city_entities/sections/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/city/interfaces/database/frontend/city_entities/sections/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/city/interfaces/database/frontend/city_entities/sections/class_CitySectionsWrapper.php b/application/city/interfaces/database/frontend/city_entities/sections/class_CitySectionsFrontend.php similarity index 83% rename from application/city/interfaces/database/frontend/city_entities/sections/class_CitySectionsWrapper.php rename to application/city/interfaces/database/frontend/city_entities/sections/class_CitySectionsFrontend.php index 3d2c24d..f1bfd37 100644 --- a/application/city/interfaces/database/frontend/city_entities/sections/class_CitySectionsWrapper.php +++ b/application/city/interfaces/database/frontend/city_entities/sections/class_CitySectionsFrontend.php @@ -3,10 +3,10 @@ namespace Org\Mxchange\City\Database\Frontend\Sections; // Import framework stuff -use Org\Mxchange\CoreFramework\Database\Frontend\DatabaseWrapper; +use Org\Mxchange\CoreFramework\Database\Frontend\DatabaseFrontend; /** - * An interface for city sections (database) wrapper + * An interface for city sections (database) frontend * * @author Roland Haeder * @version 0.0.0 @@ -27,14 +27,14 @@ use Org\Mxchange\CoreFramework\Database\Frontend\DatabaseWrapper; * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -interface CitySectionsWrapper extends DatabaseWrapper { +interface CitySectionsFrontend extends DatabaseFrontend { /** * Checks if the given city id is found in sections table * * @param $cityId City id to check * @return $isFound Whether the city id is found */ - function ifCityHasSections ($cityId); + function ifCityHasSections (int $cityId); /** * Expands the sections table with initial data for given city id @@ -43,5 +43,5 @@ interface CitySectionsWrapper extends DatabaseWrapper { * @return $ids Sections ids from initial expansion * @todo z-coordinate not used */ - function doInitialCityExpansion ($cityId); + function doInitialCityExpansion (int $cityId); } diff --git a/application/city/interfaces/database/frontend/game_options/.htaccess b/application/city/interfaces/database/frontend/game_options/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/city/interfaces/database/frontend/game_options/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/city/interfaces/database/frontend/game_options/class_CityGameOptionsWrapper.php b/application/city/interfaces/database/frontend/game_options/class_CityGameOptionsFrontend.php similarity index 84% rename from application/city/interfaces/database/frontend/game_options/class_CityGameOptionsWrapper.php rename to application/city/interfaces/database/frontend/game_options/class_CityGameOptionsFrontend.php index 8734fac..8882a07 100644 --- a/application/city/interfaces/database/frontend/game_options/class_CityGameOptionsWrapper.php +++ b/application/city/interfaces/database/frontend/game_options/class_CityGameOptionsFrontend.php @@ -3,10 +3,10 @@ namespace Org\Mxchange\City\Database\Frontend\GameOptions; // Import framework stuff -use Org\Mxchange\CoreFramework\Database\Frontend\DatabaseWrapper; +use Org\Mxchange\CoreFramework\Database\Frontend\DatabaseFrontend; /** - * An interface for game options (database) wrapper + * An interface for game options (database) frontend * * @author Roland Haeder * @version 0.0.0 @@ -27,5 +27,5 @@ use Org\Mxchange\CoreFramework\Database\Frontend\DatabaseWrapper; * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -interface CityGameOptionsWrapper extends DatabaseWrapper { +interface CityGameOptionsFrontend extends DatabaseFrontend { } diff --git a/application/city/interfaces/database/frontend/region/.htaccess b/application/city/interfaces/database/frontend/region/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/city/interfaces/database/frontend/region/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/city/interfaces/database/frontend/region/class_RegionInformationWrapper.php b/application/city/interfaces/database/frontend/region/class_RegionInformationFrontend.php similarity index 90% rename from application/city/interfaces/database/frontend/region/class_RegionInformationWrapper.php rename to application/city/interfaces/database/frontend/region/class_RegionInformationFrontend.php index 5ee8646..7a9d9ba 100644 --- a/application/city/interfaces/database/frontend/region/class_RegionInformationWrapper.php +++ b/application/city/interfaces/database/frontend/region/class_RegionInformationFrontend.php @@ -3,10 +3,10 @@ namespace Org\Mxchange\City\Database\Frontend\Information\Region; // Import framework stuff -use Org\Mxchange\CoreFramework\Database\Frontend\DatabaseWrapper; +use Org\Mxchange\CoreFramework\Database\Frontend\DatabaseFrontend; /** - * An interface for region-information (database) wrapper + * An interface for region-information (database) frontend * * @author Roland Haeder * @version 0.0.0 @@ -27,7 +27,7 @@ use Org\Mxchange\CoreFramework\Database\Frontend\DatabaseWrapper; * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -interface RegionInformationWrapper extends DatabaseWrapper { +interface RegionInformationFrontend extends DatabaseFrontend { /** * Removes non-data from given array. * diff --git a/application/city/interfaces/database/frontend/region/class_RegionMapWrapper.php b/application/city/interfaces/database/frontend/region/class_RegionMapFrontend.php similarity index 84% rename from application/city/interfaces/database/frontend/region/class_RegionMapWrapper.php rename to application/city/interfaces/database/frontend/region/class_RegionMapFrontend.php index dafacba..7624732 100644 --- a/application/city/interfaces/database/frontend/region/class_RegionMapWrapper.php +++ b/application/city/interfaces/database/frontend/region/class_RegionMapFrontend.php @@ -3,10 +3,10 @@ namespace Org\Mxchange\City\Database\Frontend\RegionMap; // Import framework stuff -use Org\Mxchange\CoreFramework\Database\Frontend\DatabaseWrapper; +use Org\Mxchange\CoreFramework\Database\Frontend\DatabaseFrontend; /** - * An interface for region-map (database) wrapper + * An interface for region-map (database) frontend * * @author Roland Haeder * @version 0.0.0 @@ -27,5 +27,5 @@ use Org\Mxchange\CoreFramework\Database\Frontend\DatabaseWrapper; * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -interface RegionMapWrapper extends DatabaseWrapper { +interface RegionMapFrontend extends DatabaseFrontend { } diff --git a/application/city/interfaces/helper/.htaccess b/application/city/interfaces/helper/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/city/interfaces/helper/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/city/interfaces/helper/city/.htaccess b/application/city/interfaces/helper/city/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/city/interfaces/helper/city/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/city/interfaces/manager/.htaccess b/application/city/interfaces/manager/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/city/interfaces/manager/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/city/interfaces/manager/city/.htaccess b/application/city/interfaces/manager/city/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/city/interfaces/manager/city/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/city/interfaces/manager/city/class_ManageableCity.php b/application/city/interfaces/manager/city/class_ManageableCity.php index dd17ca3..6fe4dfc 100644 --- a/application/city/interfaces/manager/city/class_ManageableCity.php +++ b/application/city/interfaces/manager/city/class_ManageableCity.php @@ -42,7 +42,7 @@ interface ManageableCity extends Manageable { * @para $cityName Name of city * @return $isTaken Whether the given city name is already taken */ - function ifCityNameExists ($cityName); + function ifCityNameExists (string $cityName); /** * Founds the first city. A dummy region will also be created diff --git a/application/city/interfaces/manager/city_entities/.htaccess b/application/city/interfaces/manager/city_entities/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/city/interfaces/manager/city_entities/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/city/interfaces/manager/city_entities/districts/.htaccess b/application/city/interfaces/manager/city_entities/districts/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/city/interfaces/manager/city_entities/districts/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/city/interfaces/manager/city_entities/lots/.htaccess b/application/city/interfaces/manager/city_entities/lots/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/city/interfaces/manager/city_entities/lots/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/city/interfaces/manager/city_entities/sections/.htaccess b/application/city/interfaces/manager/city_entities/sections/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/city/interfaces/manager/city_entities/sections/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/city/interfaces/manager/region/.htaccess b/application/city/interfaces/manager/region/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/city/interfaces/manager/region/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/city/language/.htaccess b/application/city/language/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/city/language/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/city/templates/.htaccess b/application/city/templates/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/city/templates/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/city/templates/code/.htaccess b/application/city/templates/code/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/city/templates/code/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/city/templates/emails/.htaccess b/application/city/templates/emails/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/city/templates/emails/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/city/templates/html/.htaccess b/application/city/templates/html/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/city/templates/html/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/city/templates/image/.htaccess b/application/city/templates/image/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/city/templates/image/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/application/city/templates/menu/.htaccess b/application/city/templates/menu/.htaccess deleted file mode 100644 index 3a42882..0000000 --- a/application/city/templates/menu/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all diff --git a/core b/core index 28ff071..303d853 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 28ff0710d8eb3a2d0c1547d6ebeaae05eb50c7f6 +Subproject commit 303d853c3d98734f9d7a1a0445c98b6d6c444945 -- 2.39.5