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 31ff95352f93c7b1f474c2328e08cd58a4d0475a..ebef14a1ad039126e65bba0f649a4a920b3199ff 100644 (file)
--- 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
         *
        /**
         * Assigns all the application data with template variables
         *

-        * @param       $appInstance    A manageable application instance
+        * @param       $applicationInstance    A manageable application instance

         * @return      void
         */
         * @return      void
         */

-       function assignApplicationData (ManageableApplication $appInstance);
+       function assignApplicationData (ManageableApplication $applicationInstance);

 
        /**
         * "Compiles" a variable by replacing {?var?} with it's content
 
        /**
         * "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 485264212e4c82a58bd55ad776eb3543f243439a..f8dc6b851e1a48c6b81908b03ae924e5d01525e8 100644 (file)
--- 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).
         *
         * 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
         *                                                                              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
         */
         * @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?
                // Is the application instance set?

-               if (is_null($appInstance)) {
+               if (is_null($applicationInstance)) {

                        // Get the current instance
                        // Get the current instance

-                       $appInstance = $this->getApplicationInstance();
+                       $applicationInstance = $this->getApplicationInstance();

 
                        // Still null?
 
                        // 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
                                // 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;
 
                // 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 becf112429cddd1d63df4f2e8f9dc0e4c0c4a795..f44f13b1364b8b7b3f63b4c747b887145689b4ec 100644 (file)
--- 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
                $decryptedCode = $requestInstance->getRequestElement('decrypted');
 
                // Get the application instance

-               $appInstance = $this->getResolverInstance()->getApplicationInstance();
+               $applicationInstance = $this->getResolverInstance()->getApplicationInstance();

 
                // Prepare a template instance
 
                // Prepare a template instance

-               $templateInstance = $this->prepareTemplateInstance($appInstance);
+               $templateInstance = $this->prepareTemplateInstance($applicationInstance);

 
                // Assign variable
                $templateInstance->assignVariable('decrypted_code', $decryptedCode);
 
                // 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 8c0d58fa9578d405b06d8c894958a1393a773644..ccad7c51c4d7779e7fa52daec665a8198051a5cb 100644 (file)
--- 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
         */
        public function execute (Requestable $requestInstance, Responseable $responseInstance) {
                // Get the application instance

-               $appInstance = $this->getResolverInstance()->getApplicationInstance();
+               $applicationInstance = $this->getResolverInstance()->getApplicationInstance();

 
                // Prepare a template instance
 
                // Prepare a template instance

-               $templateInstance = $this->prepareTemplateInstance($appInstance);
+               $templateInstance = $this->prepareTemplateInstance($applicationInstance);

 
                // Assign application data with template engine
 
                // Assign application data with template engine

-               $templateInstance->assignApplicationData($appInstance);
+               $templateInstance->assignApplicationData($applicationInstance);

 
                // Assign base URL
                $templateInstance->assignConfigVariable('base_url');
 
                // Load the master template
 
                // Assign base URL
                $templateInstance->assignConfigVariable('base_url');
 
                // Load the master template

-               $masterTemplate = $appInstance->buildMasterTemplateName();
+               $masterTemplate = $applicationInstance->buildMasterTemplateName();

 
                // Load header template
                $templateInstance->loadCodeTemplate('header');
 
                // 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.
 
                // 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();
 
                // 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 a8bb2bc33a299920a8af78515796721d893c9594..6f874aebab35e15f58c3ad3115f6668b8ad4af5f 100644 (file)
--- 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
         */
        public function execute (Requestable $requestInstance, Responseable $responseInstance) {
                // Get the application instance

-               $appInstance = $this->getResolverInstance()->getApplicationInstance();
+               $applicationInstance = $this->getResolverInstance()->getApplicationInstance();

 
                // Prepare a template instance
 
                // Prepare a template instance

-               $templateInstance = $this->prepareTemplateInstance($appInstance);
+               $templateInstance = $this->prepareTemplateInstance($applicationInstance);

 
                // Transfer application data
 
                // Transfer application data

-               $templateInstance->assignApplicationData($appInstance);
+               $templateInstance->assignApplicationData($applicationInstance);

 
                // Load the master template
 
                // Load the master template

-               $masterTemplate = $appInstance->buildMasterTemplateName();
+               $masterTemplate = $applicationInstance->buildMasterTemplateName();

 
                // Load header template
                $templateInstance->loadCodeTemplate('header');
 
                // 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.
 
                // 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();
 
                // 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 0fd2113ce2b4fb83cb26db3b427f6fffa2aa4644..54aa15b635fb338a0e1a78239bc4b0fb5ce03f44 100644 (file)
--- 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
                } // END - if
 
                // Get the application instance

-               $appInstance = $this->getResolverInstance()->getApplicationInstance();
+               $applicationInstance = $this->getResolverInstance()->getApplicationInstance();

 
                // Prepare a template instance
 
                // 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
 
                // 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
 
                // Load the master template

-               $masterTemplate = $appInstance->buildMasterTemplateName();
+               $masterTemplate = $applicationInstance->buildMasterTemplateName();

 
                // Load header template
                $templateInstance->loadCodeTemplate('header');
 
                // 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.
 
                // 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();
 
                // 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
                $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
 
                // 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');
 
                // 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
                // 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
                } // 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 18277928fb26345c2a7af9ede9bb849aac2b3b15..89b67129d684d8fca65bd15eb81e05d8b638c4bb 100644 (file)
--- 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
                Registry::getRegistry()->addInstance('extra', $this);
 
                // Get the application instance

-               $appInstance = $this->getResolverInstance()->getApplicationInstance();
+               $applicationInstance = $this->getResolverInstance()->getApplicationInstance();

 
                // Prepare a template instance
 
                // Prepare a template instance

-               $templateInstance = $this->prepareTemplateInstance($appInstance);
+               $templateInstance = $this->prepareTemplateInstance($applicationInstance);

 
                // Assign application data with template engine
 
                // Assign application data with template engine

-               $templateInstance->assignApplicationData($appInstance);
+               $templateInstance->assignApplicationData($applicationInstance);

 
                // Assign base URL
                $templateInstance->assignConfigVariable('base_url');
 
                // Load the master template
 
                // Assign base URL
                $templateInstance->assignConfigVariable('base_url');
 
                // Load the master template

-               $masterTemplate = $appInstance->buildMasterTemplateName();
+               $masterTemplate = $applicationInstance->buildMasterTemplateName();

 
                // Load header template
                $templateInstance->loadCodeTemplate('header');
 
                // 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.
 
                // 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();
 
                // 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 600b8a730bcf25afa5b8624162a97713c7f44fc9..a03e7cfd60f1c9808c985723bc421befee75c755 100644 (file)
--- 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
         */
        public function execute (Requestable $requestInstance, Responseable $responseInstance) {
                // Get the application instance

-               $appInstance = $this->getResolverInstance()->getApplicationInstance();
+               $applicationInstance = $this->getResolverInstance()->getApplicationInstance();

 
                // Prepare a template instance
 
                // Prepare a template instance

-               $templateInstance = $this->prepareTemplateInstance($appInstance);
+               $templateInstance = $this->prepareTemplateInstance($applicationInstance);

 
                // Assign application data with template engine
 
                // Assign application data with template engine

-               $templateInstance->assignApplicationData($appInstance);
+               $templateInstance->assignApplicationData($applicationInstance);

 
                // Load the master template
 
                // Load the master template

-               $masterTemplate = $appInstance->buildMasterTemplateName();
+               $masterTemplate = $applicationInstance->buildMasterTemplateName();

 
                // Load header template
                $templateInstance->loadCodeTemplate('header');
 
                // 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.
 
                // 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();
 
                // 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 05862a41dc8ebdbe4ac9ea34b72684224c0c535d..87f771ad4a617aa93556b6db563d110874e2d3b3 100644 (file)
--- 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
         */
        public function execute (Requestable $requestInstance, Responseable $responseInstance) {
                // Get the application instance

-               $appInstance = $this->getResolverInstance()->getApplicationInstance();
+               $applicationInstance = $this->getResolverInstance()->getApplicationInstance();

 
                // Prepare a template instance
 
                // Prepare a template instance

-               $templateInstance = $this->prepareTemplateInstance($appInstance);
+               $templateInstance = $this->prepareTemplateInstance($applicationInstance);

 
                // Assign application data
 
                // Assign application data

-               $templateInstance->assignApplicationData($appInstance);
+               $templateInstance->assignApplicationData($applicationInstance);

 
                // Load the master template
 
                // Load the master template

-               $masterTemplate = $appInstance->buildMasterTemplateName();
+               $masterTemplate = $applicationInstance->buildMasterTemplateName();

 
                // Load header template
                $templateInstance->loadCodeTemplate('header');
 
                // 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.
 
                // 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();
 
                // 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 16fcd1b455850e32f3aef6cddbc8dcca97b0fdf5..54e43bc35886825704d8b8b5063c2867e2a63f05 100644 (file)
--- 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
                Registry::getRegistry()->addInstance('extra', $this);
 
                // Get the application instance

-               $appInstance = $this->getResolverInstance()->getApplicationInstance();
+               $applicationInstance = $this->getResolverInstance()->getApplicationInstance();

 
                // Prepare a template instance
 
                // Prepare a template instance

-               $templateInstance = $this->prepareTemplateInstance($appInstance);
+               $templateInstance = $this->prepareTemplateInstance($applicationInstance);

 
                // Assign all the application's data with template variables
 
                // 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
 
                // Assign base URL
                $templateInstance->assignConfigVariable('base_url');
 
                // Load the master template

-               $masterTemplate = $appInstance->buildMasterTemplateName();
+               $masterTemplate = $applicationInstance->buildMasterTemplateName();

 
                // Load header template
                $templateInstance->loadCodeTemplate('header');
 
                // 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.
 
                // 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();
 
                // 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 a0dc613ddbb6d8d6c50a4d96690c95312e450fbe..c535dc9255e43557bc2253913c536a8324ef38f6 100644 (file)
--- 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
                $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');
 
                // 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
                $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
 
                // Assign the application data with the template engine

-               $templateInstance->assignApplicationData($appInstance);
+               $templateInstance->assignApplicationData($applicationInstance);

 
                // Get a mailer class
 
                // 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);
 
                // 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 2d8152b8983d18b8278b354116ff58a1b98cd48e..0fdb204849ff6c73a976e8500bea00b5ddda8282 100644 (file)
--- 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
         */
        public function execute (Requestable $requestInstance, Responseable $responseInstance) {
                // Get the application instance

-               $appInstance = $this->getResolverInstance()->getApplicationInstance();
+               $applicationInstance = $this->getResolverInstance()->getApplicationInstance();

 
                // Prepare a template instance
 
                // Prepare a template instance

-               $templateInstance = $this->prepareTemplateInstance($appInstance);
+               $templateInstance = $this->prepareTemplateInstance($applicationInstance);

 
                // Transfer application data
 
                // Transfer application data

-               $templateInstance->assignApplicationData($appInstance);
+               $templateInstance->assignApplicationData($applicationInstance);

 
                // Load the master template
 
                // Load the master template

-               $masterTemplate = $appInstance->buildMasterTemplateName();
+               $masterTemplate = $applicationInstance->buildMasterTemplateName();

 
                // Load header template
                $templateInstance->loadCodeTemplate('header');
 
                // 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.
 
                // 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();
 
                // 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 1d59a952be2e55e9abf86943d762f2c033126c49..0af47d42f55e033acb1fdc8641600d67d282f228 100644 (file)
--- 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
         *
        /**
         * Assigns all the application data with template variables
         *

-        * @param       $appInstance    A manageable application instance
+        * @param       $applicationInstance    A manageable application instance

         * @return      void
         */
         * @return      void
         */

-       public function assignApplicationData (ManageableApplication $appInstance) {
+       public function assignApplicationData (ManageableApplication $applicationInstance) {

                // Call the inner class' method
                // 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 832c460717a61a210fc73911b460db6dd8bb158f..a22a0ba213b1192e7437a2362d3fb6027765ef92 100644 (file)
--- 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
         *
        /**
         * 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();
 
                // Get a new instance
                $mailerInstance = new DebugMailer();
 


@@ -49,7 +49,7 @@ class DebugMailer extends BaseMailer implements DeliverableMail {
                $mailerInstance->setTemplateInstance($templateInstance);
 
                // Set application instance
                $mailerInstance->setTemplateInstance($templateInstance);
 
                // Set application instance

-               $mailerInstance->setApplicationInstance($appInstance);
+               $mailerInstance->setApplicationInstance($applicationInstance);

 
                // Set template name
                $mailerInstance->setTemplateName('resend_link');
 
                // 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 90490a16eabc30f55f4651f30ab5c1e9aba495cd..dff629d9fbc91d7ef6085d6454f41a8090c46d83 100644 (file)
--- 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
         * 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
         */
         * @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();
 
                // Create the new instance
                $resolverInstance = new WebActionResolver();
 


@@ -63,7 +63,7 @@ class WebActionResolver extends BaseActionResolver implements ActionResolver {
                }
 
                // Set the application instance
                }
 
                // Set the application instance

-               $resolverInstance->setApplicationInstance($appInstance);
+               $resolverInstance->setApplicationInstance($applicationInstance);

 
                // Return the prepared instance
                return $resolverInstance;
 
                // 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 10e204b92100500ab3b2412d25ebce9ff127ac0c..9f9cdde72d8330b68a5a7a78d41e1a0987e0ccdc 100644 (file)
--- 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
         * 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
         */
         * @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();
 
                // Create the new instance
                $resolverInstance = new ConsoleCommandResolver();
 


@@ -58,7 +58,7 @@ class ConsoleCommandResolver extends BaseCommandResolver implements CommandResol
                }
 
                // Set the application instance
                }
 
                // Set the application instance

-               $resolverInstance->setApplicationInstance($appInstance);
+               $resolverInstance->setApplicationInstance($applicationInstance);

 
                // Return the prepared instance
                return $resolverInstance;
 
                // 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 26a960d937acebcdc8902593547dd2157bfad105..204aebb5242e40da21ba7aee6321eddb212cc614 100644 (file)
--- 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
         * 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
         */
         * @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();
 
                // Create the new instance
                $resolverInstance = new ImageCommandResolver();
 


@@ -63,7 +63,7 @@ class ImageCommandResolver extends BaseCommandResolver implements CommandResolve
                }
 
                // Set the application instance
                }
 
                // Set the application instance

-               $resolverInstance->setApplicationInstance($appInstance);
+               $resolverInstance->setApplicationInstance($applicationInstance);

 
                // Return the prepared instance
                return $resolverInstance;
 
                // 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 7fdac179aa122f909416b4c74d65a7ebe4dea8e0..103ea14ecf5833471f77f4c94b4b465234e767ce 100644 (file)
--- 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
         * 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
         */
         * @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();
 
                // Create the new instance
                $resolverInstance = new WebCommandResolver();
 


@@ -63,7 +63,7 @@ class WebCommandResolver extends BaseCommandResolver implements CommandResolver
                }
 
                // Set the application instance
                }
 
                // Set the application instance

