fix(cp): cast user id to string in ResolvesUserId trait#32
Open
mylesthedev wants to merge 1 commit into
Open
Conversation
The trait declares a `: string` return type, but Statamic's `User::current()->id()` returns int under the Eloquent users driver (only string under the file driver). With `declare(strict_types=1)` this raises a TypeError on every request that lands in DashboardController::index() or TokenController, breaking the entire `/cp/mcp` panel for sites using Statamic's Eloquent driver. Cast at the trait boundary so the contract holds regardless of driver. The PHPDoc `@var string` annotation was incorrect under Eloquent — removed in favour of an explicit cast. Adds a Pest unit test that mocks `User::current()` to return both int and string ids, covering the file driver, the Eloquent driver, and the unauthenticated case.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The trait declares a
: stringreturn type, but Statamic'sUser::current()->id()returns int under the Eloquent users driver (only string under the file driver). Withdeclare(strict_types=1)this raises a TypeError on every request that lands in DashboardController::index() or TokenController, breaking the entire/cp/mcppanel for sites using Statamic's Eloquent driver.Cast at the trait boundary so the contract holds regardless of driver. The PHPDoc
@var stringannotation was incorrect under Eloquent — removed in favour of an explicit cast.Adds a Pest unit test that mocks
User::current()to return both int and string ids, covering the file driver, the Eloquent driver, and the unauthenticated case.Description
Type of Change
Related Issue
Fixes #
Testing
composer test)composer quality)Environment
Checklist
Notes
Thanks for contributing to this alpha project! 🙏