Skip to content

Commit 61a3976

Browse files
committed
feat(deps): upgrade deps to PHP 8.2 min
Signed-off-by: Benjamin Gaussorgues <benjamin.gaussorgues@nextcloud.com>
1 parent 0db7813 commit 61a3976

File tree

204 files changed

+7338
-6007
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

204 files changed

+7338
-6007
lines changed

.editorconfig

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
# https://editorconfig.org
2+
3+
# SPDX-FileCopyrightText: 2019 Nextcloud GmbH and Nextcloud contributors
4+
# SPDX-License-Identifier: AGPL-3.0-or-later
5+
6+
root = true
7+
8+
[*]
9+
charset = utf-8
10+
end_of_line = lf
11+
indent_size = 4
12+
indent_style = tab
13+
insert_final_newline = true
14+
trim_trailing_whitespace = true
15+
16+
[*.yml]
17+
indent_size = 2
18+
indent_style = space

.github/workflows/check-same-code-base.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,8 @@ jobs:
4545

4646
- name: check-updater-phar
4747
run: |
48-
./vendor/bin/box info -l updater.phar | grep -v "^Signature Hash" | grep -v "^ Version.php " | grep -v "^Contents: " | grep -v "^ installed.php " > updater.old.txt
48+
composer -V
49+
./vendor/bin/box info -l updater.phar | grep -Ev "^(Signature Hash| Version.php |Contents: | installed.php |Timestamp: )" > updater.old.txt
4950
make updater.phar
50-
./vendor/bin/box info -l updater.phar | grep -v "^Signature Hash" | grep -v "^ Version.php " | grep -v "^Contents: " | grep -v "^ installed.php " > updater.txt
51-
diff updater.txt updater.old.txt
51+
./vendor/bin/box info -l updater.phar | grep -Ev "^(Signature Hash| Version.php |Contents: | installed.php |Timestamp: )" > updater.txt
52+
diff --suppress-common-lines -t --tabsize=4 -d -y --color=always updater.txt updater.old.txt

.github/workflows/test-cli.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
runs-on: ubuntu-latest
1919
strategy:
2020
matrix:
21-
php-versions: ["8.1"]
21+
php-versions: ["8.2"]
2222

2323
name: test-cli
2424

.github/workflows/test-stable.yml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,13 @@ jobs:
1818
runs-on: ubuntu-latest
1919
strategy:
2020
matrix:
21-
php-versions: ["8.1", "8.2"]
22-
nextcloud-versions: ["24", "25", "26"]
21+
php-versions: ["8.2", "8.3"]
22+
nextcloud-versions: ["26", "27", "28"]
2323
exclude:
24-
- php-versions: "8.2"
25-
nextcloud-versions: "25"
26-
- php-versions: "8.2"
27-
nextcloud-versions: "24"
28-
24+
- php-versions: "8.3"
25+
nextcloud-versions: "26"
26+
- php-versions: "8.3"
27+
nextcloud-versions: "27"
2928

3029
name: test-stable
3130

.github/workflows/test-various.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ jobs:
2020
matrix:
2121
php-versions: ["8.2"]
2222

23-
2423
name: test-various
2524

2625
steps:

Makefile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,15 @@ test: updater.phar test/vendor
2727
test-cli: updater.phar test/vendor
2828
cd tests && ../vendor/bin/behat features/cli.feature
2929

30-
test-stable24: updater.phar test/vendor
31-
cd tests && ../vendor/bin/behat features/stable24.feature
32-
33-
test-stable25: updater.phar test/vendor
34-
cd tests && ../vendor/bin/behat features/stable25.feature
35-
3630
test-stable26: updater.phar test/vendor
3731
cd tests && ../vendor/bin/behat features/stable26.feature
3832

33+
test-stable27: updater.phar test/vendor
34+
cd tests && ../vendor/bin/behat features/stable27.feature
35+
36+
test-stable28: updater.phar test/vendor
37+
cd tests && ../vendor/bin/behat features/stable28.feature
38+
3939
test-master: updater.phar test/vendor
4040
cd tests && ../vendor/bin/behat features/master.feature
4141

box.json

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
{
2-
"chmod": "0755",
3-
"directories": ["lib"],
4-
"finder": [
5-
{
6-
"name": "*.php",
7-
"exclude": ["Tests"],
8-
"in": "vendor"
9-
}
10-
],
11-
"main": "updater.php",
12-
"output": "updater.phar",
13-
"stub": true
2+
"directories": [
3+
"lib"
4+
],
5+
"finder": [
6+
{
7+
"name": "*.php",
8+
"exclude": [
9+
"Tests"
10+
],
11+
"in": "vendor"
12+
}
13+
],
14+
"main": "updater.php",
15+
"force-autodiscovery": true
1416
}

composer.json

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,40 @@
11
{
2-
"autoload" : {
3-
"psr-4": {
4-
"NC\\Updater\\": "lib/"
5-
}
6-
},
7-
"config": {
8-
"allow-plugins": {
9-
"bamarni/composer-bin-plugin": true
10-
},
11-
"classmap-authoritative": true,
12-
"optimize-autoloader": true,
13-
"platform": {
14-
"php": "8.1"
15-
},
16-
"sort-packages": true
17-
},
18-
"require": {
19-
"symfony/console": "^5.4"
20-
},
21-
"scripts": {
22-
"box": "box compile -c box.json",
23-
"cs:check": "php-cs-fixer fix --dry-run --diff",
24-
"cs:fix": "php-cs-fixer fix",
25-
"lint": "find . -name \\*.php -not -path './vendor*' -not -path './build/*' -not -path './node_modules/*' -print0 | xargs -0 -n1 php -l",
2+
"autoload": {
3+
"psr-4": {
4+
"NC\\Updater\\": "lib/"
5+
}
6+
},
7+
"config": {
8+
"allow-plugins": {
9+
"bamarni/composer-bin-plugin": true
10+
},
11+
"classmap-authoritative": true,
12+
"optimize-autoloader": true,
13+
"platform": {
14+
"php": "8.2"
15+
},
16+
"sort-packages": true
17+
},
18+
"require": {
19+
"symfony/console": "^6.4"
20+
},
21+
"scripts": {
22+
"box": "box compile -c box.json",
23+
"cs:check": "php-cs-fixer fix --dry-run --diff",
24+
"cs:fix": "php-cs-fixer fix",
25+
"lint": "find . -name \\*.php -not -path './vendor*' -not -path './build/*' -not -path './node_modules/*' -print0 | xargs -0 -n1 php -l",
2626
"psalm": "psalm --threads=$(nproc)",
2727
"psalm:ci": "psalm --threads=1",
28-
"psalm:fix": "- --issues=InvalidReturnType,InvalidNullableReturnType,MissingParamType,InvalidFalsableReturnType"
29-
},
30-
"require-dev": {
31-
"bamarni/composer-bin-plugin": "^1.8"
32-
},
33-
"extra": {
34-
"bamarni-bin": {
35-
"bin-links": true,
36-
"target-directory": "vendor-bin",
37-
"forward-command": true
38-
}
39-
}
28+
"psalm:fix": "- --issues=InvalidReturnType,InvalidNullableReturnType,MissingParamType,InvalidFalsableReturnType"
29+
},
30+
"require-dev": {
31+
"bamarni/composer-bin-plugin": "^1.8"
32+
},
33+
"extra": {
34+
"bamarni-bin": {
35+
"bin-links": true,
36+
"target-directory": "vendor-bin",
37+
"forward-command": true
38+
}
39+
}
4040
}

0 commit comments

Comments
 (0)