Merge branch '3.1'

README.md

@@ -60,7 +60,7 @@ Add `Orchestra\Messages\MessagesServiceProvider` service provider in `config/app
 
     // ...
 
-    'Orchestra\Messages\MessagesServiceProvider',
+    Orchestra\Messages\MessagesServiceProvider::class,
 ],
 ```
 
@@ -73,7 +73,7 @@ You might want to add `Orchestra\Support\Facades\Messages` to class aliases in `
 
     // ...
 
-    'Messages' => 'Orchestra\Support\Facades\Messages',
+    'Messages' => Orchestra\Support\Facades\Messages::class,
 ],
 ```
 
@@ -114,11 +114,10 @@ Here's an example how you can display the message:
 $message = Messages::retrieve();
 
 if ($message instanceof Orchestra\Messages\MessageBag) {
+    $message->setFormat('<div class="alert alert-:key">:message</div>');
+
     foreach (['error', 'info', 'success'] as $key) {
         if ($message->has($key)) {
-            $message->setFormat(
-                '<div class="alert alert-'.$key.'">:message</div>'
-            );
             echo implode('', $message->get($key));
         }
     }

src/Http/Middleware/StoreMessageBag.php

@@ -5,7 +5,7 @@
 
 class StoreMessageBag
 {
-     /**
+    /**
      * The application implementation.
      *
      * @var \Illuminate\Contracts\Foundation\Application
@@ -38,4 +38,3 @@ public function handle($request, Closure $next)
         return $response;
     }
 }
-

src/helpers.php

@@ -5,12 +5,12 @@
      * Add a message to the bag.
      *
      * @param  string  $key
-     * @param  string  $message
+     * @param  string|callable  $message
      *
      * @return \Orchestra\Messages\MessageBag
      */
     function messages($key, $message)
     {
-        return app('orchestra.messages')->add($key, $message);
+        return app('orchestra.messages')->add($key, value($message));
     }
 }