Skip to content

Apply fixes on 5.x #106

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

Merged
merged 4 commits into from
Jan 31, 2019
Merged

Apply fixes on 5.x #106

merged 4 commits into from
Jan 31, 2019

Conversation

lcobucci
Copy link
Member

@lcobucci lcobucci commented Jan 31, 2019

Backporting these:

I'm considering the dependency upgrade as a fix here since composer commands sometimes were failing and seems to be solved.

lcobucci and others added 4 commits January 31, 2019 13:34
Applying the fixes to the configuration.
PHPCBF is adding two commas when fixing missing trailing commas on
associative arrays.
This is already solved by
SlevomatCodingStandard.Arrays.TrailingArrayComma.MissingTrailingComma.

More info: slevomat/coding-standard#490
@lcobucci lcobucci requested a review from a team January 31, 2019 12:38
Copy link
Member

@Ocramius Ocramius left a comment

Choose a reason for hiding this comment

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

Since the tests for fixes changes, this would be a BC break for downstream projects using doctrine/coding-standard. I'm 👎 on this. Yes, it is a fix, but it will just lead to consumers to swear at us for having to change stuff.

Let's push it to the next major, please.

@Ocramius Ocramius added the bug label Jan 31, 2019
@lcobucci
Copy link
Member Author

lcobucci commented Jan 31, 2019

@Ocramius there's no BC break here (you can even see that build on 5.x is broken: https://travis-ci.org/doctrine/coding-standard/branches)....

The tests were wrong in the first place, consumers are already swearing due to wrong fixes of associative arrays.

@lcobucci lcobucci requested a review from a team January 31, 2019 12:43
@Ocramius
Copy link
Member

due to wrong fixes of associative arrays.

I agree with the associative arrays scenario, not with the annotations one

@lcobucci
Copy link
Member Author

@Ocramius check my last edit... that commit is only being applied because 5.x is currently broken on CI.

@Ocramius
Copy link
Member

@lcobucci wait, 5.x is broken in CI? Did our dependencies break something again? :|

@lcobucci
Copy link
Member Author

@Ocramius well, no. More or less. When #88 was introduced (using Slevomat CS v4.8.0), the sniff DocCommentSpacingSniff had bugs.

These bugs got fixed by Slevomat CS in v4.8.2 , v4.8.3, and v4.8.7, which lead me to send #91 to fix our failing build on master and then apply it here.

@lcobucci
Copy link
Member Author

@Ocramius to give you more context: in #91 I tried to bring the discussion about reviewing the current groups (even suggested something) but decided initially to focus in fixing the tests, since they were not following the configuration we had.

@Ocramius
Copy link
Member

Should we therefore start pinning upstream dependencies to patch releases? It seems to me that Slevomat CS is not stable enough, since these are indeed perceived as BC breaks downstream.

@lcobucci
Copy link
Member Author

I think that it might create more issues for us... more releases to be made once we verified that their patches are reliable. Things look relatively stable so I'm not sure if we'd have much benefit too.

I've added 5.x to the Travis CI cron so we can detect issues and react to them, so I'd say we should be good after releasing this stuff here.

Copy link
Member

@Ocramius Ocramius left a comment

Choose a reason for hiding this comment

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

Fair enough then, but if we see more upstream misbehavior, we must lock upstream deps on our end, as they very much affect consumers.

@lcobucci
Copy link
Member Author

@Ocramius agreed 👍

@lcobucci lcobucci merged commit 9017efe into doctrine:5.x Jan 31, 2019
@lcobucci lcobucci deleted the apply-fixes-on-5.x branch January 31, 2019 13:22
@lcobucci lcobucci self-assigned this Jan 31, 2019
@lcobucci lcobucci added this to the 5.0.1 milestone Jan 31, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants