From 8c06c5bbbf1e6a08d1dcfaee63145a812b089e46 Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Mon, 23 Mar 2015 15:09:37 +0100 Subject: [PATCH] Renamed classes to fit naming scheme + removed obsolete code. Updated 'core'. Signed-off-by: Roland Haeder --- .../resolver/controller/{http => html}/.htaccess | 0 .../class_HubHtmlControllerResolver.php} | 16 +++------------- core | 2 +- 3 files changed, 4 insertions(+), 14 deletions(-) rename application/hub/main/resolver/controller/{http => html}/.htaccess (100%) rename application/hub/main/resolver/controller/{http/class_HubHttpControllerResolver.php => html/class_HubHtmlControllerResolver.php} (90%) diff --git a/application/hub/main/resolver/controller/http/.htaccess b/application/hub/main/resolver/controller/html/.htaccess similarity index 100% rename from application/hub/main/resolver/controller/http/.htaccess rename to application/hub/main/resolver/controller/html/.htaccess diff --git a/application/hub/main/resolver/controller/http/class_HubHttpControllerResolver.php b/application/hub/main/resolver/controller/html/class_HubHtmlControllerResolver.php similarity index 90% rename from application/hub/main/resolver/controller/http/class_HubHttpControllerResolver.php rename to application/hub/main/resolver/controller/html/class_HubHtmlControllerResolver.php index 4a4b0d5fd..738aa3a2c 100644 --- a/application/hub/main/resolver/controller/http/class_HubHttpControllerResolver.php +++ b/application/hub/main/resolver/controller/html/class_HubHtmlControllerResolver.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 HubHttpControllerResolver extends BaseControllerResolver implements ControllerResolver { - /** - * Last successfull resolved controller (name) - */ - private $lastControllerName = ''; - - /** - * Last successfull resolved controller (instance) - */ - private $lastControllerInstance = NULL; - +class HubHtmlControllerResolver extends BaseControllerResolver implements ControllerResolver { /** * Protected constructor * @@ -54,9 +44,9 @@ class HubHttpControllerResolver extends BaseControllerResolver implements Contro * @throws EmptyVariableException Thrown if default command is not set * @throws InvalidControllerException Thrown if default controller is invalid */ - public static final function createHubHttpControllerResolver ($controllerName, ManageableApplication $applicationInstance) { + public static final function createHubHtmlControllerResolver ($controllerName, ManageableApplication $applicationInstance) { // Create the new instance - $resolverInstance = new HubHttpControllerResolver(); + $resolverInstance = new HubHtmlControllerResolver(); // Is the variable $controllerName set and the command is valid? if (empty($controllerName)) { diff --git a/core b/core index c776f0aee..71a395b89 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit c776f0aeecb50d67e57b30c61bc84d80192090c2 +Subproject commit 71a395b898edb7aa582bac0a68ece9f6fbe9edcf -- 2.39.5