Skip to content

Commit

Permalink
Improve .gitattributes and update dev dependencies (#173)
Browse files Browse the repository at this point in the history
* Add dev files to ignore when creating an archive of this repository

* Update dev dependencies
  • Loading branch information
devanych committed Jul 5, 2021
1 parent f2eab25 commit a396cfc
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 9 deletions.
20 changes: 12 additions & 8 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,18 @@
*.ttf binary

# Ignore some meta files when creating an archive of this repository
/.github export-ignore
/.editorconfig export-ignore
/.gitattributes export-ignore
/.gitignore export-ignore
/.scrutinizer.yml export-ignore
/phpunit.xml.dist export-ignore
/tests export-ignore
/docs export-ignore
/.github export-ignore
/.editorconfig export-ignore
/.gitattributes export-ignore
/.gitignore export-ignore
/.phpunit-watcher.yml export-ignore
/.scrutinizer.yml export-ignore
/.styleci.yml export-ignore
/infection.json.dist export-ignore
/phpunit.xml.dist export-ignore
/psalm.xml export-ignore
/tests export-ignore
/docs export-ignore

# Avoid merge conflicts in CHANGELOG
# https://about.gitlab.com/2015/02/10/gitlab-reduced-merge-conflicts-by-90-percent-with-changelog-placeholders/
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"phpunit/phpunit": "^9.5",
"roave/infection-static-analysis-plugin": "^1.8",
"spatie/phpunit-watcher": "^1.23",
"vimeo/psalm": "^4.7",
"vimeo/psalm": "^4.8",
"yiisoft/aliases": "^1.1|^2.0",
"yiisoft/psr-dummy-provider": "^1.0",
"yiisoft/test-support": "^1.3"
Expand Down

0 comments on commit a396cfc

Please sign in to comment.