From 47d51b0593e92d3a3167136efaf5281f213cfc42 Mon Sep 17 00:00:00 2001
From: denisdulici <denisdulici@gmail.com>
Date: Mon, 11 Apr 2016 15:43:17 +0300
Subject: [PATCH] added PHP 7 compatibility

---
 Base.php                 |  9 ++++++---
 Element.php              |  4 ++--
 Element/CKEditor.php     | 12 +++++++++---
 Element/Captcha.php      |  4 ++--
 Element/Checkbox.php     | 14 +++++++++-----
 Element/Checksort.php    | 20 ++++++++++++--------
 Element/Color.php        |  6 +++++-
 Element/Date.php         |  8 ++++++--
 Element/Email.php        |  6 +++++-
 Element/HTML.php         |  4 ++--
 Element/JQueryUIDate.php |  8 ++++++--
 Element/Month.php        | 10 +++++++---
 Element/Number.php       |  6 +++++-
 Element/Radio.php        | 12 ++++++++----
 Element/Select.php       | 18 +++++++++++-------
 Element/Sort.php         | 13 +++++++++----
 Element/Summernote.php   | 14 +++++++++-----
 Element/Textarea.php     | 12 ++++++++----
 Element/Textbox.php      | 36 ++++++++++++++++++++++--------------
 Element/TinyMCE.php      | 12 ++++++++----
 Element/Url.php          |  6 +++++-
 Element/Week.php         |  6 +++++-
 View.php                 | 12 +++++++-----
 View/Inline.php          | 16 ++++++++++------
 View/SideBySide.php      | 16 ++++++++++------
 View/Vertical.php        | 22 +++++++++++++---------
 26 files changed, 201 insertions(+), 105 deletions(-)

diff --git a/Base.php b/Base.php
index eacb4ce..2a14d3b 100644
--- a/Base.php
+++ b/Base.php
@@ -33,7 +33,6 @@ public function configure(array $properties = null)
             $method_reference = array();
 
             foreach ($available as $method) {
-
                 $method_reference[strtolower($method)] = $method;
             }
 
