From ac795aed47cb5326d3ec40e9e4b3ee59e58fa947 Mon Sep 17 00:00:00 2001 From: marinusvanvelzen Date: Mon, 2 Oct 2023 16:24:16 +0200 Subject: [PATCH] refactor: use aliases for attribute classes --- src/Descriptors/Schema/Schema.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/Descriptors/Schema/Schema.php b/src/Descriptors/Schema/Schema.php index cc50c10..7c07115 100644 --- a/src/Descriptors/Schema/Schema.php +++ b/src/Descriptors/Schema/Schema.php @@ -18,13 +18,14 @@ use LaravelJsonApi\Eloquent; use LaravelJsonApi\Eloquent\Fields\ArrayHash; use LaravelJsonApi\Eloquent\Fields\ArrayList; +use LaravelJsonApi\Eloquent\Fields\Attribute as EloquentAttribute; use LaravelJsonApi\Eloquent\Fields\Boolean; use LaravelJsonApi\Eloquent\Fields\ID; use LaravelJsonApi\Eloquent\Fields\Map; use LaravelJsonApi\Eloquent\Fields\Number; use LaravelJsonApi\Eloquent\Pagination\CursorPagination; use LaravelJsonApi\Eloquent\Pagination\PagePagination; -use LaravelJsonApi\NonEloquent\Fields\Attribute; +use LaravelJsonApi\NonEloquent\Fields\Attribute as NonEloquentAttribute; use LaravelJsonApi\OpenApiSpec\Builders\Paths\Operation\SchemaBuilder; use LaravelJsonApi\OpenApiSpec\Contracts\Descriptors\Schema\PaginationDescriptor; use LaravelJsonApi\OpenApiSpec\Contracts\Descriptors\Schema\SortablesDescriptor; @@ -405,9 +406,9 @@ protected function attributes( $schema = $fieldDataType->title($field->name()); try { - $column = $field instanceof Eloquent\Fields\Attribute ? $field->column() : $field->name(); + $column = $field instanceof EloquentAttribute ? $field->column() : $field->name(); - if ($field instanceof Attribute) { + if ($field instanceof NonEloquentAttribute) { $attributes = $example->attributes(null); if (isset($attributes[$column])) { $schema = $schema->example($attributes[$column]);