Skip to content

CS update after upstream changes #124

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 6 commits into from
Aug 8, 2021
Merged

Conversation

jrfnl
Copy link
Contributor

@jrfnl jrfnl commented Aug 8, 2021

PHPCS ruleset: update ruleset for upstream changes

  • Fix the name and description to prevent confusion between the project ruleset and the organisation ruleset.
  • Set the minimum PHP version for the PHPCompatibility standard.
  • Ignore two PHPCompatibility non-issues.
  • Don't require property type declarations.
  • Ensure special characters used as literals in an exclude pattern are escaped.

CS: no whitespace before return type colon

CS: blank line between different use statement types

CS: import all things

CS: miscellaneous other whitespace fixes

jrfnl added 5 commits August 8, 2021 19:42
* Fix the name and description to prevent confusion between the project ruleset and the organisation ruleset.
* Set the minimum PHP version for the PHPCompatibility standard.
* Ignore two PHPCompatibility non-issues.
* Don't require property type declarations.
* Ensure special characters used as literals in an exclude pattern are escaped.
@jaapio
Copy link
Member

jaapio commented Aug 8, 2021

Looks like there is one autofix round missing for SlevomatCodingStandard.Commenting.DocCommentSpacing.IncorrectAnnotationsGroup :-)

@jrfnl
Copy link
Contributor Author

jrfnl commented Aug 8, 2021

@jaapio Yup... little weird as the build passed locally, but then again, some of the local installs I have of the coding standards may be out of date. Will have a look.

Apparently Doctrine wants the related `@psalm` annotations to be grouped with the `@param` or `@return` tags.
@jrfnl
Copy link
Contributor Author

jrfnl commented Aug 8, 2021

Looks like there was a hick-up in the GHA run. @jaapio Could you restart the build ?

@jaapio jaapio merged commit 931b9e7 into phpDocumentor:1.x Aug 8, 2021
@jrfnl jrfnl deleted the feature/cs-update branch August 8, 2021 19:50
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.

2 participants