From d3b672c1a865d955e07bd319ca4270d93f3f86e7 Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Mon, 23 Mar 2015 16:10:09 +0100 Subject: [PATCH] Little change, big impact as the class prefix has changed, so let's move on with renaming 'web' to 'html'. And updated 'core'. Signed-off-by: Roland Haeder --- application/city/config.php | 8 ++++---- .../main/commands/{web => html}/.htaccess | 0 .../class_CityHtmlMainCommand.php} | 6 +++--- .../resolver/command/{web => html}/.htaccess | 0 .../class_CityHtmlCommandResolver.php} | 20 +++++++++---------- .../class_CityHtmlControllerResolver.php | 4 ++-- core | 2 +- 7 files changed, 20 insertions(+), 20 deletions(-) rename application/city/main/commands/{web => html}/.htaccess (100%) rename application/city/main/commands/{web/class_CityWebMainCommand.php => html/class_CityHtmlMainCommand.php} (91%) rename application/city/main/resolver/command/{web => html}/.htaccess (100%) rename application/city/main/resolver/command/{web/class_CityWebCommandResolver.php => html/class_CityHtmlCommandResolver.php} (89%) diff --git a/application/city/config.php b/application/city/config.php index 02b063d..af7d9ed 100644 --- a/application/city/config.php +++ b/application/city/config.php @@ -24,11 +24,11 @@ // Some hub-specific configuration like port hostname where we will listen, etc. $cfg = FrameworkConfiguration::getSelfInstance(); -// CFG: DEFAULT-WEB-COMMAND -$cfg->setConfigEntry('default_web_command', 'main'); +// CFG: DEFAULT-HTML-COMMAND +$cfg->setConfigEntry('default_html_command', 'main'); -// CFG: WEB-CMD-MAIN-RESOLVER-CLASS -$cfg->setConfigEntry('web_cmd_main_resolver_class', 'CityWebCommandResolver'); +// CFG: HTML-CMD-MAIN-RESOLVER-CLASS +$cfg->setConfigEntry('html_cmd_main_resolver_class', 'CityHtmlCommandResolver'); // CFG: NEWS-DOWNLOAD-FILTER $cfg->setConfigEntry('news_download_filter', 'NewsDownloadFilter'); diff --git a/application/city/main/commands/web/.htaccess b/application/city/main/commands/html/.htaccess similarity index 100% rename from application/city/main/commands/web/.htaccess rename to application/city/main/commands/html/.htaccess diff --git a/application/city/main/commands/web/class_CityWebMainCommand.php b/application/city/main/commands/html/class_CityHtmlMainCommand.php similarity index 91% rename from application/city/main/commands/web/class_CityWebMainCommand.php rename to application/city/main/commands/html/class_CityHtmlMainCommand.php index f1dc651..826144d 100644 --- a/application/city/main/commands/web/class_CityWebMainCommand.php +++ b/application/city/main/commands/html/class_CityHtmlMainCommand.php @@ -21,7 +21,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -class CityWebMainCommand extends BaseCommand implements Commandable { +class CityHtmlMainCommand extends BaseCommand implements Commandable { /** * Protected constructor * @@ -38,9 +38,9 @@ class CityWebMainCommand extends BaseCommand implements Commandable { * @param $resolverInstance An instance of a command resolver class * @return $commandInstance An instance a prepared command class */ - public static final function createCityWebMainCommand (CommandResolver $resolverInstance) { + public static final function createCityHtmlMainCommand (CommandResolver $resolverInstance) { // Get new instance - $commandInstance = new CityWebMainCommand(); + $commandInstance = new CityHtmlMainCommand(); // Set the application instance $commandInstance->setResolverInstance($resolverInstance); diff --git a/application/city/main/resolver/command/web/.htaccess b/application/city/main/resolver/command/html/.htaccess similarity index 100% rename from application/city/main/resolver/command/web/.htaccess rename to application/city/main/resolver/command/html/.htaccess diff --git a/application/city/main/resolver/command/web/class_CityWebCommandResolver.php b/application/city/main/resolver/command/html/class_CityHtmlCommandResolver.php similarity index 89% rename from application/city/main/resolver/command/web/class_CityWebCommandResolver.php rename to application/city/main/resolver/command/html/class_CityHtmlCommandResolver.php index 68de2a8..5dd265c 100644 --- a/application/city/main/resolver/command/web/class_CityWebCommandResolver.php +++ b/application/city/main/resolver/command/html/class_CityHtmlCommandResolver.php @@ -1,6 +1,6 @@ * @version 0.0.0 @@ -21,7 +21,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -class CityWebCommandResolver extends BaseCommandResolver implements CommandResolver { +class CityHtmlCommandResolver extends BaseCommandResolver implements CommandResolver { /** * Protected constructor * @@ -31,12 +31,12 @@ class CityWebCommandResolver extends BaseCommandResolver implements CommandResol // Call parent constructor parent::__construct(__CLASS__); - // Set prefix to "CityWeb" - $this->setClassPrefix('CityWeb'); + // Set prefix to "CityHtml" + $this->setClassPrefix('CityHtml'); } /** - * Creates an instance of a CityWeb command resolver with a given default command + * Creates an instance of a CityHtml command resolver with a given default command * * @param $commandName The default command we shall execute * @param $applicationInstance An instance of a manageable application helper class @@ -44,9 +44,9 @@ class CityWebCommandResolver extends BaseCommandResolver implements CommandResol * @throws EmptyVariableException Thrown if default command is not set * @throws InvalidCommandException Thrown if default command is invalid */ - public static final function createCityWebCommandResolver ($commandName, ManageableApplication $applicationInstance) { + public static final function createCityHtmlCommandResolver ($commandName, ManageableApplication $applicationInstance) { // Create the new instance - $resolverInstance = new CityWebCommandResolver(); + $resolverInstance = new CityHtmlCommandResolver(); // Is the variable $commandName set and the command is valid? if (empty($commandName)) { @@ -84,7 +84,7 @@ class CityWebCommandResolver extends BaseCommandResolver implements CommandResol $commandName = $requestInstance->getRequestElement('command'); // Is the command empty? Then fall back to default command - if (empty($commandName)) $commandName = $this->getConfigInstance()->getConfigEntry('default_web_command'); + if (empty($commandName)) $commandName = $this->getConfigInstance()->getConfigEntry('default_html_command'); // Check if command is valid if ($this->isCommandValid($commandName) === FALSE) { @@ -120,7 +120,7 @@ class CityWebCommandResolver extends BaseCommandResolver implements CommandResol $commandInstance = NULL; // Is the command empty? Then fall back to default command - if (empty($commandName)) $commandName = $this->getConfigInstance()->getConfigEntry('default_web_command'); + if (empty($commandName)) $commandName = $this->getConfigInstance()->getConfigEntry('default_html_command'); // Check if command is valid if ($this->isCommandValid($commandName) === FALSE) { @@ -148,7 +148,7 @@ class CityWebCommandResolver extends BaseCommandResolver implements CommandResol $commandInstance = NULL; // Create class name - $className = 'CityWeb' . $this->convertToClassName($commandName) . 'Command'; + $className = $this->getClassPrefix() . $this->convertToClassName($commandName) . 'Command'; // Create command class name $this->setClassName($className); diff --git a/application/city/main/resolver/controller/class_CityHtmlControllerResolver.php b/application/city/main/resolver/controller/class_CityHtmlControllerResolver.php index 30d8af9..96df86b 100644 --- a/application/city/main/resolver/controller/class_CityHtmlControllerResolver.php +++ b/application/city/main/resolver/controller/class_CityHtmlControllerResolver.php @@ -31,8 +31,8 @@ class CityHtmlControllerResolver extends BaseControllerResolver implements Contr // Call parent constructor parent::__construct(__CLASS__); - // Set prefix to 'Web' - $this->setClassPrefix('Web'); + // Set prefix to 'Html' + $this->setClassPrefix('Html'); } /** diff --git a/core b/core index 71a395b..c22c08a 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit 71a395b898edb7aa582bac0a68ece9f6fbe9edcf +Subproject commit c22c08adbf7134688c55e78546510348b24ceb8f -- 2.39.5