Skip to content

Commit c0c2c48

Browse files
Chartman123Chartman123
authored
Merge pull request #3306 from nextcloud/chore/split-phpunit
chore: split phpunit into vendor-bin
2 parents b7a4f3c + 524ab0a commit c0c2c48

24 files changed

Lines changed: 1931 additions & 2148 deletions

‎.github/dependabot.yml‎

Lines changed: 18 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -4,51 +4,16 @@ version: 2
44
updates:
55
- package-ecosystem: composer
66
target-branch: 'main'
7-
directory: '/'
8-
schedule:
9-
interval: weekly
10-
day: saturday
11-
time: '03:00'
12-
timezone: Europe/Paris
13-
open-pull-requests-limit: 10
14-
labels:
15-
- 3. to review
16-
- dependencies
17-
18-
- package-ecosystem: composer
19-
target-branch: 'main'
20-
directory: '/vendor-bin/cs-fixer/'
21-
schedule:
22-
interval: weekly
23-
day: saturday
24-
time: '03:00'
25-
timezone: Europe/Paris
26-
open-pull-requests-limit: 10
27-
labels:
28-
- 3. to review
29-
- dependencies
30-
31-
- package-ecosystem: composer
32-
target-branch: 'main'
33-
directory: '/vendor-bin/openapi-extractor/'
34-
schedule:
35-
interval: weekly
36-
day: saturday
37-
time: '03:00'
38-
timezone: Europe/Paris
39-
open-pull-requests-limit: 10
40-
labels:
41-
- 3. to review
42-
- dependencies
43-
44-
- package-ecosystem: composer
45-
target-branch: 'main'
46-
directory: '/vendor-bin/psalm/'
7+
directories:
8+
- '/'
9+
- '/vendor-bin/*/'
4710
schedule:
4811
interval: weekly
4912
day: saturday
5013
time: '03:00'
5114
timezone: Europe/Paris
15+
cooldown:
16+
default-days: 4
5217
open-pull-requests-limit: 10
5318
labels:
5419
- 3. to review
@@ -62,6 +27,9 @@ updates:
6227
day: saturday
6328
time: '03:00'
6429
timezone: Europe/Paris
30+
cooldown:
31+
default-days: 4
32+
semver-major-days: 8
6533
open-pull-requests-limit: 10
6634
labels:
6735
- 3. to review
@@ -75,58 +43,25 @@ updates:
7543
day: saturday
7644
time: '03:00'
7745
timezone: Europe/Paris
46+
cooldown:
47+
default-days: 4
7848
open-pull-requests-limit: 10
7949
labels:
8050
- 3. to review
8151
- dependencies
8252

8353
- package-ecosystem: composer
8454
target-branch: 'stable5.2'
85-
directory: '/'
86-
schedule:
87-
interval: weekly
88-
day: saturday
89-
time: '03:00'
90-
timezone: Europe/Paris
91-
open-pull-requests-limit: 10
92-
labels:
93-
- 3. to review
94-
- dependencies
95-
96-
- package-ecosystem: composer
97-
target-branch: 'stable5.2'
98-
directory: '/vendor-bin/cs-fixer/'
99-
schedule:
100-
interval: weekly
101-
day: saturday
102-
time: '03:00'
103-
timezone: Europe/Paris
104-
open-pull-requests-limit: 10
105-
labels:
106-
- 3. to review
107-
- dependencies
108-
109-
- package-ecosystem: composer
110-
target-branch: 'stable5.2'
111-
directory: '/vendor-bin/openapi-extractor/'
112-
schedule:
113-
interval: weekly
114-
day: saturday
115-
time: '03:00'
116-
timezone: Europe/Paris
117-
open-pull-requests-limit: 10
118-
labels:
119-
- 3. to review
120-
- dependencies
121-
122-
- package-ecosystem: composer
123-
target-branch: 'stable5.2'
124-
directory: '/vendor-bin/psalm/'
55+
directories:
56+
- '/'
57+
- '/vendor-bin/*/'
12558
schedule:
12659
interval: weekly
12760
day: saturday
12861
time: '03:00'
12962
timezone: Europe/Paris
63+
cooldown:
64+
default-days: 4
13065
open-pull-requests-limit: 10
13166
labels:
13267
- 3. to review
@@ -140,6 +75,9 @@ updates:
14075
day: saturday
14176
time: '03:00'
14277
timezone: Europe/Paris
78+
cooldown:
79+
default-days: 4
80+
semver-major-days: 8
14381
open-pull-requests-limit: 10
14482
labels:
14583
- 3. to review

