[8.x] Adds a small fix for unicode with blade echo handlers (#37697)

* Adds a small fix for unicode with blade handlers.

* CS fixes

* CS fixes

src/Illuminate/View/Compilers/Concerns/CompilesEchos.php

@@ -141,7 +141,13 @@ protected function addBladeCompilerVariable($result)
      */
     protected function wrapInEchoHandler($value)
     {
-        return empty($this->echoHandlers) ? $value : '$__bladeCompiler->applyEchoHandler('.Str::beforeLast($value, ';').')';
+        $value = Str::of($value)
+            ->trim()
+            ->when(Str::endsWith($value, ';'), function ($str) {
+                return $str->beforeLast(';');
+            });
+
+        return empty($this->echoHandlers) ? $value : '$__bladeCompiler->applyEchoHandler('.$value.')';
     }
 
     /**

tests/View/Blade/BladeEchoHandlerTest.php

@@ -102,6 +102,7 @@ public function nonStringableDataProvider()
             ['{{"foo" . "bar"}}', 'foobar'],
             ['{{ 1 + 2 }}{{ "test"; }}', '3test'],
             ['@php($test = "hi"){{ $test }}', 'hi'],
+            ['{!! " " !!}', ' '],
         ];
     }
 }