Skip to content

Ensure we get a valid taxonomy model, or null otherwise #243

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

Merged
merged 1 commit into from
Feb 14, 2024
Merged

Ensure we get a valid taxonomy model, or null otherwise #243

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion src/Taxonomies/TaxonomyRepository.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

namespace Statamic\Eloquent\Taxonomies;

use Illuminate\Database\Eloquent\Model;
use Illuminate\Support\Collection;
use Statamic\Contracts\Taxonomies\Taxonomy as TaxonomyContract;
use Statamic\Facades;
Expand Down Expand Up @@ -43,7 +44,7 @@ public function findByHandle($handle): ?TaxonomyContract
return app('statamic.eloquent.taxonomies.model')::whereHandle($handle)->first();
});

return $taxonomyModel ? app(TaxonomyContract::class)->fromModel($taxonomyModel) : null;
return $taxonomyModel instanceof Model ? app(TaxonomyContract::class)->fromModel($taxonomyModel) : null;
}

public function findByUri(string $uri, ?string $site = null): ?Taxonomy
Expand Down