Fix errorbag

app/FormBuilder.php

@@ -4,6 +4,8 @@
 use Illuminate\Support\HtmlString;
 use Illuminate\Support\MessageBag;
 use Illuminate\Support\Collection;
+use Illuminate\Routing\UrlGenerator;
+use Illuminate\View\Factory;
 
 class FormBuilder extends Form
 {
@@ -14,6 +16,13 @@ class FormBuilder extends Form
     protected $isHorizontalForm = false;
     protected $framework = 'none';
 
+    public function __construct(HtmlBuilder $html, UrlGenerator $url, Factory $view, $csrfToken)
+    {
+        parent::__construct($html, $url, $view, $csrfToken);
+
+        $this->errors = app('session')->get('errors', new MessageBag());
+    }
+
     /**
      * @param string $returnUrl
      *
@@ -89,8 +98,6 @@ public function select($name, $list = [], $selected = null, $options = [])
      */
     public function open(array $options = [])
     {
-        $this->errors = app('session')->get('errors', new MessageBag());
-
         if (array_key_exists('class', $options) && (strpos($options['class'], 'form-horizontal') !== false)) {
             $this->isHorizontalForm = true;
         }
@@ -120,6 +127,10 @@ public function model($model, array $options = [])
     {
         $this->errors = app('session')->get('errors', new MessageBag());
 
+        if (! $this->errors) {
+            $this->errors = new Collection();
+        }
+
         if (array_key_exists('class', $options) && (strpos($options['class'], 'form-horizontal') !== false)) {
             $this->isHorizontalForm = true;
         }
@@ -461,7 +472,11 @@ private function getFormGroupClasses($name)
     }
 
     private function getErrorHtml($name) {
-        if (! $this->hasErrors() xor ! $this->errors->has($name)) {
+        if (! $this->hasErrors()) {
+            return '';
+        }
+
+        if (! $this->errors->has($name)) {
             return '';
         }