Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix FormatModel class to work with keyless Pivot models #1282

Merged
merged 3 commits into from
Dec 14, 2022
Merged

Fix FormatModel class to work with keyless Pivot models #1282

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
319908d
Improve FormatModel to work with keyless Pivot models.
Cellard Dec 8, 2022
b844d2a
Merge branch 'laravel:4.x' into format_pivot
Cellard Dec 13, 2022
7f52a63
Update FormatModel.php
taylorotwell Dec 14, 2022
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
12 changes: 11 additions & 1 deletion src/FormatModel.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

namespace Laravel\Telescope;

use Illuminate\Database\Eloquent\Relations\Pivot;
use Illuminate\Support\Arr;

class FormatModel
Expand All @@ -14,6 +15,15 @@ class FormatModel
*/
public static function given($model)
{
return get_class($model).':'.implode('_', Arr::wrap($model->getKey()));
if ($model instanceof Pivot && ! $model->incrementing) {
$keys = [
$model->getAttribute($model->getForeignKey()),
$model->getAttribute($model->getRelatedKey()),
];
} else {
$keys = $model->getKey();
}

return get_class($model).':'.implode('_', Arr::wrap($keys));
}
}