From c75c5b38790f2947fd8377b3103bb735b3e34f3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Samuel=20=C5=A0tancl?= Date: Wed, 13 May 2020 06:39:16 +0200 Subject: [PATCH] Testing 6.x support even for Assert --- tests/TestCase.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/tests/TestCase.php b/tests/TestCase.php index 9388afda..9035e0f3 100644 --- a/tests/TestCase.php +++ b/tests/TestCase.php @@ -5,7 +5,6 @@ declare(strict_types=1); namespace Stancl\Tenancy\Tests; use Illuminate\Support\Facades\Redis; -use Illuminate\Testing\Assert as PHPUnit; use Stancl\Tenancy\Tests\Etc\Tenant; abstract class TestCase extends \Orchestra\Testbench\TestCase @@ -32,9 +31,8 @@ abstract class TestCase extends \Orchestra\Testbench\TestCase // Laravel 6.x support $testResponse = class_exists('Illuminate\Testing\TestResponse') ? 'Illuminate\Testing\TestResponse' : 'Illuminate\Foundation\Testing\TestResponse'; $testResponse::macro('assertContent', function ($content) { - /** @var TestResponse $this */ - - PHPUnit::assertSame($content, $this->baseResponse->getContent()); + $assertClass = class_exists('Illuminate\Testing\Assert') ? 'Illuminate\Testing\Assert' : 'Illuminate\Foundation\Testing\Assert'; + $assertClass::assertSame($content, $this->baseResponse->getContent()); return $this; });