‎.github/workflows/phpunit-mariadb.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ jobs:
163163
# Only run if phpunit config file exists
164164
if: steps.check_phpunit.outcome == 'success'
165165
working-directory: apps/${{ env.APP_NAME }}
166-
run: composer run test:unit
166+
run: composer run test:unit -- --no-coverage
167167

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

186186
- name: Print logs
187187
if: always()

‎.github/workflows/phpunit-mysql.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ jobs:
161161
# Only run if phpunit config file exists
162162
if: steps.check_phpunit.outcome == 'success'
163163
working-directory: apps/${{ env.APP_NAME }}
164-
run: composer run test:unit
164+
run: composer run test:unit -- --no-coverage
165165

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

184184
- name: Print logs
185185
if: always()

‎.github/workflows/phpunit-oci.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ jobs:
168168
# Only run if phpunit config file exists
169169
if: steps.check_phpunit.outcome == 'success'
170170
working-directory: apps/${{ env.APP_NAME }}
171-
run: composer run test:unit
171+
run: composer run test:unit -- --no-coverage
172172

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

191191
- name: Print logs
192192
if: always()

‎.github/workflows/phpunit-pgsql.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ jobs:
159159
# Only run if phpunit config file exists
160160
if: steps.check_phpunit.outcome == 'success'
161161
working-directory: apps/${{ env.APP_NAME }}
162-
run: composer run test:unit
162+
run: composer run test:unit -- --no-coverage
163163

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

182182
- name: Print logs
183183
if: always()

‎REUSE.toml‎

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,13 @@ SPDX-FileCopyrightText = "2019-2026 Nextcloud GmbH and Nextcloud contributors"
1212
SPDX-License-Identifier = "AGPL-3.0-or-later"
1313

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

2020
[[annotations]]
21-
path = ["package-lock.json", "package.json"]
22-
precedence = "aggregate"
23-
SPDX-FileCopyrightText = "2018-2026 Nextcloud GmbH and Nextcloud contributors"
24-
SPDX-License-Identifier = "AGPL-3.0-or-later"
25-
26-
[[annotations]]
27-
path = ["vendor-bin/psalm/composer.json", "vendor-bin/psalm/composer.lock"]
21+
path = ["openapi.json"]
2822
precedence = "aggregate"
2923
SPDX-FileCopyrightText = "2018-2026 Nextcloud GmbH and Nextcloud contributors"
3024
SPDX-License-Identifier = "AGPL-3.0-or-later"
@@ -35,12 +29,6 @@ precedence = "aggregate"
3529
SPDX-FileCopyrightText = "Nextcloud GmbH and Nextcloud contributors"
3630
SPDX-License-Identifier = "CC0-1.0"
3731

38-
[[annotations]]
39-
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"]
40-
precedence = "aggregate"
41-
SPDX-FileCopyrightText = "2021-2026 Nextcloud GmbH and Nextcloud contributors"
42-
SPDX-License-Identifier = "AGPL-3.0-or-later"
43-
4432
[[annotations]]
4533
path = [".tx/backport", ".tx/config"]
4634
precedence = "aggregate"

‎composer.json‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,13 @@
1717
"cs:fix": "php-cs-fixer fix",
1818
"cs:check": "php-cs-fixer fix --dry-run --diff",
1919
"lint": "find . -name \\*.php -not -path './vendor*/*' -print0 | xargs -0 -n1 php -l",
20-
"test:unit": "phpunit -c tests/phpunit.xml",
21-
"test:integration": "phpunit -c tests/phpunit.integration.xml",
20+
"test:unit": "phpunit --display-all-issues -c tests/phpunit.xml",
21+
"test:integration": "phpunit --display-all-issues -c tests/phpunit.integration.xml",
2222
"psalm": "psalm --no-cache",
2323
"openapi": "generate-spec"
2424
},
2525
"require-dev": {
26-
"bamarni/composer-bin-plugin": "^1.8",
27-
"phpunit/phpunit": "^9"
26+
"bamarni/composer-bin-plugin": "^1.8"
2827
},
2928
"require": {
3029
"maennchen/zipstream-php": "^2.4",

0 commit comments

Comments
 (0)