fix: PHPDoc @template and @return in database#7436
Merged
kenjis merged 5 commits intocodeigniter4:developfrom May 4, 2023
Merged
fix: PHPDoc @template and @return in database#7436kenjis merged 5 commits intocodeigniter4:developfrom
kenjis merged 5 commits intocodeigniter4:developfrom
Conversation
MGatner
approved these changes
Apr 21, 2023
kenjis
force-pushed
the
fix-phpdoc-types-database
branch
from
8e34b8a to
f6f5508
Compare
kenjis
commented
Apr 25, 2023
Comment on lines
16
to
19
| /** | ||
| * @template TConnection of object|resource | ||
| * @template TResult of object|resource | ||
| */ |
Member
Author
There was a problem hiding this comment.
I removed TConnection and TResult because they are not used in this interface.
@paulbalandan Are you okay?
Member
There was a problem hiding this comment.
I think I added those template types to help phpstan think that the interface is a generic and thus implementing classes should specify the specific types.
Member
Author
There was a problem hiding this comment.
Restored @template without types, because of vimeo/psalm#2625
It seems Psalm does not allow to use `resource` in @template type. See - codeigniter4/settings#60 (comment) - codeigniter4/shield#195 (comment)
kenjis
force-pushed
the
fix-phpdoc-types-database
branch
from
f6f5508 to
a7a2369
Compare
kenjis
force-pushed
the
fix-phpdoc-types-database
branch
from
a7a2369 to
377ef3d
Compare
paulbalandan
approved these changes
Apr 30, 2023
MGatner
approved these changes
May 1, 2023
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
3 participants
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.
Description
To fix this error: codeigniter4/shield#195 (comment)
It seems Psalm does not allow to use
resourcein @template type.See
COMPOSER_TOKENwithGITHUB_TOKENsettings#60 (comment)Checklist: