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

Reformat DAO files to pass linting and use short array syntax #11418

Merged
merged 3 commits into from
Dec 27, 2017

Conversation

colemanw
Copy link
Member

@colemanw colemanw commented Dec 16, 2017

Overview

Our code standards covered every file in the core repo except the autogenerated DAOs. This cleans them up to pass civilint standards. It also makes them the first set of files to use the short array syntax now that we've officially dropped support for php 5.3 :)

Before

DAO*.php files were a bit unsightly.

After

Code looks much better.

Technical Details

We really need to get ourselves a better php prettifier. I had to do some regex hacks to get the output to come out ok.

@colemanw colemanw force-pushed the daoCleanup branch 3 times, most recently from b41f439 to 3010d6b Compare December 16, 2017 18:50
@colemanw colemanw added the needs-work-not-review-ready Submitter required to take action, will be closed after 1-2 weeks in this state label Dec 16, 2017
@colemanw
Copy link
Member Author

@totten let's merge this after the 4.7.30-rc is cut.

@colemanw
Copy link
Member Author

@mlutfy will you please ask jenkins to retest this once you've upgraded php on the apache side of our ci?

@colemanw colemanw removed the needs-work-not-review-ready Submitter required to take action, will be closed after 1-2 weeks in this state label Dec 19, 2017
@colemanw
Copy link
Member Author

@mlutfy this is highly prone to merge conflicts so ping me as soon as you get PHP upgraded on our CI server and I'll do a regen + rebase.

@mlutfy
Copy link
Member

mlutfy commented Dec 22, 2017

jenkins, test this please

@monishdeb
Copy link
Member

I have rebased the PR, lets wait for the test build to pass.

@colemanw colemanw merged commit 9272fab into civicrm:master Dec 27, 2017
@colemanw colemanw deleted the daoCleanup branch December 27, 2017 21:11
@colemanw
Copy link
Member Author

@monishdeb did you regenerate the dao files when you rebased?

sluc23 pushed a commit to ixiam/civicrm-core that referenced this pull request Jan 10, 2018
Reformat DAO files to pass linting and use short array syntax
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