Continued:

[core.git] / framework / main / classes / template / menu / class_MenuTemplateEngine.php

diff --git a/framework/main/classes/template/menu/class_MenuTemplateEngine.php b/framework/main/classes/template/menu/class_MenuTemplateEngine.php
index 442f929072709ad26e68317a9dd80e123614623a..943b6a85c95f199e60254671337904145038001b 100644 (file)
--- a/framework/main/classes/template/menu/class_MenuTemplateEngine.php
+++ b/framework/main/classes/template/menu/class_MenuTemplateEngine.php
@@ -325,7 +325,7 @@ class MenuTemplateEngine extends BaseTemplateEngine implements CompileableTempla
                if (($nodeName != $this->getCurrMainNode()) && (in_array($nodeName, $this->getMainNodes()))) {
                        // Did not match!
                        throw new XmlNodeMismatchException (array($this, $nodeName, $this->getCurrMainNode()), Parseable::EXCEPTION_XML_NODE_MISMATCH);
-               } // END - if
+               }
 
                // Construct method name
                $methodName = 'finish' . StringUtils::convertToClassName($nodeName);
@@ -343,7 +343,7 @@ class MenuTemplateEngine extends BaseTemplateEngine implements CompileableTempla
         * @return      void
         * @todo        Find something useful with this!
         */
-       public function characterHandler ($resource, $characters) {
+       public function characterHandler ($resource, string $characters) {
                // Trim all spaces away
                $characters = trim($characters);
 
@@ -351,7 +351,7 @@ class MenuTemplateEngine extends BaseTemplateEngine implements CompileableTempla
                if (empty($characters)) {
                        // Then skip it silently
                        return;
-               } // END - if
+               }
 
                // Assign the found characters to variable and use the last entry from
                // stack as the name
@@ -365,7 +365,7 @@ class MenuTemplateEngine extends BaseTemplateEngine implements CompileableTempla
         * @param       $templateDependency             A template to load to satisfy dependencies
         * @return      void
         */
-       private function handleTemplateDependency ($node, $templateDependency) {
+       private function handleTemplateDependency (string $node, string $templateDependency) {
                // Is the template dependency set?
                if ((!empty($templateDependency)) && (!isset($this->dependencyContent[$node]))) {
                        // Get a temporay menu template instance
@@ -379,7 +379,7 @@ class MenuTemplateEngine extends BaseTemplateEngine implements CompileableTempla
 
                        // Save the parsed raw content in our dependency array
                        $this->dependencyContent[$node] = $templateInstance->getRawTemplateData();
-               } // END - if
+               }
        }
 
        /**
@@ -389,7 +389,7 @@ class MenuTemplateEngine extends BaseTemplateEngine implements CompileableTempla
         * @return      void
         * @todo        Add cache creation here
         */
-       private function initMenu ($templateDependency = '') {
+       private function initMenu (string $templateDependency = '') {
                // Get web template engine
                $this->setTemplateInstance(ObjectFactory::createObjectByConfiguredName('html_template_class', array(GenericRegistry::getRegistry()->getInstance('application'))));
 
@@ -816,11 +816,11 @@ class MenuTemplateEngine extends BaseTemplateEngine implements CompileableTempla
                        if ($variableName == 'anchor-href') {
                                // Expand variable with URL then
                                $variableValue = '{?base_url?}/' . $variableValue;
-                       } // END - if
+                       }
 
                        // ... into the instance
                        $this->getTemplateInstance()->assignVariable($variableName, $variableValue);
-               } // END - foreach
+               }
 
                // Compile template + variables
                $this->getTemplateInstance()->compileTemplate();
@@ -850,7 +850,7 @@ class MenuTemplateEngine extends BaseTemplateEngine implements CompileableTempla
 
                        // ... into the instance
                        $this->getTemplateInstance()->assignVariable($variableName, $variableValue);
-               } // END - foreach
+               }
 
                // Assign block content
                $this->getTemplateInstance()->assignVariable('block_content', $blockContent);