X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fclasses%2Fmain%2Fresolver%2Fcontroller%2Fweb%2Fclass_WebControllerResolver.php;h=958eb128bc208f1800eee245ed65710eda532987;hb=fdc6a02b5e6c2155cda61fcc345c7583b734ab85;hp=0c4036938ca09b4863194db9d9efbf03fcfd7b4e;hpb=4b88c118b615335d06bd74e444173d21aef4406c;p=core.git diff --git a/inc/classes/main/resolver/controller/web/class_WebControllerResolver.php b/inc/classes/main/resolver/controller/web/class_WebControllerResolver.php index 0c403693..958eb128 100644 --- a/inc/classes/main/resolver/controller/web/class_WebControllerResolver.php +++ b/inc/classes/main/resolver/controller/web/class_WebControllerResolver.php @@ -2,11 +2,11 @@ /** * A resolver for resolving controllers locally * - * @author Roland Haeder + * @author Roland Haeder * @version 0.0.0 - * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2011 Core Developer Team + * @copyright Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2013 Core Developer Team * @license GNU GPL 3.0 or any newer version - * @link http://www.ship-simu.org + * @link http://www.shipsimu.org * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -30,7 +30,7 @@ class WebControllerResolver extends BaseControllerResolver implements Controller /** * Last successfull resolved controller (instance) */ - private $lastControllerInstance = null; + private $lastControllerInstance = NULL; /** * Protected constructor @@ -49,12 +49,12 @@ class WebControllerResolver extends BaseControllerResolver implements Controller * Creates an instance of a resolver class with a given command * * @param $controllerName The controller we shall resolve - * @param $appInstance An instance of a manageable application helper class + * @param $applicationInstance An instance of a manageable application helper class * @return $resolverInstance The prepared controller resolver instance * @throws EmptyVariableException Thrown if default command is not set * @throws InvalidControllerException Thrown if default controller is invalid */ - public static final function createWebControllerResolver ($controllerName, ManageableApplication $appInstance) { + public static final function createWebControllerResolver ($controllerName, ManageableApplication $applicationInstance) { // Create the new instance $resolverInstance = new WebControllerResolver(); @@ -62,13 +62,13 @@ class WebControllerResolver extends BaseControllerResolver implements Controller if (empty($controllerName)) { // Then thrown an exception here throw new EmptyVariableException(array($resolverInstance, 'commandName'), self::EXCEPTION_UNEXPECTED_EMPTY_STRING); - } elseif ($resolverInstance->isControllerValid($controllerName) === false) { + } elseif ($resolverInstance->isControllerValid($controllerName) === FALSE) { // Invalid command found throw new InvalidControllerException(array($resolverInstance, $controllerName), self::EXCEPTION_INVALID_CONTROLLER); } // Set the application instance - $resolverInstance->setApplicationInstance($appInstance); + $resolverInstance->setApplicationInstance($applicationInstance); // Set command name $resolverInstance->setControllerName($controllerName); @@ -88,7 +88,7 @@ class WebControllerResolver extends BaseControllerResolver implements Controller public function resolveController () { // Init variables $controllerName = ''; - $controllerInstance = null; + $controllerInstance = NULL; // Get the command name $controllerName = $this->getControllerName();