Skip to content

Commit ba7476d

Browse files
committed
feat: 兼容 laravel 6.x
1 parent ae48a85 commit ba7476d

File tree

5 files changed

+9
-9
lines changed

5 files changed

+9
-9
lines changed

composer.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@
99
}
1010
],
1111
"require": {
12-
"php": ">=7.0.0"
12+
"php": ">=7.2.5"
1313
},
1414
"require-dev": {
15-
"orchestra/testbench": "^3.5",
16-
"phpunit/phpunit": "~6.0",
15+
"orchestra/testbench": "^4.0",
16+
"phpunit/phpunit": "^8.0",
17+
"orchestra/database": "^4.0",
1718
"jiannei/laravel-enum": "~1.4",
18-
"league/fractal": "^0.19.2",
19-
"orchestra/database": "^3.5"
19+
"league/fractal": "^0.19.2"
2020
},
2121
"autoload": {
2222
"psr-4": {

src/Response.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
use Illuminate\Contracts\Support\Arrayable;
1515
use Illuminate\Http\Exceptions\HttpResponseException;
1616
use Illuminate\Http\JsonResponse;
17-
use Illuminate\Http\Resources\Json\Resource as JsonResource;
17+
use Illuminate\Http\Resources\Json\JsonResource;
1818
use Illuminate\Http\Resources\Json\ResourceCollection;
1919
use Illuminate\Pagination\AbstractPaginator;
2020
use Illuminate\Support\Arr;

src/Support/Facades/Response.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
namespace Jiannei\Response\Laravel\Support\Facades;
1313

1414
use Illuminate\Http\JsonResponse;
15-
use Illuminate\Http\Resources\Json\Resource as JsonResource;
15+
use Illuminate\Http\Resources\Json\JsonResource;
1616
use Illuminate\Support\Facades\Facade as IlluminateFacade;
1717

1818
/**

tests/Repositories/Resources/UserResource.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
namespace Jiannei\Response\Laravel\Tests\Repositories\Resources;
1313

14-
use Illuminate\Http\Resources\Json\Resource as JsonResource;
14+
use Illuminate\Http\Resources\Json\JsonResource;
1515

1616
class UserResource extends JsonResource
1717
{

tests/TestCase.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ abstract class TestCase extends \Orchestra\Testbench\TestCase
1616
/**
1717
* Setup the test environment.
1818
*/
19-
protected function setUp()
19+
protected function setUp(): void
2020
{
2121
parent::setUp();
2222

0 commit comments

Comments
 (0)