Merge branch '3.8'

orchestral · Feb 21, 2019 · 9cb6a1c · 9cb6a1c
2 parents bb09ebc + 08bb442
commit 9cb6a1c
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 41 deletions.
diff --git a/src/Http/Middleware/StoreMessageBag.php b/src/Http/Middleware/StoreMessageBag.php
@@ -3,27 +3,10 @@
 namespace Orchestra\Messages\Http\Middleware;
 
 use Closure;
-use Illuminate\Contracts\Foundation\Application;
+use Orchestra\Support\Facades\Messages;
 
 class StoreMessageBag
 {
-    /**
-     * The application implementation.
-     *
-     * @var \Illuminate\Contracts\Foundation\Application
-     */
-    protected $app;
-
-    /**
-     * Create a new middleware instance.
-     *
-     * @param  \Illuminate\Contracts\Foundation\Application  $app
-     */
-    public function __construct(Application $app)
-    {
-        $this->app = $app;
-    }
-
     /**
      * Handle an incoming request.
      *
@@ -34,10 +17,8 @@ public function __construct(Application $app)
      */
     public function handle($request, Closure $next)
     {
-        $response = $next($request);
-
-        $this->app->make('orchestra.messages')->save();
-
-        return $response;
+        return \tap($next($request), function () {
+            Messages::save();
+        });
     }
 }
diff --git a/src/helpers.php b/src/helpers.php
@@ -1,6 +1,7 @@
 <?php
 
-use Orchestra\Messages\MessageBag;
+use Orchestra\Support\Facades\Messages;
+use Orchestra\Contracts\Messages\MessageBag;
 
 if (! \function_exists('messages')) {
     /**
@@ -9,12 +10,10 @@
      * @param  string  $key
      * @param  string|callable  $message
      *
-     * @return \Orchestra\Messages\MessageBag
+     * @return \Orchestra\Contracts\Messages\MessageBag
      */
     function messages(string $key, $message): MessageBag
     {
-        return \app('orchestra.messages')->add(
-            $key, \value($message)
-        );
+        return Messages::add($key, \value($message));
     }
 }
diff --git a/...t/Http/Middleware/StoreMessageBagTest.php → ...e/Http/Middleware/StoreMessageBagTest.php b/...t/Http/Middleware/StoreMessageBagTest.php → ...e/Http/Middleware/StoreMessageBagTest.php
@@ -1,35 +1,27 @@
 <?php
 
-namespace Orchestra\Messages\TestCase\Unit\Http\Middleware;
+namespace Orchestra\Messages\TestCase\Feature\Http\Middleware;
 
 use Mockery as m;
 use Illuminate\Http\Request;
-use PHPUnit\Framework\TestCase;
+use Orchestra\Testbench\TestCase;
+use Orchestra\Support\Facades\Messages;
 use Orchestra\Contracts\Messages\MessageBag;
 use Illuminate\Contracts\Foundation\Application;
 use Orchestra\Messages\Http\Middleware\StoreMessageBag;
 
 class StoreMessageBagTest extends TestCase
 {
-    /**
-     * Teardown the test environment.
-     */
-    protected function tearDown(): void
-    {
-        m::close();
-    }
-
     /** @test */
     public function it_handle_as_http_middleware()
     {
-        $app = m::mock(Application::class);
         $messages = m::mock(MessageBag::class);
         $request = m::mock(Request::class);
 
-        $app->shouldReceive('make')->once()->with('orchestra.messages')->andReturn($messages);
+        $this->app->instance('orchestra.messages', $messages);
         $messages->shouldReceive('save')->once()->andReturnNull();
 
-        $stub = new StoreMessageBag($app);
+        $stub = new StoreMessageBag();
 
         $this->assertEquals('foo', $stub->handle($request, function ($request) {
             return 'foo';