Merge pull request #6 from ARCANEDEV/develop

Adding the ability to skip the escaping for labels
ARCANEDEV · Jun 12, 2016 · 1d9e5d3 · 1d9e5d3
2 parents 0769502 + 6438487
commit 1d9e5d3
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 10 deletions.
diff --git a/src/Contracts/FormBuilderInterface.php b/src/Contracts/FormBuilderInterface.php
@@ -109,10 +109,11 @@ public function token();
      * @param  string  $name
      * @param  string  $value
      * @param  array   $options
+     * @param  bool    $escaped
      *
      * @return \Illuminate\Support\HtmlString
      */
-    public function label($name, $value = null, array $options = []);
+    public function label($name, $value = null, array $options = [], $escaped = true);
 
     /**
      * Create a form input field.

diff --git a/src/FormBuilder.php b/src/FormBuilder.php
@@ -350,14 +350,17 @@ public function token()
      * @param  string  $name
      * @param  string  $value
      * @param  array   $options
+     * @param  bool    $escaped
      *
      * @return \Illuminate\Support\HtmlString
      */
-    public function label($name, $value = null, array $options = [])
+    public function label($name, $value = null, array $options = [], $escaped = true)
     {
         $this->labels[] = $name;
 
-        return $this->toHtmlString(Helpers\Label::make($name, $value, $options));
+        return $this->toHtmlString(
+            Helpers\Label::make($name, $value, $options, $escaped)
+        );
     }
 
     /**

diff --git a/src/Helpers/Label.php b/src/Helpers/Label.php
@@ -12,14 +12,17 @@ class Label
      * @param  string  $name
      * @param  string  $value
      * @param  array   $options
+     * @param  bool    $escaped
      *
      * @return string
      */
-    public static function make($name, $value = null, array $options = [])
+    public static function make($name, $value = null, array $options = [], $escaped = true)
     {
+        $value = self::format($name, $value);
+
         return implode('', [
             '<label for="' . $name . '"' . Attributes::make($options) . '>',
-                e(self::format($name, $value)),
+                $escaped ? e($value) : $value,
             '</label>'
         ]);
     }

diff --git a/tests/FormBuilderTest.php b/tests/FormBuilderTest.php
@@ -116,12 +116,13 @@ public function it_can_close_form()
      * @param  string  $name
      * @param  string  $value
      * @param  array   $options
+     * @param  bool    $escaped
      */
-    public function it_can_make_label($expected, $name, $value, $options)
+    public function it_can_make_label($expected, $name, $value, $options, $escaped = true)
     {
         $this->assertEquals(
             $expected,
-            $this->form->label($name, $value, $options)
+            $this->form->label($name, $value, $options, $escaped)
         );
     }
 
@@ -1334,13 +1335,19 @@ public function provideLabels()
                 '<label for="foo">Foobar</label>',
                 'foo',
                 'Foobar',
-                []
+                [],
             ],[
                 '<label for="foo" class="control-label">Foobar</label>',
                 'foo',
                 'Foobar',
-                ['class' => 'control-label']
-            ]
+                ['class' => 'control-label'],
+            ],[
+                '<label for="foo">Foobar <i>bar</i></label>',
+                'foo',
+                'Foobar <i>bar</i>',
+                [],
+                false
+            ],
         ];
     }