Skip to content

chore: split phpunit into vendor-bin #3306

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
Chartman123 merged 3 commits into from
Apr 20, 2026
Merged

chore: split phpunit into vendor-bin #3306

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ed05c60
chore: split phpunit into vendor-bin
susnux Apr 19, 2026
9fb1887
chore: adjust code for breaking changes of PHPUnit 10
susnux Apr 19, 2026
524ab0a
ci: adjust dependabot config to update all vendor-bin
susnux Apr 19, 2026
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
98 changes: 18 additions & 80 deletions .github/dependabot.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,51 +4,16 @@ version: 2
updates:
- package-ecosystem: composer
target-branch: 'main'
directory: '/'
schedule:
interval: weekly
day: saturday
time: '03:00'
timezone: Europe/Paris
open-pull-requests-limit: 10
labels:
- 3. to review
- dependencies

- package-ecosystem: composer
target-branch: 'main'
directory: '/vendor-bin/cs-fixer/'
schedule:
interval: weekly
day: saturday
time: '03:00'
timezone: Europe/Paris
open-pull-requests-limit: 10
labels:
- 3. to review
- dependencies

- package-ecosystem: composer
target-branch: 'main'
directory: '/vendor-bin/openapi-extractor/'
schedule:
interval: weekly
day: saturday
time: '03:00'
timezone: Europe/Paris
open-pull-requests-limit: 10
labels:
- 3. to review
- dependencies

- package-ecosystem: composer
target-branch: 'main'
directory: '/vendor-bin/psalm/'
directories:
- '/'
- '/vendor-bin/*/'
schedule:
interval: weekly
day: saturday
time: '03:00'
timezone: Europe/Paris
cooldown:
default-days: 4
open-pull-requests-limit: 10
labels:
- 3. to review
Expand All @@ -62,6 +27,9 @@ updates:
day: saturday
time: '03:00'
timezone: Europe/Paris
cooldown:
default-days: 4
semver-major-days: 8
open-pull-requests-limit: 10
labels:
- 3. to review
Expand All @@ -75,58 +43,25 @@ updates:
day: saturday
time: '03:00'
timezone: Europe/Paris
cooldown:
default-days: 4
open-pull-requests-limit: 10
labels:
- 3. to review
- dependencies

- package-ecosystem: composer
target-branch: 'stable5.2'
directory: '/'
schedule:
interval: weekly
day: saturday
time: '03:00'
timezone: Europe/Paris
open-pull-requests-limit: 10
labels:
- 3. to review
- dependencies

- package-ecosystem: composer
target-branch: 'stable5.2'
directory: '/vendor-bin/cs-fixer/'
schedule:
interval: weekly
day: saturday
time: '03:00'
timezone: Europe/Paris
open-pull-requests-limit: 10
labels:
- 3. to review
- dependencies

- package-ecosystem: composer
target-branch: 'stable5.2'
directory: '/vendor-bin/openapi-extractor/'
schedule:
interval: weekly
day: saturday
time: '03:00'
timezone: Europe/Paris
open-pull-requests-limit: 10
labels:
- 3. to review
- dependencies

- package-ecosystem: composer
target-branch: 'stable5.2'
directory: '/vendor-bin/psalm/'
directories:
- '/'
- '/vendor-bin/*/'
schedule:
interval: weekly
day: saturday
time: '03:00'
timezone: Europe/Paris
cooldown:
default-days: 4
open-pull-requests-limit: 10
labels:
- 3. to review
Expand All @@ -140,6 +75,9 @@ updates:
day: saturday
time: '03:00'
timezone: Europe/Paris
cooldown:
default-days: 4
semver-major-days: 8
open-pull-requests-limit: 10
labels:
- 3. to review
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/phpunit-mariadb.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ jobs:
# Only run if phpunit config file exists
if: steps.check_phpunit.outcome == 'success'
working-directory: apps/${{ env.APP_NAME }}
run: composer run test:unit
run: composer run test:unit -- --no-coverage

- name: Check PHPUnit integration script is defined
id: check_integration
Expand All @@ -181,7 +181,7 @@ jobs:
# Only run if phpunit integration config file exists
if: steps.check_integration.outcome == 'success'
working-directory: apps/${{ env.APP_NAME }}
run: composer run test:integration
run: composer run test:integration -- --no-coverage

- name: Print logs
if: always()
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/phpunit-mysql.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ jobs:
# Only run if phpunit config file exists
if: steps.check_phpunit.outcome == 'success'
working-directory: apps/${{ env.APP_NAME }}
run: composer run test:unit
run: composer run test:unit -- --no-coverage

