Proper naming + 'core' updated.

[shipsimu.git] / application / selector / class_ApplicationSelector.php

diff --git a/application/selector/class_ApplicationSelector.php b/application/selector/class_ApplicationSelector.php
index 01bfb4bbf74696979db856b4a9ae0e5585c82170..f8e080a254b6eb64fb58714d9e94f37db7fa2dd6 100644 (file)
--- a/application/selector/class_ApplicationSelector.php
+++ b/application/selector/class_ApplicationSelector.php
@@ -189,15 +189,15 @@ class ApplicationSelector extends BaseFrameworkSystem {
         */
        public function loadApplicationTemplates () {
                // Iterate through all applications
-               for ($idx = $this->foundApps->getIterator(); $idx->valid(); $idx->next()) {
+               for ($iteratorInstance = $this->foundApps->getIterator(); $iteratorInstance->valid(); $iteratorInstance->next()) {
                        // Get current application
-                       $appInstance = $idx->current();
+                       $appInstance = $iteratorInstance->current();
 
                        // Prepare the template engine for the current template
                        $templateInstance = $this->prepareTemplateInstance($appInstance);
 
                        // Try to load the web template
-                       $templateInstance->loadWebTemplate(sprintf("%s_%s",
+                       $templateInstance->loadWebTemplate(sprintf('%s_%s',
                                $this->getConfigInstance()->getConfigEntry('tpl_selector_prefix'),
                                strtolower($appInstance->getAppShortName())
                        ));
@@ -258,10 +258,10 @@ class ApplicationSelector extends BaseFrameworkSystem {
                $templateInstance->loadCodeTemplate($this->getConfigInstance()->getConfigEntry('selector_apps_tpl'));
 
                // Add all loaded application templates together
-               $dummy = "";
-               for ($idx = $this->getLoadedTemplates()->getIterator(); $idx->valid(); $idx->next()) {
+               $dummy = '';
+               for ($iteratorInstance = $this->getLoadedTemplates()->getIterator(); $iteratorInstance->valid(); $iteratorInstance->next()) {
                        // Get current item from array object
-                       $curr = $idx->current();
+                       $curr = $iteratorInstance->current();
 
                        // Do some sanity checks on the loaded item
                        if (!is_array($curr)) {
@@ -269,14 +269,14 @@ class ApplicationSelector extends BaseFrameworkSystem {
                                throw new NoArrayException($curr, self::EXCEPTION_IS_NO_ARRAY);
                        } elseif (count($curr) != 2) {
                                // Not expected count of entries
-                               throw new InvalidArrayCountException(array($this, "curr", count($curr), 2), self::EXCEPTION_ARRAY_HAS_INVALID_COUNT);
+                               throw new InvalidArrayCountException(array($this, 'curr', count($curr), 2), self::EXCEPTION_ARRAY_HAS_INVALID_COUNT);
                        } elseif (!isset($curr['web_template_class']) || (!isset($curr['app_instance']))) {
                                // Expected entries missing
-                               throw new MissingArrayElementsException(array($this, "curr", array("template_class", "app_instance")), self::EXCEPTION_ARRAY_ELEMENTS_MISSING);
+                               throw new MissingArrayElementsException(array($this, 'curr', array('template_class', 'app_instance')), self::EXCEPTION_ARRAY_ELEMENTS_MISSING);
                        }
 
                        // Debug output
-                       die(__METHOD__."()<pre>".print_r($curr, true)."</pre>");
+                       die(__METHOD__.'()<pre>'.print_r($curr, true).'</pre>');
                } // END - for
        }
 }