@@ -45,9 +44,13 @@ public function configure(array $properties = null)
                     /*If the appropriate class has a "set" method for the property provided, then
                                         it is called instead or setting the property directly.*/
                     if (isset($method_reference["set" . $property])) {
-                        $this->$method_reference["set" . $property]($value);
+                        $func = $method_reference["set" . $property];
+
+                        $this->$func($value);
                     } elseif (isset($property_reference[$property])) {
-                        $this->$property_reference[$property] = $value;
+                        $prop = $property_reference[$property];
+
+                        $this->$prop = $value;
                     } else {
                         /*Entries that don't match an available class property are stored in the attributes
                        property if applicable.  Typically, these entries will be element attributes such as
diff --git a/Element.php b/Element.php
index 1333de6..6822ad4 100644
--- a/Element.php
+++ b/Element.php
@@ -156,9 +156,9 @@ public function jQueryOptions()
     /*Many of the included elements make use of the <input> tag for display.  These include the Hidden, Textbox,
     Password, Date, Color, Button, Email, and File element classes.  The project's other element classes will
         override this method with their own implementation.*/
-    public function render()
+    public function getInput()
     {
-        echo '<input', $this->getAttributes(), '/>';
+        return '<input' . $this->getAttributes() . '/>';
     }
 
     /*If an element requires inline stylesheet definitions, this method is used send them to the browser before
diff --git a/Element/CKEditor.php b/Element/CKEditor.php
index b6e96b2..36a385b 100644
--- a/Element/CKEditor.php
+++ b/Element/CKEditor.php
@@ -17,11 +17,17 @@ class CKEditor extends Textarea
 
     public function render()
     {
-        echo "<textarea", $this->getAttributes(array("value", "required")), ">";
+        $html = '';
+
+        $html .= "<textarea" . $this->getAttributes(array("value", "required")) . ">";
+
         if (!empty($this->attributes["value"])) {
-            echo $this->attributes["value"];
+            $html .= $this->attributes["value"];
         }
-        echo "</textarea>";
+
+        $html .= "</textarea>";
+
+        return $html;
     }
 
     public function renderJS()
diff --git a/Element/Captcha.php b/Element/Captcha.php
index 02e0ace..05362cc 100644
--- a/Element/Captcha.php
+++ b/Element/Captcha.php
@@ -22,12 +22,12 @@ public function __construct($label = "", array $properties = null)
         parent::__construct($label, "recaptcha_response_field", $properties);
     }
 
-    public function render()
+    public function getInput()
     {
         $this->validation[] = new ValidationCaptcha($this->privateKey);
 
         require_once(__DIR__ . "/../Resources/recaptchalib.php");
 
-        echo recaptcha_get_html($this->publicKey);
+        return recaptcha_get_html($this->publicKey);
     }
 }
diff --git a/Element/Checkbox.php b/Element/Checkbox.php
index 9064247..09f9366 100644
--- a/Element/Checkbox.php
+++ b/Element/Checkbox.php
@@ -16,8 +16,10 @@ class Checkbox extends OptionElement
     protected $attributes = array("type" => "checkbox");
     protected $inline;
 
-    public function render()
+    public function getInput()
     {
+        $html = '';
+
         if (isset($this->attributes["value"])) {
             if (!is_array($this->attributes["value"])) {
                 $this->attributes["value"] = array($this->attributes["value"]);
@@ -41,18 +43,20 @@ public function render()
         foreach ($this->options as $value => $text) {
             $value = $this->getOptionValue($value);
 
-            echo '<label class="' . $labelClass . '">
+            $html .= '<label class="' . $labelClass . '">
                     <input id="' . $this->attributes["id"] . '-' . $count . '"' .
                         $this->getAttributes(array("id", "value", "checked", "required")) .
                         ' value="' . $this->filter($value) . '"';
             
             if (in_array($value, $this->attributes["value"])) {
-                echo ' checked="checked"';
+                $html .= ' checked="checked"';
             }
-            
-            echo '/> ' . $text . ' </label> ';
+
+            $html .= '/> ' . $text . ' </label> ';
             
             ++$count;
         }
+
+        return $html;
     }
 }
diff --git a/Element/Checksort.php b/Element/Checksort.php
index 914884d..c2f429e 100644
--- a/Element/Checksort.php
+++ b/Element/Checksort.php
@@ -14,8 +14,10 @@ class Checksort extends Sort
     protected $attributes = array("type" => "checkbox");
     protected $inline;
 
-    public function render()
+    public function getInput()
     {
+        $html = '';
+
         if (isset($this->attributes["value"])) {
             if (!is_array($this->attributes["value"])) {
                 $this->attributes["value"] = array($this->attributes["value"]);
@@ -41,19 +43,19 @@ public function render()
             $value = $this->getOptionValue($value);
             
             if (!empty($this->inline) && $count > 0) {
-                echo ' ';
+                $html .= ' ';
             }
-            
-            echo '<label class="' . $labelClass . '">
+
+            $html .= '<label class="' . $labelClass . '">
                     <input id="' . $this->attributes["id"] . '-' . $count . '"' .
                         $this->getAttributes(array("id", "value", "checked", "name", "onclick", "required")) .
                         ' value="' . $this->filter($value) . '"';
             
             if (in_array($value, $this->attributes["value"])) {
-                echo ' checked="checked"';
+                $html .= ' checked="checked"';
             }
-            
-            echo ' onclick="updateChecksort(this, \'' .
+
+            $html .= ' onclick="updateChecksort(this, \'' .
                     str_replace(array('"', "'"), array('&quot;', "\'"), $text) . '\');"/>' . $text . '</label>';
 
             if (in_array($value, $this->attributes["value"])) {
@@ -65,7 +67,9 @@ public function render()
             ++$count;
         }
 
-        echo '<ul id="' . $this->attributes["id"] . '">' . $existing . '</ul>';
+        $html .= '<ul id="' . $this->attributes["id"] . '">' . $existing . '</ul>';
+
+        return $html;
     }
 
     public function renderJS()
diff --git a/Element/Color.php b/Element/Color.php
index 730bb31..a1162bf 100644
--- a/Element/Color.php
+++ b/Element/Color.php
@@ -16,6 +16,8 @@ class Color extends Textbox
 
     public function render()
     {
+        $html = '';
+
         $this->attributes["pattern"] = "#[a-g0-9]{6}";
         $this->attributes["title"]   = "6-digit hexidecimal color (e.g. #000000)";
 
@@ -23,6 +25,8 @@ public function render()
 
         $this->validation[] = new RegExp("/" . $this->attributes["pattern"] . "/", $msg);
 
-        parent::render();
+        $html .= parent::getInput();
+
+        return $html;
     }
 }
diff --git a/Element/Date.php b/Element/Date.php
index f038996..671e0de 100644
--- a/Element/Date.php
+++ b/Element/Date.php
@@ -27,12 +27,16 @@ public function __construct($label, $name, array $properties = null)
         parent::__construct($label, $name, $properties);
     }
 
-    public function render()
+    public function getInput()
     {
+        $html = '';
+
         $msg =  "Error: The %element% field must match the following date format: " . $this->attributes["title"];
 
         $this->validation[] = new RegExp("/" . $this->attributes["pattern"] . "/", $msg);
 
-        parent::render();
+        $html .= parent::getInput();
+
+        return $html;
     }
 }
diff --git a/Element/Email.php b/Element/Email.php
index 0b3c2a9..f044aa0 100644
--- a/Element/Email.php
+++ b/Element/Email.php
@@ -17,8 +17,12 @@ class Email extends Textbox
 
     public function render()
     {
+        $html = '';
+
         $this->validation[] = new ValidationEmail();
 
-        parent::render();
+        $html .= parent::getInput();
+
+        return $html;
     }
 }
diff --git a/Element/HTML.php b/Element/HTML.php
index f29f2b1..422bece 100644
--- a/Element/HTML.php
+++ b/Element/HTML.php
@@ -20,8 +20,8 @@ public function __construct($value)
         parent::__construct("", "", $properties);
     }
 
-    public function render()
+    public function getInput()
     {
-        echo $this->attributes["value"];
+        return $this->attributes["value"];
     }
 }
diff --git a/Element/JQueryUIDate.php b/Element/JQueryUIDate.php
index 33f68ac..d0e5b5c 100644
--- a/Element/JQueryUIDate.php
+++ b/Element/JQueryUIDate.php
@@ -41,10 +41,14 @@ public function jQueryDocumentReady()
         echo 'jQuery("#', $this->attributes["id"], '").datepicker(', $this->jQueryOptions(), ');';
     }
 
-    public function render()
+    public function getInput()
     {
+        $html = '';
+
         $this->validation[] = new Date;
 
-        parent::render();
+        $html .= parent::getInput();
+
+        return $html;
     }
 }
diff --git a/Element/Month.php b/Element/Month.php
index b263f2e..8341f6e 100644
--- a/Element/Month.php
+++ b/Element/Month.php
@@ -27,12 +27,16 @@ public function __construct($label, $name, array $properties = null)
         parent::__construct($label, $name, $properties);
     }
 
-    public function render()
+    public function getInput()
     {
-        $msg =  "Error: The %element% field must match the following date format: " . $this->attributes["title"];
+        $html = '';
+
+        $msg = "Error: The %element% field must match the following date format: " . $this->attributes["title"];
 
         $this->validation[] = new RegExp("/" . $this->attributes["pattern"] . "/", $msg);
 
-        parent::render();
+        $html .= parent::getInput();
+
+        return $html;
     }
 }
diff --git a/Element/Number.php b/Element/Number.php
index 5af229a..b3b2229 100644
--- a/Element/Number.php
+++ b/Element/Number.php
@@ -17,8 +17,12 @@ class Number extends Textbox
 
     public function render()
     {
+        $html = '';
+
         $this->validation[] = new Numeric;
 
-        parent::render();
+        $html .= parent::getInput();
+
+        return $html;
     }
 }
diff --git a/Element/Radio.php b/Element/Radio.php
index 5adfa2b..51cabaf 100644
--- a/Element/Radio.php
+++ b/Element/Radio.php
@@ -16,8 +16,10 @@ class Radio extends OptionElement
     protected $attributes = array("type" => "radio", "labelclass" => "");
     protected $inline;
 
-    public function render()
+    public function getInput()
     {
+        $html = '';
+
         $labelClass = $this->attributes["type"];
         $labelClass .= " " . $this->attributes["labelclass"];
 
@@ -30,17 +32,19 @@ public function render()
         foreach ($this->options as $value => $text) {
             $value = $this->getOptionValue($value);
 
-            echo '<label class="' . $labelClass . '">
+            $html .= '<label class="' . $labelClass . '">
                      <input id="' . $this->attributes["id"] . '-' . $count . '"' .
                        $this->getAttributes(array("id", "value", "checked")) . ' value="' . $this->filter($value) . '"';
 
             if (isset($this->attributes["value"]) && $this->attributes["value"] == $value) {
-                echo ' checked="checked"';
+                $html .= ' checked="checked"';
             }
 
-            echo '/> ' . $text . ' </label> ';
+            $html .= '/> ' . $text . ' </label> ';
 
             ++$count;
         }
+
+        return $html;
     }
 }
diff --git a/Element/Select.php b/Element/Select.php
index 9271e13..ac07222 100644
--- a/Element/Select.php
+++ b/Element/Select.php
@@ -15,8 +15,10 @@ class Select extends OptionElement
     
     protected $attributes = array();
 
-    public function render()
+    public function getInput()
     {
+        $html = '';
+
         if (isset($this->attributes["value"])) {
             if (!is_array($this->attributes["value"])) {
                 $this->attributes["value"] = array($this->attributes["value"]);
@@ -29,23 +31,25 @@ public function render()
             $this->attributes["name"] .= "[]";
         }
 
-        echo '<select', $this->getAttributes(array("value", "selected")), '>';
+        $html .= '<select' . $this->getAttributes(array("value", "selected")) . '>';
         
         $selected = false;
         
         foreach ($this->options as $value => $text) {
             $value = $this->getOptionValue($value);
-            
-            echo '<option value="', $this->filter($value), '"';
+
+            $html .= '<option value="' . $this->filter($value) . '"';
             
             if (!$selected && in_array($value, $this->attributes["value"])) {
-                echo ' selected="selected"';
+                $html .= ' selected="selected"';
                 $selected = true;
             }
             
-            echo '>', $text, '</option>';
+            $html .= '>' . $text . '</option>';
         }
         
-        echo '</select>';
+        $html .= '</select>';
+
+        return $html;
     }
 }
diff --git a/Element/Sort.php b/Element/Sort.php
index b5a75a6..c077ceb 100644
--- a/Element/Sort.php
+++ b/Element/Sort.php
@@ -35,22 +35,27 @@ public function jQueryDocumentReady()
         echo 'jQuery("#' . $this->attributes["id"] . '").disableSelection();';
     }
 
-    public function render()
+    public function getInput()
     {
+        $html = '';
+
         if (substr($this->attributes["name"], -2) != "[]") {
             $this->attributes["name"] .= "[]";
         }
 
-        echo '<ul id="' . $this->attributes["id"] . '">';
+        $html .= '<ul id="' . $this->attributes["id"] . '">';
 
         foreach ($this->options as $value => $text) {
             $value = $this->getOptionValue($value);
 
-            echo '<li class="ui-state-default">
+            $html .= '<li class="ui-state-default">
                     <input type="hidden" name="' . $this->attributes["name"] . '" value="' . $value . '"/>' . $text .
                  '</li>';
         }
-        echo "</ul>";
+
+        $html .= "</ul>";
+
+        return $html;
     }
 
     public function renderCSS()
diff --git a/Element/Summernote.php b/Element/Summernote.php
index 3d1eeb3..ab0422d 100644
--- a/Element/Summernote.php
+++ b/Element/Summernote.php
@@ -8,7 +8,7 @@
 
 namespace Arastta\Component\Form\Element;
 
-class Summernote extends Textarea
+class SummerNote extends Textarea
 {
     
     protected $basic;
@@ -16,15 +16,19 @@ class Summernote extends Textarea
     protected $jspath;
     protected $function_name;
 
-    public function render()
+    public function getInput()
     {
-        echo "<textarea", $this->getAttributes(array("value", "required")), ">";
+        $html = '';
+
+        $html .= "<textarea" . $this->getAttributes(array("value", "required")) . ">";
         
         if (!empty($this->attributes["value"])) {
-            echo $this->attributes["value"];
+            $html .= $this->attributes["value"];
         }
         
-        echo "</textarea>";
+        $html .= "</textarea>";
+
+        return $html;
     }
 
     public function renderJS()
diff --git a/Element/Textarea.php b/Element/Textarea.php
index 8d23bfd..473c306 100644
--- a/Element/Textarea.php
+++ b/Element/Textarea.php
@@ -15,14 +15,18 @@ class Textarea extends Element
     
     protected $attributes = array("rows" => "5", "class" => "form-control");
 
-    public function render()
+    public function getInput()
     {
-        echo "<textarea", $this->getAttributes("value"), ">";
+        $html = '';
+
+        $html .= "<textarea" . $this->getAttributes("value") . ">";
         
         if (!empty($this->attributes["value"])) {
-            echo $this->filter($this->attributes["value"]);
+            $html .= $this->filter($this->attributes["value"]);
         }
         
-        echo "</textarea>";
+        $html .= "</textarea>";
+
+        return $html;
     }
 }
diff --git a/Element/Textbox.php b/Element/Textbox.php
index dd1e71f..b899ede 100644
--- a/Element/Textbox.php
+++ b/Element/Textbox.php
@@ -17,8 +17,10 @@ class Textbox extends Element
     protected $prepend;
     protected $append;
 
-    public function render()
+    public function getInput()
     {
+        $html = '';
+
         $addons = array();
 
         if (!empty($this->prepend)) {
@@ -30,22 +32,26 @@ public function render()
         }
         
         if (!empty($addons)) {
-            echo '<div class="', implode(" ", $addons), '">';
+            $html .= '<div class="' . implode(" ", $addons) . '">';
         }
-        
-        $this->renderAddOn("prepend");
-        
-        parent::render();
-        
-        $this->renderAddOn("append");
+
+        $html .= $this->getAddOn("prepend");
+
+        $html .= parent::getInput();
+
+        $html .= $this->getAddOn("append");
 
         if (!empty($addons)) {
-            echo '</div>';
+            $html .= '</div>';
         }
+
+        return $html;
     }
 
-    protected function renderAddOn($type = "prepend")
+    protected function getAddOn($type = "prepend")
     {
+        $html = '';
+
         if (!empty($this->$type)) {
             $span = true;
             
@@ -54,14 +60,16 @@ protected function renderAddOn($type = "prepend")
             }
             
             if ($span) {
-                echo '<span class="add-on">';
+                $html .= '<span class="add-on">';
             }
-                
-            echo $this->$type;
+
+            $html .= $this->$type;
 
             if ($span) {
-                echo '</span>';
+                $html .= '</span>';
             }
         }
+
+        return $html;
     }
 }
diff --git a/Element/TinyMCE.php b/Element/TinyMCE.php
index 929b24c..4f9996d 100644
--- a/Element/TinyMCE.php
+++ b/Element/TinyMCE.php
@@ -15,15 +15,19 @@ class TinyMCE extends Textarea
     protected $jspath;
     protected $function_name;
 
-    public function render()
+    public function getInput()
     {
-        echo "<textarea", $this->getAttributes(array("value", "required")), ">";
+        $html = '';
+
+        $html .= "<textarea" . $this->getAttributes(array("value", "required")) . ">";
         
         if (!empty($this->attributes["value"])) {
-            echo $this->attributes["value"];
+            $html .= $this->attributes["value"];
         }
         
-        echo "</textarea>";
+        $html .= "</textarea>";
+
+        return $html;
     }
 
     public function renderJS()
diff --git a/Element/Url.php b/Element/Url.php
index 0209919..f8d3563 100644
--- a/Element/Url.php
+++ b/Element/Url.php
@@ -17,8 +17,12 @@ class Url extends Textbox
 
     public function render()
     {
+        $html = '';
+
         $this->validation[] = new ValidationUrl;
 
-        parent::render();
+        $html .= parent::getInput();
+
+        return $html;
     }
 }
diff --git a/Element/Week.php b/Element/Week.php
index d175e7d..7de1c3d 100644
--- a/Element/Week.php
+++ b/Element/Week.php
@@ -29,10 +29,14 @@ public function __construct($label, $name, array $properties = null)
 
     public function render()
     {
+        $html = '';
+
         $msg =  "Error: The %element% field must match the following date format: " . $this->attributes["title"];
 
         $this->validation[] = new RegExp("/" . $this->attributes["pattern"] . "/", $msg);
 
-        parent::render();
+        $html .= parent::getInput();
+
+        return $html;
     }
 }
diff --git a/View.php b/View.php
index 2996d1d..5a92f0a 100644
--- a/View.php
+++ b/View.php
@@ -36,21 +36,23 @@ public function renderCSS()
         echo 'span.help-inline, span.help-block { color: #888; font-size: .9em; font-style: italic; }';
     }
 
-    protected function renderDescriptions($element)
+    protected function getDescriptions($element)
     {
+        $html = '';
+
         $shortDesc = $element->getShortDesc();
 
         if (!empty($shortDesc)) {
-            echo '<span class="help-inline">', $shortDesc, '</span>';
-            ;
+            $html .= '<span class="help-inline">' . $shortDesc . '</span>';
         }
 
         $longDesc = $element->getLongDesc();
 
         if (!empty($longDesc)) {
-            echo '<span class="help-block">', $longDesc, '</span>';
-            ;
+            $html .= '<span class="help-block">' . $longDesc . '</span>';
         }
+
+        return $html;
     }
 
     public function renderJS()
diff --git a/View/Inline.php b/View/Inline.php
index 3855c07..c7ff257 100644
--- a/View/Inline.php
+++ b/View/Inline.php
@@ -35,7 +35,7 @@ public function render()
 
             $element = $elements[$e];
 
-            echo $this->renderLabel($element), ' ', $element->render(), $this->renderDescriptions($element);
+            echo $this->getLabel($element), ' ', $element->getInput(), $this->getDescriptions($element);
 
             ++$elementCount;
         }
@@ -43,19 +43,23 @@ public function render()
         echo '</form>';
     }
 
-    protected function renderLabel(Element $element)
+    protected function getLabel(Element $element)
     {
+        $html = '';
+
         $label = $element->getLabel();
 
         if (!empty($label)) {
-            echo '<label for="', $element->getAttribute("id"), '">';
+            $html .= '<label for="' . $element->getAttribute("id") . '">';
 
             if ($element->isRequired()) {
-                echo '<span class="required">* </span>';
+                $html .= '<span class="required">* </span>';
             }
 
-            echo $label;
-            echo '</label>';
+            $html .= $label;
+            $html .= '</label>';
         }
+
+        return $html;
     }
 }
diff --git a/View/SideBySide.php b/View/SideBySide.php
index 44929cf..0000551 100644
--- a/View/SideBySide.php
+++ b/View/SideBySide.php
@@ -35,7 +35,7 @@ public function render()
 
             if ($element instanceof Hidden || $element instanceof HTML
             ) {
-                $element->render();
+                $element->getInput();
             } elseif ($element instanceof Button) {
                 if ($e == 0 || !$elements[($e - 1)] instanceof Button) {
                     echo '<div class="form-actions">';
@@ -58,9 +58,9 @@ public function render()
                 }
 
                 echo '<div class="form-group ' . $required . '">' .
-                        $this->renderLabel($element) .
+                        $this->getLabel($element) .
                         '<div class="col-sm-10">' .
-                            $element->render() . $this->renderDescriptions($element) .
+                            $element->getInput() . $this->getDescriptions($element) .
                         '</div>
                       </div>';
 
@@ -71,13 +71,17 @@ public function render()
         echo '</fieldset></form>';
     }
 
-    protected function renderLabel(Element $element)
+    protected function getLabel(Element $element)
     {
+        $html = '';
+
         $label = $element->getLabel();
 
         if (!empty($label)) {
-            echo '<label class="col-sm-2 control-label" for="' . $element->getAttribute("id") . '">';
-            echo $label . '</label>';
+            $html .= '<label class="col-sm-2 control-label" for="' . $element->getAttribute("id") . '">';
+            $html .= $label . '</label>';
         }
+
+        return $html;
     }
 }
diff --git a/View/Vertical.php b/View/Vertical.php
index 16e4d4b..5b4175d 100644
--- a/View/Vertical.php
+++ b/View/Vertical.php
@@ -35,17 +35,17 @@ public function render()
                     echo ' ';
                 }
 
-                $element->render();
+                $element->getInput();
 
                 if (($e + 1) == $elementSize || !$elements[($e + 1)] instanceof Button) {
                     echo '</div>';
                 }
             } else {
-                $this->renderLabel($element);
+                $this->getLabel($element);
 
-                $element->render();
+                $element->getInput();
 
-                $this->renderDescriptions($element);
+                $this->getDescriptions($element);
 
                 ++$elementCount;
             }
@@ -54,20 +54,24 @@ public function render()
         echo '</form>';
     }
 
-    protected function renderLabel(Element $element)
+    protected function getLabel(Element $element)
     {
+        $html = '';
+
         $label = $element->getLabel();
 
-        echo '<label for="', $element->getAttribute("id"), '">';
+        $html .= '<label for="' . $element->getAttribute("id") . '">';
 
         if (!empty($label)) {
             if ($element->isRequired()) {
-                echo '<span class="required">* </span>';
+                $html .= '<span class="required">* </span>';
             }
 
-            echo $label;
+            $html .= $label;
         }
 
-        echo '</label>';
+        $html .= '</label>';
+
+        return $html;
     }
 }