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

[CS] Ported lib/ to updated CS 2.0 #6964

Merged
merged 55 commits into from Jan 11, 2018
Merged

[CS] Ported lib/ to updated CS 2.0 #6964

merged 55 commits into from Jan 11, 2018

Conversation

Majkl578
Copy link
Contributor

@Majkl578 Majkl578 commented Jan 5, 2018

Beware, tons of changes. Most of them automatically fixed by phpcbf.

Most of the changes should be harmless except some weak->strict comparison changes (one was kept because juggling is part of expected behavior (really), hopefully we can eliminate it later by explicit casts).

Disabled:

  • native parameter and return type declaration checks - BC breaking, will do in phase two (needs to be propagated to common libs as well)
  • Throwable check - Exception is still used on multiple places

Tried to narrow down as many iterables and mixeds as possible (manually), but it's still a mixed land more than I'd like. (Whoever invented wide array type in phpDoc standard killed some kittens btw.)

Made lib/ check mandatory on CI (although now irrelevant until we fix CI).
https://travis-ci.org/doctrine/doctrine2/jobs/325277840

∑ 3,599 additions, 7,202 deletions.

Future scope:

  • rebase?
  • port tests/
  • native parameters and native types, moving from phpDoc to native declaration

@Majkl578 Majkl578 added this to the 3.0 milestone Jan 5, 2018
@Ocramius
Copy link
Member

Ocramius commented Jan 5, 2018

If I may add: "argh".

@Majkl578
Copy link
Contributor Author

Majkl578 commented Jan 11, 2018

@Ocramius I'd like to merge this today so it doesn't block @guilhermeblanco's work and other PRs. Will happily address any post-merge review anytime later (it's master-only after all). Are you ok with that?
Should I squash it into one commit?

@Ocramius Ocramius self-assigned this Jan 11, 2018
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.

:shipit:

@Ocramius Ocramius merged commit e3936d0 into master Jan 11, 2018
@Ocramius Ocramius deleted the cs branch January 11, 2018 09:20
@goetas
Copy link
Member

goetas commented Jan 11, 2018

huge!

@greg0ire greg0ire added this to To consider 🤔 in Backports via automation Jun 27, 2021
@greg0ire greg0ire removed this from the 3.0.0 milestone Jun 27, 2021
@beberlei beberlei moved this from To consider 🤔 to Done ✅ in Backports Jul 4, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Backports
  
Done ✅
Development

Successfully merging this pull request may close these issues.

None yet

4 participants