Skip to content

[stable21] Check PHP 8.0 compatibility #234

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.

Sign up for GitHub

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
ChristophWurst merged 11 commits into from
Apr 22, 2021
Merged

[stable21] Check PHP 8.0 compatibility #234

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
26e6535
Check PHP 8.0 compatibility
nickvergessen Apr 22, 2021
a6fbf10
Bump PHPUnit version
nickvergessen Apr 22, 2021
e366350
Using PHPUnit version from vendor/ anyway
nickvergessen Apr 22, 2021
5a5b658
There is no tests/Integration/ directory to run
nickvergessen Apr 22, 2021
f8fe746
Bring the postgres testing in line with the others
nickvergessen Apr 22, 2021
a2d7772
Cleanup duplicated keys
nickvergessen Apr 22, 2021
c585a6a
Bump nextcloud/coding-standard for php8 compatibility
nickvergessen Apr 22, 2021
ae47dce
Fix PHP CS
nickvergessen Apr 22, 2021
f6ad4c2
Less checking?
nickvergessen Apr 22, 2021
32ff2d3
Bye scrutinizer
nickvergessen Apr 22, 2021
9829436
Try to downgrade to phpunit 8.5
nickvergessen Apr 22, 2021
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
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:

strategy:
matrix:
php-versions: ['7.3', '7.4']
php-versions: ['7.3', '7.4', '8.0']

name: php${{ matrix.php-versions }}
steps:
Expand Down
25 changes: 11 additions & 14 deletions .github/workflows/phpunit.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ jobs:
uses: shivammathur/setup-php@v1
with:
php-version: ${{ matrix.php-versions }}
tools: phpunit
extensions: mbstring, iconv, fileinfo, intl, sqlite, pdo_sqlite
coverage: none

Expand All @@ -68,9 +67,9 @@ jobs:
working-directory: apps/${{ env.APP_NAME }}
run: ./vendor/phpunit/phpunit/phpunit -c phpunit.xml

- name: PHPUnit integration
working-directory: apps/${{ env.APP_NAME }}
run: ./vendor/phpunit/phpunit/phpunit -c phpunit.integration.xml
# - name: PHPUnit integration
# working-directory: apps/${{ env.APP_NAME }}
# run: ./vendor/phpunit/phpunit/phpunit -c phpunit.integration.xml

mysql:
runs-on: ubuntu-latest
Expand All @@ -79,7 +78,7 @@ jobs:
# do not stop on another job's failure
fail-fast: false
matrix:
php-versions: ['7.3', '7.4']
php-versions: ['7.3', '7.4', '8.0']
databases: ['mysql']
server-versions: ['stable21']

Expand Down Expand Up @@ -117,7 +116,6 @@ jobs:
uses: shivammathur/setup-php@v1
with:
php-version: ${{ matrix.php-versions }}
tools: phpunit
extensions: mbstring, iconv, fileinfo, intl, mysql, pdo_mysql
coverage: none

Expand All @@ -138,9 +136,9 @@ jobs:
working-directory: apps/${{ env.APP_NAME }}
run: ./vendor/phpunit/phpunit/phpunit -c phpunit.xml

- name: PHPUnit integration
working-directory: apps/${{ env.APP_NAME }}
run: ./vendor/phpunit/phpunit/phpunit -c phpunit.integration.xml
# - name: PHPUnit integration
# working-directory: apps/${{ env.APP_NAME }}
# run: ./vendor/phpunit/phpunit/phpunit -c phpunit.integration.xml

pgsql:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -189,7 +187,6 @@ jobs:
uses: shivammathur/setup-php@v1
with:
php-version: ${{ matrix.php-versions }}
tools: phpunit
extensions: mbstring, iconv, fileinfo, intl, pgsql, pdo_pgsql
coverage: xdebug

Expand All @@ -208,11 +205,11 @@ jobs:

- name: PHPUnit
working-directory: apps/${{ env.APP_NAME }}
run: composer run test
run: ./vendor/phpunit/phpunit/phpunit -c phpunit.xml

- name: PHPUnit integration
working-directory: apps/${{ env.APP_NAME }}
run: composer run test:integration
# - name: PHPUnit integration
# working-directory: apps/${{ env.APP_NAME }}
# run: ./vendor/phpunit/phpunit/phpunit -c phpunit.integration.xml

- name: Upload coverage to Codecov
working-directory: apps/${{ env.APP_NAME }}
Expand Down
118 changes: 0 additions & 118 deletions .scrutinizer.yml
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
],
"require": {},
"require-dev": {
"phpunit/phpunit": "^7.5",
"nextcloud/coding-standard": "^0.3.0"
"nextcloud/coding-standard": "^0.5.0",
"phpunit/phpunit": "^8.5"
},
"scripts": {
"lint": "find . -name \\*.php -not -path './vendor/*' -print0 | xargs -0 -n1 php -l",
Expand All @@ -22,7 +22,7 @@
},
"config": {
"platform": {
"php": "7.2"
"php": "7.3"
}
}
}
Loading