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

Mostly PSR-2 compliant #27

Merged
merged 10 commits into from
Dec 6, 2014
Merged

Mostly PSR-2 compliant #27

merged 10 commits into from
Dec 6, 2014

Conversation

josegonzalez
Copy link
Member

There is one fail related to extending a CakePHP core method that is not yet PSR-2 compliant as it begins with an underscore.

Will merge after #24

There is one fail related to extending a CakePHP core method that is not yet PSR-2 compliant as it begins with an underscore
@markstory
Copy link
Member

The whitespace diff looks good. Did you use phpcs-fixer for this? Also the underscore methods can be suppressed by turning off warnings and only looking at errors if I remember correctly.

@josegonzalez
Copy link
Member Author

I manually fixed the files since there were so few.

@lorenzo
Copy link
Member

lorenzo commented Dec 3, 2014

@josegonzalez could you indent the doc blocks correctly?

@josegonzalez
Copy link
Member Author

Is that incorrect? I ran phpcs against it with psr2 standard...

@AD7six
Copy link
Member

AD7six commented Dec 3, 2014

@josegonzalez the standard actually excludes doc blocks - but it's an artefact of our existing code standard that I don't think anyone else follows.

@josegonzalez
Copy link
Member Author

K, I'll indent.

@dereuromark
Copy link
Member

There are code sniffer rules to do that automatically, e.g. mine. If you run it isolated, it should work.

CakePHP core code generally does not have comments inside of methods - this indicates that the method should be refactored - and these methods certainly do not need comments.
@josegonzalez
Copy link
Member Author

I indented everything, waiting on tests to pass and then I'll merge.

josegonzalez added a commit that referenced this pull request Dec 6, 2014
@josegonzalez josegonzalez merged commit dd47d27 into master Dec 6, 2014
@josegonzalez josegonzalez deleted the phpcs branch December 6, 2014 22:34
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

5 participants