Skip to content

Commit 9898574

Browse files
committed
[Tests] Remove hashids test dependency
Closes #160
1 parent 5dd4f03 commit 9898574

21 files changed

+22
-118
lines changed

composer.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
},
3636
"require-dev": {
3737
"cloudcreativity/json-api-testing": "^4.0",
38-
"laravel-json-api/hashids": "^1.1",
3938
"laravel-json-api/testing": "^1.1",
4039
"orchestra/testbench": "^6.23",
4140
"phpunit/phpunit": "^9.5.10"

tests/dummy/app/JsonApi/V1/Comments/CommentSchema.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@
2121

2222
use App\Models\Comment;
2323
use LaravelJsonApi\Eloquent\Fields\DateTime;
24+
use LaravelJsonApi\Eloquent\Fields\ID;
2425
use LaravelJsonApi\Eloquent\Fields\Relations\BelongsTo;
2526
use LaravelJsonApi\Eloquent\Fields\Str;
2627
use LaravelJsonApi\Eloquent\Filters\WhereIdIn;
2728
use LaravelJsonApi\Eloquent\Pagination\PagePagination;
2829
use LaravelJsonApi\Eloquent\Schema;
29-
use LaravelJsonApi\HashIds\HashId;
3030

3131
class CommentSchema extends Schema
3232
{
@@ -44,7 +44,7 @@ class CommentSchema extends Schema
4444
public function fields(): array
4545
{
4646
return [
47-
HashId::make()->alreadyHashed()->withLength(10),
47+
ID::make(),
4848
Str::make('content'),
4949
DateTime::make('createdAt')->sortable()->readOnly(),
5050
BelongsTo::make('post'),

tests/dummy/app/JsonApi/V1/Posts/PostSchema.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121

2222
use App\Models\Post;
2323
use LaravelJsonApi\Eloquent\Fields\DateTime;
24+
use LaravelJsonApi\Eloquent\Fields\ID;
2425
use LaravelJsonApi\Eloquent\Fields\Relations\BelongsTo;
2526
use LaravelJsonApi\Eloquent\Fields\Relations\BelongsToMany;
2627
use LaravelJsonApi\Eloquent\Fields\Relations\HasMany;
@@ -35,7 +36,6 @@
3536
use LaravelJsonApi\Eloquent\Schema;
3637
use LaravelJsonApi\Eloquent\SoftDeletes;
3738
use LaravelJsonApi\Eloquent\Sorting\SortCountable;
38-
use LaravelJsonApi\HashIds\HashId;
3939

4040
class PostSchema extends Schema
4141
{
@@ -67,7 +67,7 @@ class PostSchema extends Schema
6767
public function fields(): array
6868
{
6969
return [
70-
HashId::make()->alreadyHashed()->withLength(10),
70+
ID::make(),
7171
BelongsTo::make('author')->type('users')->readOnly(),
7272
HasMany::make('comments')->canCount()->readOnly(),
7373
Str::make('content'),

tests/dummy/app/JsonApi/V1/Tags/TagSchema.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@
2121

2222
use App\Models\Tag;
2323
use LaravelJsonApi\Eloquent\Fields\DateTime;
24+
use LaravelJsonApi\Eloquent\Fields\ID;
2425
use LaravelJsonApi\Eloquent\Fields\Relations\BelongsToMany;
2526
use LaravelJsonApi\Eloquent\Fields\Str;
2627
use LaravelJsonApi\Eloquent\Filters\WhereIdIn;
2728
use LaravelJsonApi\Eloquent\Pagination\PagePagination;
2829
use LaravelJsonApi\Eloquent\Schema;
29-
use LaravelJsonApi\HashIds\HashId;
3030

3131
class TagSchema extends Schema
3232
{
@@ -44,7 +44,7 @@ class TagSchema extends Schema
4444
public function fields(): array
4545
{
4646
return [
47-
HashId::make()->alreadyHashed()->withLength(10),
47+
ID::make(),
4848
DateTime::make('createdAt')->sortable()->readOnly(),
4949
Str::make('name')->sortable(),
5050
BelongsToMany::make('posts')

tests/dummy/app/JsonApi/V1/Users/UserSchema.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@
2121

2222
use App\Models\User;
2323
use LaravelJsonApi\Eloquent\Fields\DateTime;
24+
use LaravelJsonApi\Eloquent\Fields\ID;
2425
use LaravelJsonApi\Eloquent\Fields\Str;
2526
use LaravelJsonApi\Eloquent\Filters\Where;
2627
use LaravelJsonApi\Eloquent\Filters\WhereIdIn;
2728
use LaravelJsonApi\Eloquent\Pagination\PagePagination;
2829
use LaravelJsonApi\Eloquent\Schema;
29-
use LaravelJsonApi\HashIds\HashId;
3030

3131
class UserSchema extends Schema
3232
{
@@ -44,7 +44,7 @@ class UserSchema extends Schema
4444
public function fields(): array
4545
{
4646
return [
47-
HashId::make()->alreadyHashed()->withLength(10),
47+
ID::make(),
4848
DateTime::make('createdAt')->readOnly(),
4949
Str::make('name'),
5050
DateTime::make('updatedAt')->readOnly(),

tests/dummy/app/Models/Comment.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,7 @@
2525

2626
class Comment extends Model
2727
{
28-
2928
use HasFactory;
30-
use Concerns\HashRouteKey;
3129

3230
/**
3331
* @var string[]

tests/dummy/app/Models/Concerns/HashRouteKey.php

Lines changed: 0 additions & 60 deletions
This file was deleted.

tests/dummy/app/Models/Post.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,10 +28,8 @@
2828

2929
class Post extends Model
3030
{
31-
3231
use HasFactory;
3332
use SoftDeletes;
34-
use Concerns\HashRouteKey;
3533

3634
/**
3735
* @var string[]

tests/dummy/app/Models/Tag.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,7 @@
2525

2626
class Tag extends Model
2727
{
28-
2928
use HasFactory;
30-
use Concerns\HashRouteKey;
3129

3230
/**
3331
* @var string[]

tests/dummy/app/Models/User.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,8 @@
2323

2424
class User extends Authenticatable
2525
{
26-
2726
use HasFactory;
2827
use Notifiable;
29-
use Concerns\HashRouteKey;
3028

3129
/**
3230
* The attributes that are mass assignable.

0 commit comments

Comments
 (0)