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

Bugfix: Remove Short Array Syntax and Fix (Minor) Recent Merge Issues #799

Merged
merged 2 commits into from
Sep 20, 2016

Conversation

robfrawley
Copy link
Collaborator

@robfrawley robfrawley commented Sep 19, 2016

Remove accidental use of short array syntax in my PR that created .php_cs.dist

@robfrawley
Copy link
Collaborator Author

robfrawley commented Sep 19, 2016

@antoligy Somehow, your php 7.1 travis addition passed its build on your PR and only now fails, informing us after-the-fact that we need to update the conditional to exclude mongo on 7.1 too. ;-) IDK why...

@lsmith77 I included the above fix in the PR as it seems like an awfully small change to justify its own submission.

… symfony 3.2.x isnt overridden by later COMPOSER_FLAGS usage
@robfrawley
Copy link
Collaborator Author

robfrawley commented Sep 19, 2016

@antoligy Ah, figured it out. The second half of the mongo conditional in the old travis file was broken, (as in, it was invalid SH), which is the only reason mongo wasn't included for 7.0 based builds prior (not because, as one would expect, the conditional was evaluated properly).

With my fixed travis file merged #792 acting in combination with inclusion of 7.1 in your #787 with no check, caused the interesting case of your PR being green, and then our merged code being red.

All is well though, should be fixed!

@alexwilson
Copy link
Collaborator

Nice catch, cheers for fixing it!

@robfrawley robfrawley changed the title Bugfix: Remove accidental use of short array syntax in .php_cs.dist Bugfix: Remove Short Array Syntax and Fix (Minor) Recent Merge Issues Sep 19, 2016
@lsmith77 lsmith77 merged commit 78579fe into liip:master Sep 20, 2016
@lsmith77 lsmith77 deleted the bugfix-phpcsfixer-short-array branch September 20, 2016 09:10
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.

4 participants