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] Collection union function #12910

Merged
merged 1 commit into from
Mar 29, 2016
Merged

Conversation

john-main-croud
Copy link
Contributor

Quick function to provide a true union of two collections

@GrahamCampbell GrahamCampbell changed the title Collection union function [5.2] Collection union function Mar 29, 2016
@GrahamCampbell
Copy link
Member

Please squash to one commit.

@john-main-croud
Copy link
Contributor Author

Done :)

@GrahamCampbell
Copy link
Member

Please fix the failing tests.

Verified

This commit was signed with the committer’s verified signature.
Eomm Manuel Spigolon
@mark86092
Copy link
Contributor

@GrahamCampbell Something wrong with travis-ci.

@JosephSilber
Copy link
Contributor

I'm just gonna link to this here: #12223

@john-main-croud
Copy link
Contributor Author

Fixed! Sorry about that - Travis seems to be having a headache generally but tests passed on PHP7

@GrahamCampbell
Copy link
Member

Travis seems to be up and down today. I've just given it another kick.

@GrahamCampbell
Copy link
Member

Please rebase and force push, and that'll fix travis.

@taylorotwell taylorotwell merged commit d890520 into laravel:5.2 Mar 29, 2016
@taylorotwell
Copy link
Member

Union sounds better than concat and the PHP docs to refer to the + operator on arrays as a "union".

@salarmehr
Copy link

@john-main-croud @return void is incorrect at the phpdoc blcok

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.

None yet

6 participants