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

[5.4] Correct variable name #20433

Merged
merged 2 commits into from
Aug 7, 2017
Merged

[5.4] Correct variable name #20433

merged 2 commits into from
Aug 7, 2017

Conversation

jonbaldie
Copy link
Contributor

'Amount' is for continuous quantities, not discrete quantities. 'Number' is the correct variable name in the cases I've changed.

E.g. "I had a small amount of ketchup" - correct
"I adopted a large amount of dogs" - wrong, should be 'number' of dogs.

…er' is the correct variable name in this case.
@vlakoff
Copy link
Contributor

vlakoff commented Aug 5, 2017

Agree, let's not propagate English mistakes.

By the way, would conflict with #20439.

@taylorotwell
Copy link
Member

Has conflicts.

# Conflicts:
#	src/Illuminate/Support/Collection.php
@jonbaldie
Copy link
Contributor Author

Conflicts resolved.

@vlakoff
Copy link
Contributor

vlakoff commented Aug 7, 2017

You should also correct Arr::random().

@taylorotwell taylorotwell merged commit 9fd154b into laravel:5.4 Aug 7, 2017
@jonbaldie jonbaldie deleted the collection-grammar branch August 7, 2017 18:21
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.

3 participants