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.

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

code reformatting #2404

Merged
merged 1 commit into from
Apr 14, 2023
Merged

code reformatting #2404

merged 1 commit into from
Apr 14, 2023

Conversation

angeljqv
Copy link
Contributor

Php 7.4 sintax
Support id/uuid on enums, for consistency with the rest
use is_int instead of is_numeric, ids must be int

if (is_int($permission) || is_string($permission)) {

if (is_int($permission) || PermissionRegistrar::isUid($permission)) {

if (is_int($roles) || is_string($roles)) {

@angeljqv
Copy link
Contributor Author

@drbyte any reason not to make squash commits? It would be easier to read the commit history

@drbyte
Copy link
Collaborator

drbyte commented Apr 14, 2023 via email

@angeljqv
Copy link
Contributor Author

angeljqv commented Apr 14, 2023

sorry, I didn't explain myself correctly, I was referring to squash merge, look 38f2049
on squash merge commits is easy to read, look spatie/laravel-medialibrary@79b7295
so the history is more linear

@drbyte
Copy link
Collaborator

drbyte commented Apr 14, 2023

sorry, I didn't explain myself correctly, I was referring to squash merge, look 38f2049
on squash merge commits is easy to read, look spatie/laravel-medialibrary@79b7295
so the history is more linear

I still don't understand what you're asking about. PR #2402 (commit 38f2049 ) had only one commit. Nothing to squash when merging.
Please feel free to explain further.

@drbyte drbyte merged commit 4e0bf42 into spatie:main Apr 14, 2023
@drbyte
Copy link
Collaborator

drbyte commented Apr 15, 2023

@angeljqv I see what you mean. Thanks for clarifying.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants