Skip to content

Commit

Permalink
feat: 兼容 laravel 6.x
Browse files Browse the repository at this point in the history
  • Loading branch information
jiannei committed Sep 19, 2021
1 parent ae48a85 commit ba7476d
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 9 deletions.
10 changes: 5 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@
}
],
"require": {
"php": ">=7.0.0"
"php": ">=7.2.5"
},
"require-dev": {
"orchestra/testbench": "^3.5",
"phpunit/phpunit": "~6.0",
"orchestra/testbench": "^4.0",
"phpunit/phpunit": "^8.0",
"orchestra/database": "^4.0",
"jiannei/laravel-enum": "~1.4",
"league/fractal": "^0.19.2",
"orchestra/database": "^3.5"
"league/fractal": "^0.19.2"
},
"autoload": {
"psr-4": {
Expand Down
2 changes: 1 addition & 1 deletion src/Response.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
use Illuminate\Contracts\Support\Arrayable;
use Illuminate\Http\Exceptions\HttpResponseException;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Resources\Json\Resource as JsonResource;
use Illuminate\Http\Resources\Json\JsonResource;
use Illuminate\Http\Resources\Json\ResourceCollection;
use Illuminate\Pagination\AbstractPaginator;
use Illuminate\Support\Arr;
Expand Down
2 changes: 1 addition & 1 deletion src/Support/Facades/Response.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
namespace Jiannei\Response\Laravel\Support\Facades;

use Illuminate\Http\JsonResponse;
use Illuminate\Http\Resources\Json\Resource as JsonResource;
use Illuminate\Http\Resources\Json\JsonResource;
use Illuminate\Support\Facades\Facade as IlluminateFacade;

/**
Expand Down
2 changes: 1 addition & 1 deletion tests/Repositories/Resources/UserResource.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

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

use Illuminate\Http\Resources\Json\Resource as JsonResource;
use Illuminate\Http\Resources\Json\JsonResource;

class UserResource extends JsonResource
{
Expand Down
2 changes: 1 addition & 1 deletion tests/TestCase.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ abstract class TestCase extends \Orchestra\Testbench\TestCase
/**
* Setup the test environment.
*/
protected function setUp()
protected function setUp(): void
{
parent::setUp();

Expand Down

0 comments on commit ba7476d

Please sign in to comment.