Skip to content

Commit

Permalink
Merge pull request doctrine#8144 from greg0ire/cs
Browse files Browse the repository at this point in the history
Automated fixes with phpcbf + manual fixes
  • Loading branch information
greg0ire committed Feb 5, 2021
2 parents f92c3db + bcbd440 commit 40f3925
Show file tree
Hide file tree
Showing 1,193 changed files with 23,835 additions and 25,086 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/coding-standard.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,8 @@ jobs:
- name: "Fetch head branch"
run: "git remote set-branches --add origin $GITHUB_BASE_REF && git fetch origin $GITHUB_BASE_REF"

- name: "Run phpcbf"
run: "vendor/bin/phpcbf"

- name: "Run git-phpcs"
run: "php git-phpcs.phar origin/$GITHUB_BASE_REF...$GITHUB_SHA --report=checkstyle | cs2pr"
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"doctrine/annotations": "^1.11.1",
"doctrine/cache": "^1.9.1",
"doctrine/collections": "^1.5",
"doctrine/common": "^3.0",
"doctrine/common": "^3.0.3",
"doctrine/dbal": "^2.10.0",
"doctrine/event-manager": "^1.1",
"doctrine/inflector": "^1.4|^2.0",
Expand Down
Loading

0 comments on commit 40f3925

Please sign in to comment.