- name: Check PHPUnit integration script is defined
id: check_integration
Expand All @@ -179,7 +179,7 @@ jobs:
# Only run if phpunit integration config file exists
if: steps.check_integration.outcome == 'success'
working-directory: apps/${{ env.APP_NAME }}
run: composer run test:integration
run: composer run test:integration -- --no-coverage

- name: Print logs
if: always()
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/phpunit-oci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ jobs:
# Only run if phpunit config file exists
if: steps.check_phpunit.outcome == 'success'
working-directory: apps/${{ env.APP_NAME }}
run: composer run test:unit
run: composer run test:unit -- --no-coverage

- name: Check PHPUnit integration script is defined
id: check_integration
Expand All @@ -186,7 +186,7 @@ jobs:
# Only run if phpunit integration config file exists
if: steps.check_integration.outcome == 'success'
working-directory: apps/${{ env.APP_NAME }}
run: composer run test:integration
run: composer run test:integration -- --no-coverage

- name: Print logs
if: always()
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/phpunit-pgsql.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ jobs:
# Only run if phpunit config file exists
if: steps.check_phpunit.outcome == 'success'
working-directory: apps/${{ env.APP_NAME }}
run: composer run test:unit
run: composer run test:unit -- --no-coverage

- name: Check PHPUnit integration script is defined
id: check_integration
Expand All @@ -177,7 +177,7 @@ jobs:
# Only run if phpunit integration config file exists
if: steps.check_integration.outcome == 'success'
working-directory: apps/${{ env.APP_NAME }}
run: composer run test:integration
run: composer run test:integration -- --no-coverage

- name: Print logs
if: always()
Expand Down
16 changes: 2 additions & 14 deletions REUSE.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,13 @@ SPDX-FileCopyrightText = "2019-2026 Nextcloud GmbH and Nextcloud contributors"
SPDX-License-Identifier = "AGPL-3.0-or-later"

[[annotations]]
path = ["composer.json", "composer.lock"]
path = ["composer.json", "composer.lock", "vendor-bin/*/composer.json", "vendor-bin/*/composer.lock", "package-lock.json", "package.json"]
precedence = "aggregate"
SPDX-FileCopyrightText = "2019-2026 Nextcloud GmbH and Nextcloud contributors"
SPDX-License-Identifier = "AGPL-3.0-or-later"

[[annotations]]
path = ["package-lock.json", "package.json"]
precedence = "aggregate"
SPDX-FileCopyrightText = "2018-2026 Nextcloud GmbH and Nextcloud contributors"
SPDX-License-Identifier = "AGPL-3.0-or-later"

[[annotations]]
path = ["vendor-bin/psalm/composer.json", "vendor-bin/psalm/composer.lock"]
path = ["openapi.json"]
precedence = "aggregate"
SPDX-FileCopyrightText = "2018-2026 Nextcloud GmbH and Nextcloud contributors"
SPDX-License-Identifier = "AGPL-3.0-or-later"
Expand All @@ -35,12 +29,6 @@ precedence = "aggregate"
SPDX-FileCopyrightText = "Nextcloud GmbH and Nextcloud contributors"
SPDX-License-Identifier = "CC0-1.0"

[[annotations]]
path = ["vendor-bin/cs-fixer/composer.json", "vendor-bin/cs-fixer/composer.lock", "vendor-bin/psalm/composer.json", "vendor-bin/psalm/composer.lock", "vendor-bin/openapi-extractor/composer.json", "vendor-bin/openapi-extractor/composer.lock", "openapi.json"]
precedence = "aggregate"
SPDX-FileCopyrightText = "2021-2026 Nextcloud GmbH and Nextcloud contributors"
SPDX-License-Identifier = "AGPL-3.0-or-later"

[[annotations]]
path = [".tx/backport", ".tx/config"]
precedence = "aggregate"
Expand Down
7 changes: 3 additions & 4 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,13 @@
"cs:fix": "php-cs-fixer fix",
"cs:check": "php-cs-fixer fix --dry-run --diff",
"lint": "find . -name \\*.php -not -path './vendor*/*' -print0 | xargs -0 -n1 php -l",
"test:unit": "phpunit -c tests/phpunit.xml",
"test:integration": "phpunit -c tests/phpunit.integration.xml",
"test:unit": "phpunit --display-all-issues -c tests/phpunit.xml",
"test:integration": "phpunit --display-all-issues -c tests/phpunit.integration.xml",
"psalm": "psalm --no-cache",
"openapi": "generate-spec"
},
"require-dev": {
"bamarni/composer-bin-plugin": "^1.8",
"phpunit/phpunit": "^9"
"bamarni/composer-bin-plugin": "^1.8"
},
"require": {
"maennchen/zipstream-php": "^2.4",
Expand Down
Loading
Loading