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

[stable24] Fix Exception Message #1200

Merged
merged 8 commits into from
Nov 26, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions .github/workflows/phpunit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ jobs:
include:
- php-versions: '7.4'
databases: 'sqlite'
coverage: xdebug
server-versions: 'stable24'
xdebug_mode: coverage
name: php${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }}
Expand Down Expand Up @@ -96,7 +97,7 @@ jobs:
working-directory: apps/${{ env.APP_NAME }}
env:
XDEBUG_MODE: ${{ matrix.xdebug_mode }}
run: ./vendor/phpunit/phpunit/phpunit -c phpunit.xml
run: ./vendor/bin/phpunit -c phpunit.xml

- name: Upload coverage results to Coveralls
working-directory: apps/${{ env.APP_NAME }}
Expand All @@ -105,9 +106,7 @@ jobs:
COVERALLS_REPO_TOKEN: ${{ secrets.GITHUB_TOKEN }}
COVERALLS_PARALLEL: true
COVERALLS_FLAG_NAME: php-${{ matrix.php-versions }}
run: |
composer global require php-coveralls/php-coveralls --no-progress --no-interaction
php-coveralls --coverage_clover=build/logs/clover.xml --json_path=build/logs/coveralls-upload.json -vvv
run: vendor/bin/php-coveralls --coverage_clover=build/logs/clover.xml --json_path=build/logs/coveralls-upload.json -v

finish-coverage:
needs: phpunit
Expand All @@ -117,4 +116,4 @@ jobs:
uses: coverallsapp/github-action@v1.1.2
with:
github-token: ${{ secrets.GITHUB_TOKEN }}
parallel-finished: true
parallel-finished: true
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
.vscode
*.iml
/vendor/
/vendor-bin/**/vendor/
/tests/integration/vendor
/tests/integration/output
/js/
Expand Down
29 changes: 19 additions & 10 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,9 @@
"tecnickcom/tcpdf": "^6.4"
},
"require-dev": {
"byjg/swagger-test": "^3.1",
"donatj/mock-webserver": "^2.5",
"guzzlehttp/psr7": "^2.4",
"mikey179/vfsstream": "^1.6",
"nextcloud/coding-standard": "^1.0",
"bamarni/composer-bin-plugin": "^1.8",
"nextcloud/ocp": "dev-stable24",
"phpunit/phpunit": "^9.5",
"roave/security-advisories": "dev-latest",
"symfony/yaml": "^5.4",
"vimeo/psalm": "^4.25"
"roave/security-advisories": "dev-latest"
},
"config": {
"autoloader-suffix": "Libresign",
Expand All @@ -29,13 +22,29 @@
"sort-packages": true,
"platform": {
"php": "7.4"
},
"allow-plugins": {
"bamarni/composer-bin-plugin": true
}
},
"scripts": {
"lint": "find . -name \\*.php -not -path './vendor/*' -not -path './build/*' -print0 | xargs -0 -n1 php -l",
"cs:check": "php-cs-fixer fix --dry-run --diff",
"cs:fix": "php-cs-fixer fix",
"psalm": "psalm --threads=1"
"psalm": "psalm --threads=1",
"post-install-cmd": [
"@composer bin all install --ansi",
"composer dump-autoload"
],
"post-update-cmd": [
"@composer bin all update --ansi",
"composer dump-autoload"
]
},
"extra": {
"bamarni-bin": {
"bin-links": true
}
},
"autoload": {
"psr-4": {
Expand Down
Loading