Skip to content

Commit 2c56676

Browse files
authored
Merge pull request #1403 from nextcloud/a4blue/update-to-nextcloud-31
A4blue/update to nextcloud 31
2 parents b82dc14 + 6c22c69 commit 2c56676

Some content is hidden

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

58 files changed

+523
-610
lines changed

β€Ž.github/workflows/test.ymlβ€Ž

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ jobs:
1212
runs-on: ubuntu-latest
1313
strategy:
1414
matrix:
15-
php-versions: [8.1, 8.2, 8.3]
16-
nextcloud-versions: ['stable30']
15+
php-versions: [8.2, 8.3, 8.4]
16+
nextcloud-versions: ['stable31']
1717
name: Nextcloud ${{ matrix.nextcloud-versions }} php${{ matrix.php-versions }} unit tests
1818
steps:
1919
- name: Set up php${{ matrix.php-versions }}
@@ -47,12 +47,6 @@ jobs:
4747
run: composer run test:unit
4848
env:
4949
XDEBUG_MODE: coverage
50-
- name: Run tests
51-
if: ${{ always() && matrix.php-versions == 8.1 }}
52-
working-directory: nextcloud/apps/maps
53-
run: composer run test:unit
54-
env:
55-
XDEBUG_MODE: off
5650
- name: Report coverage
5751
uses: codecov/[email protected]
5852
if: ${{ always() && matrix.nextcloud-versions == 'master' && matrix.php-versions != 8.1}}

β€Žappinfo/info.xmlβ€Ž

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@
3535
<screenshot>https://raw.githubusercontent.com/nextcloud/maps/master/screenshots/screenshot2.png</screenshot>
3636
<screenshot>https://raw.githubusercontent.com/nextcloud/maps/master/screenshots/screenshot3.png</screenshot>
3737
<dependencies>
38-
<php min-version="8.1" max-version="8.3"/>
38+
<php min-version="8.1" max-version="8.4"/>
3939
<lib>exif</lib>
40-
<nextcloud min-version="30" max-version="30"/>
40+
<nextcloud min-version="30" max-version="31"/>
4141
</dependencies>
4242
<repair-steps>
4343
<post-migration>

β€Žappinfo/routes.phpβ€Ž

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?php
2+
23
/**
34
* Create your routes in here. The name is the lowercase name of the controller
45
* without the controller part, the stuff after the hash is the method.

β€Žcomposer.jsonβ€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"psalm": "psalm.phar --threads=1",
1515
"psalm:update-baseline": "psalm.phar --threads=1 --update-baseline",
1616
"psalm:clear": "psalm.phar --clear-cache && psalm.phar --clear-global-cache",
17-
"psalm:fix": "psalm.phar --alter --issues=InvalidReturnType,InvalidNullableReturnType,MissingParamType,InvalidFalsableReturnType",
17+
"psalm:fix": "psalm.phar --alter --issues=InvalidReturnType,InvalidNullableReturnType,MissingParamType,InvalidFalsableReturnType,MissingOverrideAttribute",
1818
"test:integration": "phpunit -c tests/phpunit.integration.xml --fail-on-warning",
1919
"test:integration:dev": "phpunit -c tests/phpunit.integration.xml --no-coverage --order-by=defects --stop-on-defect --fail-on-warning --stop-on-error --stop-on-failure",
2020
"test:unit": "phpunit -c tests/phpunit.unit.xml --fail-on-warning",

0 commit comments

Comments
Β (0)