Skip to content
This repository was archived by the owner on Jun 4, 2024. It is now read-only.

Fix null relation transformers #41

Merged
merged 2 commits into from
Nov 4, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/generator/default/transformer.php
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,14 @@ public function transform(<?=$transformer->dbModel->getClassName()?> $model)
public function include<?=$relation->getCamelName()?>(<?=$transformer->dbModel->getClassName()?> $model)
{
$relation = $model-><?=Inflector::variablize($relation->getName())?>;
$transformer = new <?=Inflector::singularize($relation->getClassName())?>Transformer();
<?php if ($relation->isHasOne()):?>
if ($relation === null) {
return $this->null();
}
$transformer = new <?=Inflector::singularize($relation->getClassName())?>Transformer();
return $this->item($relation, $transformer, '<?=$transformer->makeResourceKey($relation->getClassKey())?>');
<?php else:?>
$transformer = new <?=Inflector::singularize($relation->getClassName())?>Transformer();
return $this->collection($relation, $transformer, '<?=$transformer->makeResourceKey($relation->getClassKey())?>');
<?php endif;?>
}
Expand Down
6 changes: 6 additions & 0 deletions tests/specs/blog_jsonapi/transformers/CommentTransformer.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,19 @@ public function transform(Comment $model)
public function includePost(Comment $model)
{
$relation = $model->post;
if ($relation === null) {
return $this->null();
}
$transformer = new PostTransformer();
return $this->item($relation, $transformer, 'posts');
}

public function includeUser(Comment $model)
{
$relation = $model->user;
if ($relation === null) {
return $this->null();
}
$transformer = new UserTransformer();
return $this->item($relation, $transformer, 'users');
}
Expand Down
6 changes: 6 additions & 0 deletions tests/specs/blog_jsonapi/transformers/PostTransformer.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,19 @@ public function transform(Post $model)
public function includeCategory(Post $model)
{
$relation = $model->category;
if ($relation === null) {
return $this->null();
}
$transformer = new CategoryTransformer();
return $this->item($relation, $transformer, 'categories');
}

public function includeAuthor(Post $model)
{
$relation = $model->author;
if ($relation === null) {
return $this->null();
}
$transformer = new UserTransformer();
return $this->item($relation, $transformer, 'users');
}
Expand Down