Merge branch 'develop'

Author: lgtaxn

README.md

@@ -141,7 +141,7 @@ Will be replaced by:
     type="text"
     name="name"
     id="name"
-    value="{!! e(old('name'), false) !!}"
+    value="{{ old('name') }}"
 >
 ```
 
@@ -160,7 +160,7 @@ Will be replaced by:
 <input
     type="text"
     name="name[0]"
-    value="{!! e(old('name.0'), false) !!}"
+    value="{{ old('name.0') }}"
 >
 ```
 
@@ -174,7 +174,7 @@ integrate the replacement function into the output result like this:
 <input
     type="text"
     name="name[0]"
-    value="{!! e(old(str_replace(['.', '[]', '[', ']'], ['_', '', '.', ''], 'name['.$index.']')), false) !!}"
+    value="{{ old(str_replace(['.', '[]', '[', ']'], ['_', '', '.', ''], 'name['.$index.']')) }}"
 >
 ```
 
@@ -200,7 +200,7 @@ Will be replaced by:
     type="checkbox"
     name="name[]"
     value="1"
-    @checked (in_array('1', (array) old('name')))
+    @checked(in_array('1', (array) old('name')))
 >
 ```
 
@@ -217,7 +217,7 @@ It will appear like this:
     type="checkbox"
     name="name[]"
     value="1"
-    @checked (! old() ? true : in_array('1', (array) old('name')))
+    @checked(! old() ? true : in_array('1', (array) old('name')))
 >
 ```
 
@@ -257,7 +257,7 @@ Will be replaced by:
     type="text"
     name="name"
     id="name"
-    value="{!! e(old('name'), false) !!}"
+    value="{{ old('name') }}"
 >
 ```
 
@@ -285,7 +285,7 @@ Will be replaced by:
     type="text"
     name="name"
     id="name"
-    value="{!! e(old('name'), false) !!}"
+    value="{{ old('name') }}"
     {{-- @TODO CHECK OPTIONS: array_merge($defaultOptions, [
         'size' => 50,
         'required',

src/Converter.php

@@ -201,15 +201,15 @@ protected static function buildFormOpen(string $options): string
             $input .= "\n".static::$indent.'    @if (strtoupper('.$method.') !== \'GET\')';
             $input .= "\n".static::$indent.'        @csrf';
             $input .= "\n".static::$indent.'        @if (strtoupper('.$method.') !== \'POST\')';
-            $input .= "\n".static::$indent.'            @method ('.$method.')';
+            $input .= "\n".static::$indent.'            @method('.$method.')';
             $input .= "\n".static::$indent.'        @endif';
             $input .= "\n".static::$indent.'    @endif';
 
         } elseif ($method !== 'GET') {
             $input .= "\n".static::$indent.'    @csrf';
 
             if ($method !== 'POST') {
-                $input .= "\n".static::$indent.'    @method (\''.$method.'\')';
+                $input .= "\n".static::$indent.'    @method(\''.$method.'\')';
             }
         }
 
@@ -366,9 +366,9 @@ protected static function buildSelect(string $name, string $list, string $select
         $input .= $placeholderOption;
         $input .= static::$indent.'    @foreach ('.$list.' as $optionValue => $optionText)'."\n";
         $input .= static::$indent.'        <option '."\n";
-        $input .= static::$indent.'            value="{!! e($optionValue, false) !!}" '."\n";
-        $input .= static::$indent.'            @selected (in_array($optionValue, (array) ('.static::withOldHelperIfNeeded($name, $selectedValue).')))'."\n";
-        $input .= static::$indent.'        >{!! e($optionText, false) !!}</option>'."\n";
+        $input .= static::$indent.'            value="'.static::escapedEcho('$optionValue').'" '."\n";
+        $input .= static::$indent.'            @selected(in_array($optionValue, (array) ('.static::withOldHelperIfNeeded($name, $selectedValue).')))'."\n";
+        $input .= static::$indent.'        >'.static::escapedEcho('$optionText').'</option>'."\n";
         $input .= static::$indent.'    @endforeach'."\n";
         $input .= static::$indent.'</select>';
 
@@ -432,7 +432,7 @@ protected static function buildHtmlTagAttributes(array $attributes): string
                 } elseif ($attrName === 'multiple') {
                     $attr = '@if ('.$attrValue.') multiple @endif';
                 } else {
-                    $attr = '@'.$attrName.' ('.$attrValue.')';
+                    $attr = '@'.$attrName.'('.$attrValue.')';
                 }
 
             } elseif ($attrName === 'class' && preg_match('/^\s*(\[\s*.*\s*\])\s*$/Us', $attrValue, $matches)) {
@@ -461,6 +461,15 @@ protected static function isEmpty(string $value): bool
         return \in_array(strtolower($value), ['', "''", '""', 'false', 'null']);
     }
 
+    protected static function escapedEcho(string $value): string
+    {
+        if (static::$escapeWithoutDoubleEncode) {
+            return '{!! e('.$value.', false) !!}';
+        }
+
+        return '{{ '.$value.' }}';
+    }
+
     /**
      * Examples:
      *
@@ -492,11 +501,7 @@ protected static function withEchoIfNeeded(string $value, bool $escape): string
         }
 
         if ($escape) {
-            if (static::$escapeWithoutDoubleEncode) {
-                return '{!! e('.$value.', false) !!}';
-            }
-
-            return '{{ '.$value.' }}';
+            return static::escapedEcho($value);
         }
 
         return '{!! '.$value.' !!}';