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.2] Correct phpdoc and complete tests #13086

Merged
merged 2 commits into from
Apr 8, 2016
Merged

[5.2] Correct phpdoc and complete tests #13086

merged 2 commits into from
Apr 8, 2016

Conversation

vlakoff
Copy link
Contributor

@vlakoff vlakoff commented Apr 8, 2016

A little polishing following #12958 and #12975.

@@ -3082,7 +3082,7 @@ public function setRawAttributes(array $attributes, $sync = false)
*
* @param string|null $key
* @param mixed $default
* @return array
* @return mixed|array
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not correct, the set of arrays are a strict subset of the universal set, "mixed"

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

mixed|array or array|mixed are used elsewhere in the codebase, and I think they make clearer there are different "signatures". Thoughts?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

mixed cannot be unioned with anything else

@taylorotwell taylorotwell merged commit 9937493 into laravel:5.2 Apr 8, 2016
@vlakoff vlakoff deleted the support-arr branch April 9, 2016 00:06
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