-               $resolverInstance->setApplicationInstance($appInstance);
+               $resolverInstance->setApplicationInstance($applicationInstance);

 
                // Return the prepared instance
                return $resolverInstance;
 
                // 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 cee089c5cac879e283dcdecdaf3b560afaf1fb0b..36e1fb6842a7188481f54e1b61a1ea72ca9ef43f 100644 (file)
--- 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
         * 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
         */
         * @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();
 
                // Create the new instance
                $resolverInstance = new ConsoleControllerResolver();
 


@@ -68,7 +68,7 @@ class ConsoleControllerResolver extends BaseControllerResolver implements Contro
                }
 
                // Set the application instance
                }
 
                // Set the application instance

-               $resolverInstance->setApplicationInstance($appInstance);
+               $resolverInstance->setApplicationInstance($applicationInstance);

 
                // Set command name
                $resolverInstance->setControllerName($controllerName);
 
                // 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 89de2d8c0ea991286859bd963e224c9f82618d9c..1d8e2426ecb52b88f0a152f473ae3e1482b3795e 100644 (file)
--- 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
         * 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
         */
         * @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();
 
                // Create the new instance
                $resolverInstance = new ImageControllerResolver();
 


@@ -68,7 +68,7 @@ class ImageControllerResolver extends BaseControllerResolver implements Controll
                }
 
                // Set the application instance
                }
 
                // Set the application instance

