Continued:

[core.git] / framework / main / classes / helper / html / blocks / class_HtmlBlockHelper.php

diff --git a/framework/main/classes/helper/html/blocks/class_HtmlBlockHelper.php b/framework/main/classes/helper/html/blocks/class_HtmlBlockHelper.php
index d0d6177fd7ca962e972fdac0132b6a56a2b7be85..346d56da2552d7012a5293e22085b73ede99ac32 100644 (file)
--- a/framework/main/classes/helper/html/blocks/class_HtmlBlockHelper.php
+++ b/framework/main/classes/helper/html/blocks/class_HtmlBlockHelper.php
@@ -52,7 +52,7 @@ class HtmlBlockHelper extends BaseHtmlHelper implements HelpableTemplate {
         * @param       $blockName                      Name of the block we shall generate
         * @return      $helperInstance         A prepared instance of this helper
         */
-       public static final function createHtmlBlockHelper (CompileableTemplate $templateInstance, $blockName) {
+       public static final function createHtmlBlockHelper (CompileableTemplate $templateInstance, string $blockName) {
                // Get new instance
                $helperInstance = new HtmlBlockHelper();
 
@@ -102,9 +102,9 @@ class HtmlBlockHelper extends BaseHtmlHelper implements HelpableTemplate {
         * @param       $messageId                      Message id to load an assign
         * @return      void
         */
-       public function assignMessageField ($templateVariable, $messageId) {
+       public function assignMessageField (string $templateVariable, string $messageId) {
                // Get message
-               $message = $this->getLanguageInstance()->getMessage($messageId);
+               $message = FrameworkBootstrap::getLanguageInstance()->getMessage($messageId);
 
                // And assign it
                $this->getTemplateInstance()->assignVariable($templateVariable, $message);
@@ -117,7 +117,7 @@ class HtmlBlockHelper extends BaseHtmlHelper implements HelpableTemplate {
         * @param       $actionValue    Action value to assign
         * @return      void
         */
-       public function assignLinkFieldWithAction ($linkField, $actionValue) {
+       public function assignLinkFieldWithAction (string $linkField, $actionValue) {
                $this->getTemplateInstance()->assignVariable($linkField . '_action', $actionValue);
        }
 
@@ -127,12 +127,12 @@ class HtmlBlockHelper extends BaseHtmlHelper implements HelpableTemplate {
         * @param       $userStatus             Raw user status from database layer
         * @return      $translated             Translated user status
         */
-       protected function doFilterUserStatusTranslator ($userStatus) {
+       protected function doFilterUserStatusTranslator (string $userStatus) {
                // Generate message id
-               $messageId = 'user_status_' . strtolower($userStatus);
+               $messageId = sprintf('user_status_%s', strtolower($userStatus));
 
                // Get that message
-               $translated = $this->getLanguageInstance()->getMessage($messageId);
+               $translated = FrameworkBootstrap::getLanguageInstance()->getMessage($messageId);
 
                // Return it
                return $translated;