Merge branch '3.8'

orchestral · Aug 8, 2019 · e68e88f · e68e88f
2 parents 288c7fa + 75544c2
commit e68e88f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,14 @@
 
 This changelog references the relevant changes (bug and security fixes) done to `orchestra/messages`.
 
+## 3.8.2
+
+Released: 2019-08-08
+
+### Changes
+
+* Refactor `Orchestra\Messages\MessageBag`.
+
 ## 3.8.1
 
 Released: 2019-08-04

diff --git a/src/MessageBag.php b/src/MessageBag.php
@@ -3,7 +3,6 @@
 namespace Orchestra\Messages;
 
 use Closure;
-use Illuminate\Support\Facades\Session;
 use Illuminate\Support\MessageBag as Message;
 use Illuminate\Contracts\Session\Session as SessionContract;
 use Illuminate\Contracts\Support\MessageBag as MessageContract;
@@ -64,7 +63,7 @@ public function extend(Closure $callback): MessageContract
 
         $callback($messageBag);
 
-        return $this;
+        return $messageBag;
     }
 
     /**

diff --git a/src/MessagesServiceProvider.php b/src/MessagesServiceProvider.php
@@ -30,8 +30,8 @@ class MessagesServiceProvider extends MiddlewareServiceProvider
     public function register()
     {
         $this->app->singleton('orchestra.messages', static function ($app) {
-            return \tap(new MessageBag(), static function ($bag) use ($app) {
-                $bag->setSessionStore($app->make('session.store'));
+            return \tap(new MessageBag(), static function ($messageBag) use ($app) {
+                $messageBag->setSessionStore($app->make('session.store'));
             });
         });
     }