-               $resolverInstance->setApplicationInstance($appInstance);
+               $resolverInstance->setApplicationInstance($applicationInstance);

 
                // Set command name
                $resolverInstance->setControllerName($controllerName);
 
                // 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 0c4036938ca09b4863194db9d9efbf03fcfd7b4e..403f31acc77d124b330b1fbd2182ae1cf057d6b8 100644 (file)
--- 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
         * 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
         */
         * @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();
 
                // Create the new instance
                $resolverInstance = new WebControllerResolver();
 


@@ -68,7 +68,7 @@ class WebControllerResolver extends BaseControllerResolver implements Controller
                }
 
                // Set the application instance
                }
 
                // Set the application instance

-               $resolverInstance->setApplicationInstance($appInstance);
+               $resolverInstance->setApplicationInstance($applicationInstance);

 
                // Set command name
                $resolverInstance->setControllerName($controllerName);
 
                // 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 12af28f02b76ed9e14202a794dcc3b6ede54f49d..32e0cbd5d65751454b47940b2510427eef67f67d 100644 (file)
--- 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
         *
        /**
         * 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
                // Get a new instance
                $responseInstance = new ConsoleResponse();
 
                // Set the application instance

-               $responseInstance->setApplicationInstance($appInstance);
+               $responseInstance->setApplicationInstance($applicationInstance);

 
                // Initialize the template engine here
 
                // Initialize the template engine here

-               $responseInstance->initTemplateEngine($appInstance);
+               $responseInstance->initTemplateEngine($applicationInstance);

 
                // Return the prepared instance
                return $responseInstance;
 
                // Return the prepared instance
                return $responseInstance;


@@ -58,11 +58,11 @@ class ConsoleResponse extends BaseResponse implements Responseable {
        /**
         * Initializes the template engine instance
         *
        /**
         * Initializes the template engine instance
         *

-        * @param       $appInstance    An instance of a manageable application
+        * @param       $applicationInstance    An instance of a manageable application

         * @return      void
         */
         * @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 8d6534a54ffca9a812d786a83f73a70385145646..57a37e2f7b692b352eb5dd75f7993589793ed9d1 100644 (file)
