Skip to content

Commit

Permalink
Merge branch 'master' into feature/ghactions-update-various-actions
Browse files Browse the repository at this point in the history
  • Loading branch information
jaapio committed Mar 25, 2022
2 parents 129bc4f + 0202631 commit cfe5487
Show file tree
Hide file tree
Showing 19 changed files with 312 additions and 231 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -428,7 +428,7 @@ jobs:
tools: pecl

- name: Download PHAR file
uses: actions/download-artifact@v3.0.0
uses: actions/download-artifact@v3
with:
name: phpDocumentor.phar
path: build
Expand Down
3 changes: 3 additions & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,9 @@
"sort-packages": true,
"platform": {
"php": "7.4.0"
},
"allow-plugins": {
"symfony/flex": true
}
},
"replace": {
Expand Down

0 comments on commit cfe5487

Please sign in to comment.