From: Roland Häder Date: Thu, 10 Mar 2011 20:39:55 +0000 (+0000) Subject: As of a good naming convention, do not short-cut variables X-Git-Url: https://git.mxchange.org/?p=core.git;a=commitdiff_plain;h=ec6bb7da038135934f0d5abfcb82a7a7780945a4 As of a good naming convention, do not short-cut variables --- diff --git a/inc/classes/interfaces/template/class_CompileableTemplate.php b/inc/classes/interfaces/template/class_CompileableTemplate.php index 31ff9535..ebef14a1 100644 --- a/inc/classes/interfaces/template/class_CompileableTemplate.php +++ b/inc/classes/interfaces/template/class_CompileableTemplate.php @@ -119,10 +119,10 @@ interface CompileableTemplate extends FrameworkInterface { /** * Assigns all the application data with template variables * - * @param $appInstance A manageable application instance + * @param $applicationInstance A manageable application instance * @return void */ - function assignApplicationData (ManageableApplication $appInstance); + function assignApplicationData (ManageableApplication $applicationInstance); /** * "Compiles" a variable by replacing {?var?} with it's content diff --git a/inc/classes/main/class_BaseFrameworkSystem.php b/inc/classes/main/class_BaseFrameworkSystem.php index 48526421..f8dc6b85 100644 --- a/inc/classes/main/class_BaseFrameworkSystem.php +++ b/inc/classes/main/class_BaseFrameworkSystem.php @@ -696,7 +696,7 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface { * Prepare the template engine (WebTemplateEngine by default) for a given * application helper instance (ApplicationHelper by default). * - * @param $appInstance An application helper instance or + * @param $applicationInstance An application helper instance or * null if we shall use the default * @return $templateInstance The template engine instance * @throws NullPointerException If the template engine could not @@ -706,21 +706,21 @@ class BaseFrameworkSystem extends stdClass implements FrameworkInterface { * @throws NullPointerException If the discovered application * instance is still null */ - protected function prepareTemplateInstance (ManageableApplication $appInstance = null) { + protected function prepareTemplateInstance (ManageableApplication $applicationInstance = null) { // Is the application instance set? - if (is_null($appInstance)) { + if (is_null($applicationInstance)) { // Get the current instance - $appInstance = $this->getApplicationInstance(); + $applicationInstance = $this->getApplicationInstance(); // Still null? - if (is_null($appInstance)) { + if (is_null($applicationInstance)) { // Thrown an exception throw new NullPointerException($this, self::EXCEPTION_IS_NULL_POINTER); } // END - if } // END - if // Initialize the template engine - $templateInstance = ObjectFactory::createObjectByConfiguredName('web_template_class', array($appInstance)); + $templateInstance = ObjectFactory::createObjectByConfiguredName('web_template_class', array($applicationInstance)); // Return the prepared instance return $templateInstance; diff --git a/inc/classes/main/commands/image/class_ImageCodeCaptchaCommand.php b/inc/classes/main/commands/image/class_ImageCodeCaptchaCommand.php index becf1124..f44f13b1 100644 --- a/inc/classes/main/commands/image/class_ImageCodeCaptchaCommand.php +++ b/inc/classes/main/commands/image/class_ImageCodeCaptchaCommand.php @@ -61,10 +61,10 @@ class ImageCodeCaptchaCommand extends BaseCommand implements Commandable { $decryptedCode = $requestInstance->getRequestElement('decrypted'); // Get the application instance - $appInstance = $this->getResolverInstance()->getApplicationInstance(); + $applicationInstance = $this->getResolverInstance()->getApplicationInstance(); // Prepare a template instance - $templateInstance = $this->prepareTemplateInstance($appInstance); + $templateInstance = $this->prepareTemplateInstance($applicationInstance); // Assign variable $templateInstance->assignVariable('decrypted_code', $decryptedCode); diff --git a/inc/classes/main/commands/web/class_WebConfirmCommand.php b/inc/classes/main/commands/web/class_WebConfirmCommand.php index 8c0d58fa..ccad7c51 100644 --- a/inc/classes/main/commands/web/class_WebConfirmCommand.php +++ b/inc/classes/main/commands/web/class_WebConfirmCommand.php @@ -58,19 +58,19 @@ class WebConfirmCommand extends BaseCommand implements Commandable { */ public function execute (Requestable $requestInstance, Responseable $responseInstance) { // Get the application instance - $appInstance = $this->getResolverInstance()->getApplicationInstance(); + $applicationInstance = $this->getResolverInstance()->getApplicationInstance(); // Prepare a template instance - $templateInstance = $this->prepareTemplateInstance($appInstance); + $templateInstance = $this->prepareTemplateInstance($applicationInstance); // Assign application data with template engine - $templateInstance->assignApplicationData($appInstance); + $templateInstance->assignApplicationData($applicationInstance); // Assign base URL $templateInstance->assignConfigVariable('base_url'); // Load the master template - $masterTemplate = $appInstance->buildMasterTemplateName(); + $masterTemplate = $applicationInstance->buildMasterTemplateName(); // Load header template $templateInstance->loadCodeTemplate('header'); @@ -111,7 +111,7 @@ class WebConfirmCommand extends BaseCommand implements Commandable { // 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. - $menuInstance = ObjectFactory::createObjectByConfiguredName('confirm_menu_class', array($appInstance)); + $menuInstance = ObjectFactory::createObjectByConfiguredName('confirm_menu_class', array($applicationInstance)); // Render the menu $menuInstance->renderMenu(); diff --git a/inc/classes/main/commands/web/class_WebHomeCommand.php b/inc/classes/main/commands/web/class_WebHomeCommand.php index a8bb2bc3..6f874aeb 100644 --- a/inc/classes/main/commands/web/class_WebHomeCommand.php +++ b/inc/classes/main/commands/web/class_WebHomeCommand.php @@ -58,16 +58,16 @@ class WebHomeCommand extends BaseCommand implements Commandable { */ public function execute (Requestable $requestInstance, Responseable $responseInstance) { // Get the application instance - $appInstance = $this->getResolverInstance()->getApplicationInstance(); + $applicationInstance = $this->getResolverInstance()->getApplicationInstance(); // Prepare a template instance - $templateInstance = $this->prepareTemplateInstance($appInstance); + $templateInstance = $this->prepareTemplateInstance($applicationInstance); // Transfer application data - $templateInstance->assignApplicationData($appInstance); + $templateInstance->assignApplicationData($applicationInstance); // Load the master template - $masterTemplate = $appInstance->buildMasterTemplateName(); + $masterTemplate = $applicationInstance->buildMasterTemplateName(); // Load header template $templateInstance->loadCodeTemplate('header'); @@ -97,7 +97,7 @@ class WebHomeCommand extends BaseCommand implements Commandable { // 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. - $menuInstance = ObjectFactory::createObjectByConfiguredName('home_menu_class', array($appInstance)); + $menuInstance = ObjectFactory::createObjectByConfiguredName('home_menu_class', array($applicationInstance)); // Render the menu $menuInstance->renderMenu(); diff --git a/inc/classes/main/commands/web/class_WebLoginAreaCommand.php b/inc/classes/main/commands/web/class_WebLoginAreaCommand.php index 0fd2113c..54aa15b6 100644 --- a/inc/classes/main/commands/web/class_WebLoginAreaCommand.php +++ b/inc/classes/main/commands/web/class_WebLoginAreaCommand.php @@ -84,19 +84,19 @@ class WebLoginAreaCommand extends BaseCommand implements Commandable { } // END - if // Get the application instance - $appInstance = $this->getResolverInstance()->getApplicationInstance(); + $applicationInstance = $this->getResolverInstance()->getApplicationInstance(); // Prepare a template instance - $templateInstance = $this->prepareTemplateInstance($appInstance); + $templateInstance = $this->prepareTemplateInstance($applicationInstance); // Assign base URL $templateInstance->assignConfigVariable('base_url'); // Assign all the application's data with template variables - $templateInstance->assignApplicationData($appInstance); + $templateInstance->assignApplicationData($applicationInstance); // Load the master template - $masterTemplate = $appInstance->buildMasterTemplateName(); + $masterTemplate = $applicationInstance->buildMasterTemplateName(); // Load header template $templateInstance->loadCodeTemplate('header'); @@ -134,7 +134,7 @@ class WebLoginAreaCommand extends BaseCommand implements Commandable { // 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. - $menuInstance = ObjectFactory::createObjectByConfiguredName('login_area_menu_class', array($appInstance)); + $menuInstance = ObjectFactory::createObjectByConfiguredName('login_area_menu_class', array($applicationInstance)); // Render the menu $menuInstance->renderMenu(); @@ -166,10 +166,10 @@ class WebLoginAreaCommand extends BaseCommand implements Commandable { $registryInstance = Registry::getRegistry(); // Get our application instance from the registry - $appInstance = $registryInstance->getInstance('application'); + $applicationInstance = $registryInstance->getInstance('application'); // Default action is the one from configuration - $this->actionName = $this->convertDashesToUnderscores($appInstance->getAppShortName()) . '_login_' . $this->getConfigInstance()->getConfigEntry('login_default_action'); + $this->actionName = $this->convertDashesToUnderscores($applicationInstance->getAppShortName()) . '_login_' . $this->getConfigInstance()->getConfigEntry('login_default_action'); // Get "action" from request $actReq = $requestInstance->getRequestElement('action'); @@ -177,7 +177,7 @@ class WebLoginAreaCommand extends BaseCommand implements Commandable { // Do we have a "action" parameter set? if ((is_string($actReq)) && (!empty($actReq))) { // Then use it with prefix - $this->actionName = $this->convertDashesToUnderscores($appInstance->getAppShortName()) . '_login_' . $actReq; + $this->actionName = $this->convertDashesToUnderscores($applicationInstance->getAppShortName()) . '_login_' . $actReq; } // END - if // Get application instance diff --git a/inc/classes/main/commands/web/class_WebLoginCommand.php b/inc/classes/main/commands/web/class_WebLoginCommand.php index 18277928..89b67129 100644 --- a/inc/classes/main/commands/web/class_WebLoginCommand.php +++ b/inc/classes/main/commands/web/class_WebLoginCommand.php @@ -61,19 +61,19 @@ class WebLoginCommand extends BaseCommand implements Commandable, Registerable { Registry::getRegistry()->addInstance('extra', $this); // Get the application instance - $appInstance = $this->getResolverInstance()->getApplicationInstance(); + $applicationInstance = $this->getResolverInstance()->getApplicationInstance(); // Prepare a template instance - $templateInstance = $this->prepareTemplateInstance($appInstance); + $templateInstance = $this->prepareTemplateInstance($applicationInstance); // Assign application data with template engine - $templateInstance->assignApplicationData($appInstance); + $templateInstance->assignApplicationData($applicationInstance); // Assign base URL $templateInstance->assignConfigVariable('base_url'); // Load the master template - $masterTemplate = $appInstance->buildMasterTemplateName(); + $masterTemplate = $applicationInstance->buildMasterTemplateName(); // Load header template $templateInstance->loadCodeTemplate('header'); @@ -103,7 +103,7 @@ class WebLoginCommand extends BaseCommand implements Commandable, Registerable { // 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. - $menuInstance = ObjectFactory::createObjectByConfiguredName('login_menu_class', array($appInstance)); + $menuInstance = ObjectFactory::createObjectByConfiguredName('login_menu_class', array($applicationInstance)); // Render the menu $menuInstance->renderMenu(); diff --git a/inc/classes/main/commands/web/class_WebLoginFailedCommand.php b/inc/classes/main/commands/web/class_WebLoginFailedCommand.php index 600b8a73..a03e7cfd 100644 --- a/inc/classes/main/commands/web/class_WebLoginFailedCommand.php +++ b/inc/classes/main/commands/web/class_WebLoginFailedCommand.php @@ -58,16 +58,16 @@ class WebLoginFailedCommand extends BaseCommand implements Commandable { */ public function execute (Requestable $requestInstance, Responseable $responseInstance) { // Get the application instance - $appInstance = $this->getResolverInstance()->getApplicationInstance(); + $applicationInstance = $this->getResolverInstance()->getApplicationInstance(); // Prepare a template instance - $templateInstance = $this->prepareTemplateInstance($appInstance); + $templateInstance = $this->prepareTemplateInstance($applicationInstance); // Assign application data with template engine - $templateInstance->assignApplicationData($appInstance); + $templateInstance->assignApplicationData($applicationInstance); // Load the master template - $masterTemplate = $appInstance->buildMasterTemplateName(); + $masterTemplate = $applicationInstance->buildMasterTemplateName(); // Load header template $templateInstance->loadCodeTemplate('header'); @@ -100,7 +100,7 @@ class WebLoginFailedCommand extends BaseCommand implements Commandable { // 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. - $menuInstance = ObjectFactory::createObjectByConfiguredName('login_failed_menu_class', array($appInstance)); + $menuInstance = ObjectFactory::createObjectByConfiguredName('login_failed_menu_class', array($applicationInstance)); // Render the menu $menuInstance->renderMenu(); diff --git a/inc/classes/main/commands/web/class_WebLogoutDoneCommand.php b/inc/classes/main/commands/web/class_WebLogoutDoneCommand.php index 05862a41..87f771ad 100644 --- a/inc/classes/main/commands/web/class_WebLogoutDoneCommand.php +++ b/inc/classes/main/commands/web/class_WebLogoutDoneCommand.php @@ -58,16 +58,16 @@ class WebLogoutDoneCommand extends BaseCommand implements Commandable { */ public function execute (Requestable $requestInstance, Responseable $responseInstance) { // Get the application instance - $appInstance = $this->getResolverInstance()->getApplicationInstance(); + $applicationInstance = $this->getResolverInstance()->getApplicationInstance(); // Prepare a template instance - $templateInstance = $this->prepareTemplateInstance($appInstance); + $templateInstance = $this->prepareTemplateInstance($applicationInstance); // Assign application data - $templateInstance->assignApplicationData($appInstance); + $templateInstance->assignApplicationData($applicationInstance); // Load the master template - $masterTemplate = $appInstance->buildMasterTemplateName(); + $masterTemplate = $applicationInstance->buildMasterTemplateName(); // Load header template $templateInstance->loadCodeTemplate('header'); @@ -100,7 +100,7 @@ class WebLogoutDoneCommand extends BaseCommand implements Commandable { // 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. - $menuInstance = ObjectFactory::createObjectByConfiguredName('logout_menu_class', array($appInstance)); + $menuInstance = ObjectFactory::createObjectByConfiguredName('logout_menu_class', array($applicationInstance)); // Render the menu $menuInstance->renderMenu(); diff --git a/inc/classes/main/commands/web/class_WebRegisterCommand.php b/inc/classes/main/commands/web/class_WebRegisterCommand.php index 16fcd1b4..54e43bc3 100644 --- a/inc/classes/main/commands/web/class_WebRegisterCommand.php +++ b/inc/classes/main/commands/web/class_WebRegisterCommand.php @@ -61,19 +61,19 @@ class WebRegisterCommand extends BaseCommand implements Commandable, Registerabl Registry::getRegistry()->addInstance('extra', $this); // Get the application instance - $appInstance = $this->getResolverInstance()->getApplicationInstance(); + $applicationInstance = $this->getResolverInstance()->getApplicationInstance(); // Prepare a template instance - $templateInstance = $this->prepareTemplateInstance($appInstance); + $templateInstance = $this->prepareTemplateInstance($applicationInstance); // Assign all the application's data with template variables - $templateInstance->assignApplicationData($appInstance); + $templateInstance->assignApplicationData($applicationInstance); // Assign base URL $templateInstance->assignConfigVariable('base_url'); // Load the master template - $masterTemplate = $appInstance->buildMasterTemplateName(); + $masterTemplate = $applicationInstance->buildMasterTemplateName(); // Load header template $templateInstance->loadCodeTemplate('header'); @@ -104,7 +104,7 @@ class WebRegisterCommand extends BaseCommand implements Commandable, Registerabl // 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. - $menuInstance = ObjectFactory::createObjectByConfiguredName('register_menu_class', array($appInstance)); + $menuInstance = ObjectFactory::createObjectByConfiguredName('register_menu_class', array($applicationInstance)); // Render the menu $menuInstance->renderMenu(); diff --git a/inc/classes/main/commands/web/class_WebResendLinkCommand.php b/inc/classes/main/commands/web/class_WebResendLinkCommand.php index a0dc613d..c535dc92 100644 --- a/inc/classes/main/commands/web/class_WebResendLinkCommand.php +++ b/inc/classes/main/commands/web/class_WebResendLinkCommand.php @@ -61,7 +61,7 @@ class WebResendLinkCommand extends BaseCommand implements Commandable { $userInstance = Registry::getRegistry()->getInstance('user'); // Get an application instance - $appInstance = $this->getResolverInstance()->getApplicationInstance(); + $applicationInstance = $this->getResolverInstance()->getApplicationInstance(); // Get a RNG instance (Random Number Generator) $rngInstance = ObjectFactory::createObjectByConfiguredName('rng_class'); @@ -82,13 +82,13 @@ class WebResendLinkCommand extends BaseCommand implements Commandable { $this->getConfigInstance()->setConfigEntry('web_template_class', $this->getConfigInstance()->getConfigEntry('mail_template_class')); // Prepare the template engine - $templateInstance = $this->prepareTemplateInstance($appInstance); + $templateInstance = $this->prepareTemplateInstance($applicationInstance); // Assign the application data with the template engine - $templateInstance->assignApplicationData($appInstance); + $templateInstance->assignApplicationData($applicationInstance); // Get a mailer class - $mailerInstance = ObjectFactory::createObjectByConfiguredName('mailer_class', array($templateInstance, $appInstance, 'resend_link')); + $mailerInstance = ObjectFactory::createObjectByConfiguredName('mailer_class', array($templateInstance, $applicationInstance, 'resend_link')); // Set this mailer in our template engine $templateInstance->setMailerInstance($mailerInstance); diff --git a/inc/classes/main/commands/web/class_WebStatusCommand.php b/inc/classes/main/commands/web/class_WebStatusCommand.php index 2d8152b8..0fdb2048 100644 --- a/inc/classes/main/commands/web/class_WebStatusCommand.php +++ b/inc/classes/main/commands/web/class_WebStatusCommand.php @@ -59,16 +59,16 @@ class WebStatusCommand extends BaseCommand implements Commandable { */ public function execute (Requestable $requestInstance, Responseable $responseInstance) { // Get the application instance - $appInstance = $this->getResolverInstance()->getApplicationInstance(); + $applicationInstance = $this->getResolverInstance()->getApplicationInstance(); // Prepare a template instance - $templateInstance = $this->prepareTemplateInstance($appInstance); + $templateInstance = $this->prepareTemplateInstance($applicationInstance); // Transfer application data - $templateInstance->assignApplicationData($appInstance); + $templateInstance->assignApplicationData($applicationInstance); // Load the master template - $masterTemplate = $appInstance->buildMasterTemplateName(); + $masterTemplate = $applicationInstance->buildMasterTemplateName(); // Load header template $templateInstance->loadCodeTemplate('header'); @@ -98,7 +98,7 @@ class WebStatusCommand extends BaseCommand implements Commandable { // 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. - $menuInstance = ObjectFactory::createObjectByConfiguredName('status_menu_class', array($appInstance)); + $menuInstance = ObjectFactory::createObjectByConfiguredName('status_menu_class', array($applicationInstance)); // Render the menu $menuInstance->renderMenu(); diff --git a/inc/classes/main/decorator/template/class_XmlRewriterTemplateDecorator.php b/inc/classes/main/decorator/template/class_XmlRewriterTemplateDecorator.php index 1d59a952..0af47d42 100644 --- a/inc/classes/main/decorator/template/class_XmlRewriterTemplateDecorator.php +++ b/inc/classes/main/decorator/template/class_XmlRewriterTemplateDecorator.php @@ -295,12 +295,12 @@ class XmlRewriterTemplateDecorator extends BaseDecorator implements CompileableT /** * Assigns all the application data with template variables * - * @param $appInstance A manageable application instance + * @param $applicationInstance A manageable application instance * @return void */ - public function assignApplicationData (ManageableApplication $appInstance) { + public function assignApplicationData (ManageableApplication $applicationInstance) { // Call the inner class' method - $this->getTemplateInstance()->assignApplicationData($appInstance); + $this->getTemplateInstance()->assignApplicationData($applicationInstance); } /** diff --git a/inc/classes/main/mailer/debug/class_DebugMailer.php b/inc/classes/main/mailer/debug/class_DebugMailer.php index 832c4607..a22a0ba2 100644 --- a/inc/classes/main/mailer/debug/class_DebugMailer.php +++ b/inc/classes/main/mailer/debug/class_DebugMailer.php @@ -36,12 +36,12 @@ class DebugMailer extends BaseMailer implements DeliverableMail { /** * Creates an instance of this mailer class * - * @param $templateInstance A template instance - * @param $appInstance An application helper class - * @param $templateName Name of email template to set - * @return $mailerInstance An instance of this mailer class + * @param $templateInstance A template instance + * @param $applicationInstance An application helper class + * @param $templateName Name of email template to set + * @return $mailerInstance An instance of this mailer class */ - public static final function createDebugMailer (CompileableTemplate $templateInstance, ManageableApplication $appInstance, $templateName) { + public static final function createDebugMailer (CompileableTemplate $templateInstance, ManageableApplication $applicationInstance, $templateName) { // Get a new instance $mailerInstance = new DebugMailer(); @@ -49,7 +49,7 @@ class DebugMailer extends BaseMailer implements DeliverableMail { $mailerInstance->setTemplateInstance($templateInstance); // Set application instance - $mailerInstance->setApplicationInstance($appInstance); + $mailerInstance->setApplicationInstance($applicationInstance); // Set template name $mailerInstance->setTemplateName('resend_link'); diff --git a/inc/classes/main/resolver/action/web/class_WebActionResolver.php b/inc/classes/main/resolver/action/web/class_WebActionResolver.php index 90490a16..dff629d9 100644 --- a/inc/classes/main/resolver/action/web/class_WebActionResolver.php +++ b/inc/classes/main/resolver/action/web/class_WebActionResolver.php @@ -44,12 +44,12 @@ class WebActionResolver extends BaseActionResolver implements ActionResolver { * Creates an instance of a Web action resolver with a given default action * * @param $actionName The default action we shall execute - * @param $appInstance An instance of a manageable application helper class + * @param $applicationInstance An instance of a manageable application helper class * @return $resolverInstance The prepared action resolver instance * @throws EmptyVariableException Thrown if default action is not set * @throws InvalidActionException Thrown if default action is invalid */ - public static final function createWebActionResolver ($actionName, ManageableApplication $appInstance) { + public static final function createWebActionResolver ($actionName, ManageableApplication $applicationInstance) { // Create the new instance $resolverInstance = new WebActionResolver(); @@ -63,7 +63,7 @@ class WebActionResolver extends BaseActionResolver implements ActionResolver { } // Set the application instance - $resolverInstance->setApplicationInstance($appInstance); + $resolverInstance->setApplicationInstance($applicationInstance); // Return the prepared instance return $resolverInstance; diff --git a/inc/classes/main/resolver/command/console/class_ConsoleCommandResolver.php b/inc/classes/main/resolver/command/console/class_ConsoleCommandResolver.php index 10e204b9..9f9cdde7 100644 --- a/inc/classes/main/resolver/command/console/class_ConsoleCommandResolver.php +++ b/inc/classes/main/resolver/command/console/class_ConsoleCommandResolver.php @@ -39,12 +39,12 @@ class ConsoleCommandResolver extends BaseCommandResolver implements CommandResol * Creates an instance of a Console command resolver with a given default command * * @param $commandName The default command we shall execute - * @param $appInstance An instance of a manageable application helper class + * @param $applicationInstance An instance of a manageable application helper class * @return $resolverInstance The prepared command resolver instance * @throws EmptyVariableException Thrown if default command is not set * @throws InvalidCommandException Thrown if default command is invalid */ - public static final function createConsoleCommandResolver ($commandName, ManageableApplication $appInstance) { + public static final function createConsoleCommandResolver ($commandName, ManageableApplication $applicationInstance) { // Create the new instance $resolverInstance = new ConsoleCommandResolver(); @@ -58,7 +58,7 @@ class ConsoleCommandResolver extends BaseCommandResolver implements CommandResol } // Set the application instance - $resolverInstance->setApplicationInstance($appInstance); + $resolverInstance->setApplicationInstance($applicationInstance); // Return the prepared instance return $resolverInstance; diff --git a/inc/classes/main/resolver/command/image/class_ImageCommandResolver.php b/inc/classes/main/resolver/command/image/class_ImageCommandResolver.php index 26a960d9..204aebb5 100644 --- a/inc/classes/main/resolver/command/image/class_ImageCommandResolver.php +++ b/inc/classes/main/resolver/command/image/class_ImageCommandResolver.php @@ -44,12 +44,12 @@ class ImageCommandResolver extends BaseCommandResolver implements CommandResolve * Creates an instance of a Image command resolver with a given default command * * @param $commandName The default command we shall execute - * @param $appInstance An instance of a manageable application helper class + * @param $applicationInstance An instance of a manageable application helper class * @return $resolverInstance The prepared command resolver instance * @throws EmptyVariableException Thrown if default command is not set * @throws InvalidCommandException Thrown if default command is invalid */ - public static final function createImageCommandResolver ($commandName, ManageableApplication $appInstance) { + public static final function createImageCommandResolver ($commandName, ManageableApplication $applicationInstance) { // Create the new instance $resolverInstance = new ImageCommandResolver(); @@ -63,7 +63,7 @@ class ImageCommandResolver extends BaseCommandResolver implements CommandResolve } // Set the application instance - $resolverInstance->setApplicationInstance($appInstance); + $resolverInstance->setApplicationInstance($applicationInstance); // Return the prepared instance return $resolverInstance; diff --git a/inc/classes/main/resolver/command/web/class_WebCommandResolver.php b/inc/classes/main/resolver/command/web/class_WebCommandResolver.php index 7fdac179..103ea14e 100644 --- a/inc/classes/main/resolver/command/web/class_WebCommandResolver.php +++ b/inc/classes/main/resolver/command/web/class_WebCommandResolver.php @@ -44,12 +44,12 @@ class WebCommandResolver extends BaseCommandResolver implements CommandResolver * Creates an instance of a Web command resolver with a given default command * * @param $commandName The default command we shall execute - * @param $appInstance An instance of a manageable application helper class + * @param $applicationInstance An instance of a manageable application helper class * @return $resolverInstance The prepared command resolver instance * @throws EmptyVariableException Thrown if default command is not set * @throws InvalidCommandException Thrown if default command is invalid */ - public static final function createWebCommandResolver ($commandName, ManageableApplication $appInstance) { + public static final function createWebCommandResolver ($commandName, ManageableApplication $applicationInstance) { // Create the new instance $resolverInstance = new WebCommandResolver(); @@ -63,7 +63,7 @@ class WebCommandResolver extends BaseCommandResolver implements CommandResolver } // Set the application instance - $resolverInstance->setApplicationInstance($appInstance); + $resolverInstance->setApplicationInstance($applicationInstance); // Return the prepared instance return $resolverInstance; diff --git a/inc/classes/main/resolver/controller/console/class_ConsoleControllerResolver.php b/inc/classes/main/resolver/controller/console/class_ConsoleControllerResolver.php index cee089c5..36e1fb68 100644 --- a/inc/classes/main/resolver/controller/console/class_ConsoleControllerResolver.php +++ b/inc/classes/main/resolver/controller/console/class_ConsoleControllerResolver.php @@ -49,12 +49,12 @@ class ConsoleControllerResolver extends BaseControllerResolver implements Contro * 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 createConsoleControllerResolver ($controllerName, ManageableApplication $appInstance) { + public static final function createConsoleControllerResolver ($controllerName, ManageableApplication $applicationInstance) { // Create the new instance $resolverInstance = new ConsoleControllerResolver(); @@ -68,7 +68,7 @@ class ConsoleControllerResolver extends BaseControllerResolver implements Contro } // Set the application instance - $resolverInstance->setApplicationInstance($appInstance); + $resolverInstance->setApplicationInstance($applicationInstance); // Set command name $resolverInstance->setControllerName($controllerName); diff --git a/inc/classes/main/resolver/controller/image/class_ImageControllerResolver.php b/inc/classes/main/resolver/controller/image/class_ImageControllerResolver.php index 89de2d8c..1d8e2426 100644 --- a/inc/classes/main/resolver/controller/image/class_ImageControllerResolver.php +++ b/inc/classes/main/resolver/controller/image/class_ImageControllerResolver.php @@ -49,12 +49,12 @@ class ImageControllerResolver extends BaseControllerResolver implements Controll * 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 createImageControllerResolver ($controllerName, ManageableApplication $appInstance) { + public static final function createImageControllerResolver ($controllerName, ManageableApplication $applicationInstance) { // Create the new instance $resolverInstance = new ImageControllerResolver(); @@ -68,7 +68,7 @@ class ImageControllerResolver extends BaseControllerResolver implements Controll } // Set the application instance - $resolverInstance->setApplicationInstance($appInstance); + $resolverInstance->setApplicationInstance($applicationInstance); // Set command name $resolverInstance->setControllerName($controllerName); diff --git a/inc/classes/main/resolver/controller/web/class_WebControllerResolver.php b/inc/classes/main/resolver/controller/web/class_WebControllerResolver.php index 0c403693..403f31ac 100644 --- a/inc/classes/main/resolver/controller/web/class_WebControllerResolver.php +++ b/inc/classes/main/resolver/controller/web/class_WebControllerResolver.php @@ -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(); @@ -68,7 +68,7 @@ class WebControllerResolver extends BaseControllerResolver implements Controller } // Set the application instance - $resolverInstance->setApplicationInstance($appInstance); + $resolverInstance->setApplicationInstance($applicationInstance); // Set command name $resolverInstance->setControllerName($controllerName); diff --git a/inc/classes/main/response/console/class_ConsoleResponse.php b/inc/classes/main/response/console/class_ConsoleResponse.php index 12af28f0..32e0cbd5 100644 --- a/inc/classes/main/response/console/class_ConsoleResponse.php +++ b/inc/classes/main/response/console/class_ConsoleResponse.php @@ -38,18 +38,18 @@ class ConsoleResponse extends BaseResponse implements Responseable { /** * Creates an object of this class * - * @param $appInstance An instance of a manageable application - * @return $responseInstance A prepared instance of this class + * @param $applicationInstance An instance of a manageable application + * @return $responseInstance A prepared instance of this class */ - public static final function createConsoleResponse (ManageableApplication $appInstance) { + public static final function createConsoleResponse (ManageableApplication $applicationInstance) { // Get a new instance $responseInstance = new ConsoleResponse(); // Set the application instance - $responseInstance->setApplicationInstance($appInstance); + $responseInstance->setApplicationInstance($applicationInstance); // Initialize the template engine here - $responseInstance->initTemplateEngine($appInstance); + $responseInstance->initTemplateEngine($applicationInstance); // Return the prepared instance return $responseInstance; @@ -58,11 +58,11 @@ class ConsoleResponse extends BaseResponse implements Responseable { /** * Initializes the template engine instance * - * @param $appInstance An instance of a manageable application + * @param $applicationInstance An instance of a manageable application * @return void */ - public final function initTemplateEngine (ManageableApplication $appInstance) { - $this->setTemplateInstance($this->prepareTemplateInstance($appInstance)); + public final function initTemplateEngine (ManageableApplication $applicationInstance) { + $this->setTemplateInstance($this->prepareTemplateInstance($applicationInstance)); } /** diff --git a/inc/classes/main/response/http/class_HttpResponse.php b/inc/classes/main/response/http/class_HttpResponse.php index 8d6534a5..57a37e2f 100644 --- a/inc/classes/main/response/http/class_HttpResponse.php +++ b/inc/classes/main/response/http/class_HttpResponse.php @@ -38,18 +38,18 @@ class HttpResponse extends BaseResponse implements Responseable { /** * Creates an object of this class * - * @param $appInstance An instance of a manageable application - * @return $responseInstance A prepared instance of this class + * @param $applicationInstance An instance of a manageable application + * @return $responseInstance A prepared instance of this class */ - public static final function createHttpResponse (ManageableApplication $appInstance) { + public static final function createHttpResponse (ManageableApplication $applicationInstance) { // Get a new instance $responseInstance = new HttpResponse(); // Set the application instance - $responseInstance->setApplicationInstance($appInstance); + $responseInstance->setApplicationInstance($applicationInstance); // Initialize the template engine here - $responseInstance->initTemplateEngine($appInstance); + $responseInstance->initTemplateEngine($applicationInstance); // Return the prepared instance return $responseInstance; @@ -58,11 +58,11 @@ class HttpResponse extends BaseResponse implements Responseable { /** * Initializes the template engine instance * - * @param $appInstance An instance of a manageable application + * @param $applicationInstance An instance of a manageable application * @return void */ - public final function initTemplateEngine (ManageableApplication $appInstance) { - $this->setTemplateInstance($this->prepareTemplateInstance($appInstance)); + public final function initTemplateEngine (ManageableApplication $applicationInstance) { + $this->setTemplateInstance($this->prepareTemplateInstance($applicationInstance)); } /** diff --git a/inc/classes/main/response/image/class_ImageResponse.php b/inc/classes/main/response/image/class_ImageResponse.php index 81426049..8e018d7c 100644 --- a/inc/classes/main/response/image/class_ImageResponse.php +++ b/inc/classes/main/response/image/class_ImageResponse.php @@ -38,18 +38,18 @@ class ImageResponse extends BaseResponse implements Responseable { /** * Creates an object of this class * - * @param $appInstance An instance of a manageable application - * @return $responseInstance A prepared instance of this class + * @param $applicationInstance An instance of a manageable application + * @return $responseInstance A prepared instance of this class */ - public static final function createImageResponse (ManageableApplication $appInstance) { + public static final function createImageResponse (ManageableApplication $applicationInstance) { // Get a new instance $responseInstance = new ImageResponse(); // Set the application instance - $responseInstance->setApplicationInstance($appInstance); + $responseInstance->setApplicationInstance($applicationInstance); // Initialize the template engine here - $responseInstance->initTemplateEngine($appInstance); + $responseInstance->initTemplateEngine($applicationInstance); // Return the prepared instance return $responseInstance; @@ -58,10 +58,10 @@ class ImageResponse extends BaseResponse implements Responseable { /** * Initializes the template engine instance * - * @param $appInstance An instance of a manageable application + * @param $applicationInstance An instance of a manageable application * @return void */ - public final function initTemplateEngine (ManageableApplication $appInstance) { + public final function initTemplateEngine (ManageableApplication $applicationInstance) { // Get config instance $cfg = $this->getConfigInstance(); @@ -73,7 +73,7 @@ class ImageResponse extends BaseResponse implements Responseable { $cfg->setConfigEntry('code_template_type' , 'image'); // Get a prepared instance - $this->setTemplateInstance($this->prepareTemplateInstance($appInstance)); + $this->setTemplateInstance($this->prepareTemplateInstance($applicationInstance)); } /** diff --git a/inc/classes/main/template/class_BaseTemplateEngine.php b/inc/classes/main/template/class_BaseTemplateEngine.php index 2b9406b0..d31f5cfd 100644 --- a/inc/classes/main/template/class_BaseTemplateEngine.php +++ b/inc/classes/main/template/class_BaseTemplateEngine.php @@ -1354,21 +1354,21 @@ class BaseTemplateEngine extends BaseFrameworkSystem { /** * Assigns all the application data with template variables * - * @param $appInstance A manageable application instance + * @param $applicationInstance A manageable application instance * @return void */ - public function assignApplicationData (ManageableApplication $appInstance) { + public function assignApplicationData (ManageableApplication $applicationInstance) { // Get long name and assign it - $this->assignVariable('app_full_name' , $appInstance->getAppName()); + $this->assignVariable('app_full_name' , $applicationInstance->getAppName()); // Get short name and assign it - $this->assignVariable('app_short_name', $appInstance->getAppShortName()); + $this->assignVariable('app_short_name', $applicationInstance->getAppShortName()); // Get version number and assign it - $this->assignVariable('app_version' , $appInstance->getAppVersion()); + $this->assignVariable('app_version' , $applicationInstance->getAppVersion()); // Assign extra application-depending data - $appInstance->assignExtraTemplateData($this); + $applicationInstance->assignExtraTemplateData($this); } /** diff --git a/inc/classes/main/template/console/class_ConsoleTemplateEngine.php b/inc/classes/main/template/console/class_ConsoleTemplateEngine.php index aae8d6c8..0a9bc8dc 100644 --- a/inc/classes/main/template/console/class_ConsoleTemplateEngine.php +++ b/inc/classes/main/template/console/class_ConsoleTemplateEngine.php @@ -36,8 +36,8 @@ class ConsoleTemplateEngine extends BaseTemplateEngine implements CompileableTem /** * Creates an instance of the class TemplateEngine and prepares it for usage * - * @param $appInstance A manageable application - * @return $templateInstance An instance of TemplateEngine + * @param $applicationInstance A manageable application + * @return $templateInstance An instance of TemplateEngine * @throws BasePathIsEmptyException If the provided $templateBasePath is empty * @throws InvalidBasePathStringException If $templateBasePath is no string * @throws BasePathIsNoDirectoryException If $templateBasePath is no @@ -45,12 +45,12 @@ class ConsoleTemplateEngine extends BaseTemplateEngine implements CompileableTem * @throws BasePathReadProtectedException If $templateBasePath is * read-protected */ - public static final function createConsoleTemplateEngine (ManageableApplication $appInstance) { + public static final function createConsoleTemplateEngine (ManageableApplication $applicationInstance) { // Get a new instance $templateInstance = new ConsoleTemplateEngine(); // Determine base path - $templateBasePath = $templateInstance->getConfigInstance()->getConfigEntry('application_base_path') . $appInstance->getRequestInstance()->getRequestElement('app') . '/'; + $templateBasePath = $templateInstance->getConfigInstance()->getConfigEntry('application_base_path') . $applicationInstance->getRequestInstance()->getRequestElement('app') . '/'; // Is the base path valid? if (empty($templateBasePath)) { diff --git a/inc/classes/main/template/image/class_ImageTemplateEngine.php b/inc/classes/main/template/image/class_ImageTemplateEngine.php index 3a692e1f..98203154 100644 --- a/inc/classes/main/template/image/class_ImageTemplateEngine.php +++ b/inc/classes/main/template/image/class_ImageTemplateEngine.php @@ -69,8 +69,8 @@ class ImageTemplateEngine extends BaseTemplateEngine implements CompileableTempl /** * Creates an instance of the class TemplateEngine and prepares it for usage * - * @param $appInstance A manageable application - * @return $templateInstance An instance of TemplateEngine + * @param $applicationInstance A manageable application + * @return $templateInstance An instance of TemplateEngine * @throws BasePathIsEmptyException If the provided $templateBasePath is empty * @throws InvalidBasePathStringException If $templateBasePath is no string * @throws BasePathIsNoDirectoryException If $templateBasePath is no @@ -78,12 +78,12 @@ class ImageTemplateEngine extends BaseTemplateEngine implements CompileableTempl * @throws BasePathReadProtectedException If $templateBasePath is * read-protected */ - public static final function createImageTemplateEngine (ManageableApplication $appInstance) { + public static final function createImageTemplateEngine (ManageableApplication $applicationInstance) { // Get a new instance $templateInstance = new ImageTemplateEngine(); // Determine base path - $templateBasePath = $templateInstance->getConfigInstance()->getConfigEntry('application_base_path') . $appInstance->getRequestInstance()->getRequestElement('app') . '/'; + $templateBasePath = $templateInstance->getConfigInstance()->getConfigEntry('application_base_path') . $applicationInstance->getRequestInstance()->getRequestElement('app') . '/'; // Is the base path valid? if (empty($templateBasePath)) { diff --git a/inc/classes/main/template/mail/class_MailTemplateEngine.php b/inc/classes/main/template/mail/class_MailTemplateEngine.php index 1afb1f00..eda00738 100644 --- a/inc/classes/main/template/mail/class_MailTemplateEngine.php +++ b/inc/classes/main/template/mail/class_MailTemplateEngine.php @@ -63,8 +63,8 @@ class MailTemplateEngine extends BaseTemplateEngine implements CompileableTempla /** * Creates an instance of the class TemplateEngine and prepares it for usage * - * @param $appInstance A manageable application - * @return $templateInstance An instance of TemplateEngine + * @param $applicationInstance A manageable application + * @return $templateInstance An instance of TemplateEngine * @throws BasePathIsEmptyException If the provided $templateBasePath is empty * @throws InvalidBasePathStringException If $templateBasePath is no string * @throws BasePathIsNoDirectoryException If $templateBasePath is no @@ -72,12 +72,12 @@ class MailTemplateEngine extends BaseTemplateEngine implements CompileableTempla * @throws BasePathReadProtectedException If $templateBasePath is * read-protected */ - public static final function createMailTemplateEngine (ManageableApplication $appInstance) { + public static final function createMailTemplateEngine (ManageableApplication $applicationInstance) { // Get a new instance $templateInstance = new MailTemplateEngine(); // Determine base path - $templateBasePath = $templateInstance->getConfigInstance()->getConfigEntry('application_base_path') . $appInstance->getRequestInstance()->getRequestElement('app') . '/'; + $templateBasePath = $templateInstance->getConfigInstance()->getConfigEntry('application_base_path') . $applicationInstance->getRequestInstance()->getRequestElement('app') . '/'; // Is the base path valid? if (empty($templateBasePath)) { diff --git a/inc/classes/main/template/menu/class_MenuTemplateEngine.php b/inc/classes/main/template/menu/class_MenuTemplateEngine.php index 9e024047..71522e7a 100644 --- a/inc/classes/main/template/menu/class_MenuTemplateEngine.php +++ b/inc/classes/main/template/menu/class_MenuTemplateEngine.php @@ -85,9 +85,9 @@ class MenuTemplateEngine extends BaseTemplateEngine implements CompileableTempla /** * Creates an instance of the class TemplateEngine and prepares it for usage * - * @param $appInstance A manageable application - * @param $menuInstance A RenderableMenu instance - * @return $templateInstance An instance of TemplateEngine + * @param $applicationInstance A manageable application + * @param $menuInstance A RenderableMenu instance + * @return $templateInstance An instance of TemplateEngine * @throws BasePathIsEmptyException If the provided $templateBasePath is empty * @throws InvalidBasePathStringException If $templateBasePath is no string * @throws BasePathIsNoDirectoryException If $templateBasePath is no @@ -95,12 +95,12 @@ class MenuTemplateEngine extends BaseTemplateEngine implements CompileableTempla * @throws BasePathReadProtectedException If $templateBasePath is * read-protected */ - public static final function createMenuTemplateEngine (ManageableApplication $appInstance, RenderableMenu $menuInstance) { + public static final function createMenuTemplateEngine (ManageableApplication $applicationInstance, RenderableMenu $menuInstance) { // Get a new instance $templateInstance = new MenuTemplateEngine(); // Determine base path - $templateBasePath = $templateInstance->getConfigInstance()->getConfigEntry('application_base_path') . $appInstance->getRequestInstance()->getRequestElement('app') . '/'; + $templateBasePath = $templateInstance->getConfigInstance()->getConfigEntry('application_base_path') . $applicationInstance->getRequestInstance()->getRequestElement('app') . '/'; // Is the base path valid? if (empty($templateBasePath)) { diff --git a/inc/classes/main/template/web/class_WebTemplateEngine.php b/inc/classes/main/template/web/class_WebTemplateEngine.php index ef473dc0..e4846a81 100644 --- a/inc/classes/main/template/web/class_WebTemplateEngine.php +++ b/inc/classes/main/template/web/class_WebTemplateEngine.php @@ -36,8 +36,8 @@ class WebTemplateEngine extends BaseTemplateEngine implements CompileableTemplat /** * Creates an instance of the class TemplateEngine and prepares it for usage * - * @param $appInstance A manageable application - * @return $templateInstance An instance of TemplateEngine + * @param $applicationInstance A manageable application + * @return $templateInstance An instance of TemplateEngine * @throws BasePathIsEmptyException If the provided $templateBasePath is empty * @throws InvalidBasePathStringException If $templateBasePath is no string * @throws BasePathIsNoDirectoryException If $templateBasePath is no @@ -45,12 +45,12 @@ class WebTemplateEngine extends BaseTemplateEngine implements CompileableTemplat * @throws BasePathReadProtectedException If $templateBasePath is * read-protected */ - public static final function createWebTemplateEngine (ManageableApplication $appInstance) { + public static final function createWebTemplateEngine (ManageableApplication $applicationInstance) { // Get a new instance $templateInstance = new WebTemplateEngine(); // Determine base path - $templateBasePath = $templateInstance->getConfigInstance()->getConfigEntry('application_base_path') . $appInstance->getRequestInstance()->getRequestElement('app') . '/'; + $templateBasePath = $templateInstance->getConfigInstance()->getConfigEntry('application_base_path') . $applicationInstance->getRequestInstance()->getRequestElement('app') . '/'; // Is the base path valid? if (empty($templateBasePath)) {