--- 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
         *
        /**
         * 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
                // Get a new instance
                $responseInstance = new HttpResponse();
 
                // Set the application instance

-               $responseInstance->setApplicationInstance($appInstance);
+               $responseInstance->setApplicationInstance($applicationInstance);

 
                // Initialize the template engine here
 
                // Initialize the template engine here

-               $responseInstance->initTemplateEngine($appInstance);
+               $responseInstance->initTemplateEngine($applicationInstance);

 
                // Return the prepared instance
                return $responseInstance;
 
                // Return the prepared instance
                return $responseInstance;


@@ -58,11 +58,11 @@ class HttpResponse extends BaseResponse implements Responseable {
        /**
         * Initializes the template engine instance
         *
        /**
         * Initializes the template engine instance
         *

-        * @param       $appInstance    An instance of a manageable application
+        * @param       $applicationInstance    An instance of a manageable application

         * @return      void
         */
         * @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 81426049350555a0d88c83249017a7edf2b53a2e..8e018d7ceb623d2024dc04baf9dbcbcc55d4d93b 100644 (file)
--- 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
         *
        /**
         * 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
                // Get a new instance
                $responseInstance = new ImageResponse();
 
                // Set the application instance

-               $responseInstance->setApplicationInstance($appInstance);
+               $responseInstance->setApplicationInstance($applicationInstance);

 
                // Initialize the template engine here
 
                // Initialize the template engine here

-               $responseInstance->initTemplateEngine($appInstance);
+               $responseInstance->initTemplateEngine($applicationInstance);

 
                // Return the prepared instance
                return $responseInstance;
 
                // Return the prepared instance
                return $responseInstance;


@@ -58,10 +58,10 @@ class ImageResponse extends BaseResponse implements Responseable {
        /**
         * Initializes the template engine instance
         *
        /**
         * Initializes the template engine instance
         *

-        * @param       $appInstance    An instance of a manageable application
+        * @param       $applicationInstance    An instance of a manageable application

         * @return      void
         */
         * @return      void
         */

