Skip to content

Fix eloquent user type error #218

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
aerni merged 3 commits into from
May 6, 2026
Merged

Fix eloquent user type error #218

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
feeeb13
Drop user contract type hint from gate and policy methods
aerni May 6, 2026
ba85939
Drop user contract type hint from internal policy helper too
aerni May 6, 2026
87baa6c
Use User as the User facade alias
aerni May 6, 2026
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
7 changes: 3 additions & 4 deletions src/Gates/SeoContentGate.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,14 @@

use Aerni\AdvancedSeo\AdvancedSeo;
use Aerni\AdvancedSeo\SeoSets\SeoSet;
use Statamic\Contracts\Auth\User;
use Statamic\Facades\User as UserFacade;
use Statamic\Facades\User;

class SeoContentGate
{
/**
* Determine if the user can access the SEO tab and edit content on entries and terms.
*/
public function editContent(User $user, SeoSet $seoSet): bool
public function editContent($user, SeoSet $seoSet): bool
{
if (! AdvancedSeo::pro()) {
return true;
Expand All @@ -23,7 +22,7 @@ public function editContent(User $user, SeoSet $seoSet): bool
return false;
}

$user = UserFacade::fromUser($user);
$user = User::fromUser($user);

if ($user->isSuper()) {
return true;
Expand Down
21 changes: 10 additions & 11 deletions src/Policies/SeoSetPolicy.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,39 +6,38 @@
use Aerni\AdvancedSeo\Contracts\SeoSetLocalization;
use Aerni\AdvancedSeo\SeoSets\SeoSet;
use Aerni\AdvancedSeo\SeoSets\SeoSetGroup;
use Statamic\Contracts\Auth\User;
use Statamic\Facades\User as UserFacade;
use Statamic\Facades\User;
use Statamic\Policies\Concerns\HasMultisitePolicy;

class SeoSetPolicy
{
use HasMultisitePolicy;

public function before(User $user)
public function before($user)
{
if (! AdvancedSeo::pro()) {
return true;
}

$user = UserFacade::fromUser($user);
$user = User::fromUser($user);

if ($user->isSuper()) {
return true;
}
}

public function viewAny(User $user, SeoSetGroup $group): bool
public function viewAny($user, SeoSetGroup $group): bool
{
$user = UserFacade::fromUser($user);
$user = User::fromUser($user);

return $group->seoSets()->contains(function (SeoSet $seoSet) use ($user) {
return $seoSet->localizations()->contains(fn (SeoSetLocalization $localization) => $this->edit($user, $localization));
});
}

public function edit(User $user, SeoSetLocalization $localization): bool
public function edit($user, SeoSetLocalization $localization): bool
{
$user = UserFacade::fromUser($user);
$user = User::fromUser($user);

if (! $this->userCanAccessSite($user, $localization->site())) {
return false;
Expand All @@ -54,9 +53,9 @@ public function edit(User $user, SeoSetLocalization $localization): bool
return $canEditLocalization && $this->canEditStatamicContent($user, $localization->type(), $localization->handle());
}

public function configure(User $user, SeoSet $seoSet): bool
public function configure($user, SeoSet $seoSet): bool
{
$user = UserFacade::fromUser($user);
$user = User::fromUser($user);

if (! $user->hasPermission('configure seo')) {
return false;
Expand All @@ -66,7 +65,7 @@ public function configure(User $user, SeoSet $seoSet): bool
|| $this->canEditStatamicContent($user, $seoSet->type(), $seoSet->handle());
}

protected function canEditStatamicContent(User $user, string $type, string $handle): bool
protected function canEditStatamicContent($user, string $type, string $handle): bool
{
$itemType = match ($type) {
'collections' => 'entries',
Expand Down
Loading