From bf253b34754bf4690e79228b79838d3d63d5e4d4 Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Mon, 23 Mar 2015 15:11:31 +0100 Subject: [PATCH] Renamed classes to naming scheme + removed deprecated code + updated 'core'. Signed-off-by: Roland Haeder --- ...hp => class_CityHtmlControllerResolver.php} | 18 ++++-------------- core | 2 +- 2 files changed, 5 insertions(+), 15 deletions(-) rename application/city/main/resolver/controller/{class_CityHttpControllerResolver.php => class_CityHtmlControllerResolver.php} (89%) diff --git a/application/city/main/resolver/controller/class_CityHttpControllerResolver.php b/application/city/main/resolver/controller/class_CityHtmlControllerResolver.php similarity index 89% rename from application/city/main/resolver/controller/class_CityHttpControllerResolver.php rename to application/city/main/resolver/controller/class_CityHtmlControllerResolver.php index f7b9f02..30d8af9 100644 --- a/application/city/main/resolver/controller/class_CityHttpControllerResolver.php +++ b/application/city/main/resolver/controller/class_CityHtmlControllerResolver.php @@ -21,17 +21,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -class CityHttpControllerResolver extends BaseControllerResolver implements ControllerResolver { - /** - * Last successfull resolved controller (name) - */ - private $lastControllerName = ''; - - /** - * Last successfull resolved controller (instance) - */ - private $lastControllerInstance = NULL; - +class CityHtmlControllerResolver extends BaseControllerResolver implements ControllerResolver { /** * Protected constructor * @@ -54,9 +44,9 @@ class CityHttpControllerResolver extends BaseControllerResolver implements Contr * @throws EmptyVariableException Thrown if default command is not set * @throws InvalidControllerException Thrown if default controller is invalid */ - public static final function createCityHttpControllerResolver ($controllerName, ManageableApplication $applicationInstance) { + public static final function createCityHtmlControllerResolver ($controllerName, ManageableApplication $applicationInstance) { // Create the new instance - $resolverInstance = new CityHttpControllerResolver(); + $resolverInstance = new CityHtmlControllerResolver(); // Is the variable $controllerName set and the command is valid? if (empty($controllerName)) { @@ -90,7 +80,7 @@ class CityHttpControllerResolver extends BaseControllerResolver implements Contr $controllerName = ''; $controllerInstance = NULL; - // Get the command name + // Get the command name $controllerName = $this->getControllerName(); // Get the command diff --git a/core b/core index c9957db..71a395b 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit c9957db6d43f237e0e88318fdda1da022f86d10d +Subproject commit 71a395b898edb7aa582bac0a68ece9f6fbe9edcf -- 2.39.5