Skip to content

Commit bc91086

Browse files
Merge pull request #3246 from nextcloud/feat/revive-php-74
feat(deps): Revive PHP7.4 support
2 parents d543ae5 + 508c5a1 commit bc91086

File tree

5 files changed

+115
-102
lines changed

5 files changed

+115
-102
lines changed

.github/workflows/lint-php.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
runs-on: ubuntu-latest
2626
strategy:
2727
matrix:
28-
php-versions: ["8.0", "8.1", "8.2"]
28+
php-versions: ["7.4", "8.0", "8.1", "8.2"]
2929

3030
name: php-lint
3131

.github/workflows/phpunit.yml

+14-2
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,10 @@ jobs:
2121
php-versions: ['8.0']
2222
databases: ['sqlite']
2323
server-versions: ['master', 'stable25']
24+
include:
25+
- php-versions: '7.4'
26+
server-versions: stable25
27+
databases: 'sqlite'
2428

2529
name: php${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }}
2630

@@ -86,7 +90,11 @@ jobs:
8690
matrix:
8791
php-versions: ['8.0', '8.1', '8.2']
8892
databases: ['mysql']
89-
server-versions: ['master', 'stable25']
93+
server-versions: ['master']
94+
include:
95+
- php-versions: '7.4'
96+
server-versions: stable25
97+
databases: 'mysql'
9098

9199
name: php${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }}
92100

@@ -156,7 +164,11 @@ jobs:
156164
matrix:
157165
php-versions: ['8.0']
158166
databases: ['pgsql']
159-
server-versions: ['master', 'stable25']
167+
server-versions: ['master']
168+
include:
169+
- php-versions: '7.4'
170+
server-versions: stable25
171+
databases: 'pgsql'
160172

161173
name: php${{ matrix.php-versions }}-${{ matrix.databases }}-${{ matrix.server-versions }}
162174

appinfo/info.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
<screenshot>https://raw.githubusercontent.com/nextcloud/screenshots/master/apps/Contacts/contacts.png</screenshot>
3939

4040
<dependencies>
41-
<php min-version="8.0" max-version="8.2" />
41+
<php min-version="7.4" max-version="8.2" />
4242
<nextcloud min-version="25" max-version="26" />
4343
</dependencies>
4444

composer.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"optimize-autoloader": true,
55
"classmap-authoritative": true,
66
"platform": {
7-
"php": "8.0"
7+
"php": "7.4"
88
},
99
"autoloader-suffix": "Contacts"
1010
},
@@ -21,7 +21,7 @@
2121
"test:integration": "phpunit -c phpunit.integration.xml --fail-on-warning"
2222
},
2323
"require": {
24-
"php": ">=8.0 <=8.2"
24+
"php": ">=7.4 <=8.2"
2525
},
2626
"require-dev": {
2727
"christophwurst/nextcloud_testing": "^0.12.4",

0 commit comments

Comments
 (0)