-       public final function initTemplateEngine (ManageableApplication $appInstance) {
+       public final function initTemplateEngine (ManageableApplication $applicationInstance) {

                // Get config instance
                $cfg = $this->getConfigInstance();
 
                // 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
                $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 2b9406b0f055efe0948579aae92ef378b696d306..d31f5cfd6127dd026cc4c64823a6816cc5fe3f3c 100644 (file)
--- 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
         *
        /**
         * Assigns all the application data with template variables
         *

-        * @param       $appInstance    A manageable application instance
+        * @param       $applicationInstance    A manageable application instance

         * @return      void
         */
         * @return      void
         */

-       public function assignApplicationData (ManageableApplication $appInstance) {
+       public function assignApplicationData (ManageableApplication $applicationInstance) {

                // Get long name and assign it
                // 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
 
                // 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
 
                // Get version number and assign it

-               $this->assignVariable('app_version'   , $appInstance->getAppVersion());
+               $this->assignVariable('app_version'   , $applicationInstance->getAppVersion());

 
                // Assign extra application-depending data
 
                // 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 aae8d6c8951faf482938598e1d76643f75c5ec62..0a9bc8dc5f022fb22006b3c476f9c1d04efd54c7 100644 (file)
--- 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
         *
        /**
         * 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
         * @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
         */
         * @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
                // 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)) {
 
                // 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 3a692e1f2fc5c886224f75f319d33cbffa604e16..98203154dda905f7ed8296bc996b87c76b7e9ff8 100644 (file)
--- 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
         *
        /**
         * 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
         * @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
         */
         * @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
                // 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)) {
 
                // 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 1afb1f005efb3979bc2e26d69ffe32c764a40106..eda00738babd1365478b81bb8adb4645b2b8bfbf 100644 (file)
--- 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
         *
        /**
         * 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
         * @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
         */
         * @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
                // 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)) {
 
                // 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 9e02404733abe72afa4a6fa6f10c85f1bcb5819a..71522e7ada6c49c5c2e86722c6d2b361e4f2d481 100644 (file)
--- 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
         *
        /**
         * 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
         * @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
         */
         * @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
                // 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)) {
 
                // 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 ef473dc02b7c28ec7f765b3e22997dd19e1daf1d..e4846a815490cb26e5e3a41532cc7078d69a0bc7 100644 (file)
--- 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
         *
        /**
         * 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
         * @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
         */
         * @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
                // 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)) {
 
                // Is the base path valid?
                if (empty($templateBasePath)) {