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

Improve PHP-CS-Fixer config file support #1661

Merged
merged 2 commits into from
May 28, 2017
Merged

Improve PHP-CS-Fixer config file support #1661

merged 2 commits into from
May 28, 2017

Conversation

sbine
Copy link
Contributor

@sbine sbine commented May 13, 2017

What does this implement/fix? Explain your changes.

This PR adds a PHP-CS-Fixer setting to specify a custom config file. If no setting is provided, it checks first the working directory then the project root for .php_cs and .php_cs.dist and uses whichever it finds first.
I also updated the example link to PHP-CS-Fixer source in add-languages-and-beautifiers.md to account for the additions, and fixed the capitalization in the "Allow risky rules" setting description.

Does this close any currently open issues?

#1524, part of #1537, possibly #915.

Any other comments?

This has only been tested on PHP-CS-Fixer version 2.3.1 on OS X, though it's unlikely to behave differently on PHP-CS-Fixer 1.x or Windows.

Checklist

Check all those that are applicable and complete.

  • Merged with latest master branch
  • Regenerate documentation with npm run docs
  • Add change details to CHANGELOG.md under "Next" section
  • Added examples for testing to examples/ directory
  • Travis CI passes (Mac support)
  • AppVeyor passes (Windows support)

sbine added 2 commits May 12, 2017 20:27
Add a PHP-CS-Fixer setting to specify a custom config file. If no
setting is provided, check first the working directory then the project
root for `.php_cs` and `.php_cs.dist`.
Update the example link to PHP-CS-Fixer source to accommodate the new
code.
Fix capitalization in the "Allow risky rules" description.
@Glavin001 Glavin001 self-requested a review May 28, 2017 03:21
@Glavin001 Glavin001 self-assigned this May 28, 2017
@Glavin001
Copy link
Owner

Looks good to me!

@Glavin001 Glavin001 merged commit b0b193d into Glavin001:master May 28, 2017
@Glavin001
Copy link
Owner

Thank you for contributing!

@Glavin001
Copy link
Owner

Published to v0.29.26

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants