Skip to content

Commit e95ab0f

Browse files
authored
NC33 compat (#350)
1 parent 9a84a0b commit e95ab0f

File tree

12 files changed

+68
-66
lines changed

12 files changed

+68
-66
lines changed

.github/copilot-instructions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ Current target: Nextcloud 33 (check `appinfo/info.xml` for updates)
4646

4747
### Technology Stack
4848

49-
- **Backend**: PHP 8.1-8.4
49+
- **Backend**: PHP 8.2-8.5
5050
- **Frontend**: Vue 3, Node 24, npm 11.6
5151
- **Build Tools**: rspack, vitest, eslint, stylelint
5252
- **PHP Tools**: composer, phpunit, psalm, php-cs-fixer

.github/workflows/lint-fix.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010

1111
strategy:
1212
matrix:
13-
php-versions: ['8.3']
13+
php-versions: ['8.4']
1414

1515
steps:
1616
- name: Checkout

.github/workflows/lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616

1717
strategy:
1818
matrix:
19-
php-versions: ['8.3', '8.4']
19+
php-versions: ['8.4', '8.5']
2020

2121
name: php${{ matrix.php-versions }}-LINT
2222
steps:

.github/workflows/phpunit-integration.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ jobs:
3333
strategy:
3434
fail-fast: false
3535
matrix:
36-
php-versions: ['8.3']
36+
php-versions: ['8.4']
3737
databases: ['mysql']
38-
server-versions: ['master']
38+
server-versions: ['stable33']
3939
backend: ['remote', 'local'] # Do not change these names, they're used in the integration tests
4040

4141
name: php-integrationtests-${{ matrix.backend }}-${{ matrix.php-versions }}-${{ matrix.databases }}

.github/workflows/phpunit.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ jobs:
1717
strategy:
1818
fail-fast: true
1919
matrix:
20-
php-versions: ['8.3']
20+
php-versions: ['8.4']
2121
databases: ['sqlite']
22-
server-versions: ['master']
22+
server-versions: ['stable33']
2323

2424
name: php${{ matrix.php-versions }}-${{ matrix.databases }}
2525

@@ -74,9 +74,9 @@ jobs:
7474
# do not stop on another job's failure
7575
fail-fast: false
7676
matrix:
77-
php-versions: ['8.3', '8.4']
77+
php-versions: ['8.4', '8.5']
7878
databases: ['mysql']
79-
server-versions: ['master']
79+
server-versions: ['stable33']
8080

8181
name: php${{ matrix.php-versions }}-${{ matrix.databases }}
8282

@@ -140,9 +140,9 @@ jobs:
140140
# do not stop on another job's failure
141141
fail-fast: false
142142
matrix:
143-
php-versions: ['8.3']
143+
php-versions: ['8.4']
144144
databases: ['pgsql']
145-
server-versions: ['master']
145+
server-versions: ['stable33']
146146

147147
name: php${{ matrix.php-versions }}-${{ matrix.databases }}
148148

.github/workflows/psalm.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ jobs:
1313

1414
strategy:
1515
matrix:
16-
ocp-version: [ 'dev-master' ]
17-
php-version: [ '8.2', '8.3', '8.4' ]
16+
ocp-version: [ 'dev-stable33' ]
17+
php-version: [ '8.4' ]
1818

1919
name: Nextcloud ${{ matrix.ocp-version }} PHP${{ matrix.php-version }}
2020
steps:

.github/workflows/sonarqube.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ jobs:
1818
# do not stop on another job's failure
1919
fail-fast: false
2020
matrix:
21-
php-versions: ['8.3']
21+
php-versions: ['8.4']
2222
databases: ['sqlite']
23-
server-versions: ['master']
23+
server-versions: ['stable33']
2424

2525
name: php${{ matrix.php-versions }}-${{ matrix.databases }}-COVERAGE
2626

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ port `9003`. Depending on your system a possible configuration could
283283
look like this:
284284

285285
```ini
286-
; /etc/php/8.3/cli/php.ini
286+
; /etc/php/8.4/cli/php.ini
287287
; ...
288288
[Xdebug]
289289
zend_extension=/usr/lib/php/20190902/xdebug.so
@@ -294,7 +294,7 @@ xdebug.remote_autostart=1
294294
```
295295

296296
```ini
297-
; /etc/php/8.3/apache2/php.ini
297+
; /etc/php/8.4/apache2/php.ini
298298
; ...
299299
[Xdebug]
300300
zend_extension=/usr/lib/php/20190902/xdebug.so

appinfo/info.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,6 @@
2828
<screenshot>https://github.com/R0Wi/workflow_ocr/blob/eb2d65e9610406bbab22c4c8dda1cea015b5c791/doc/img/usage_1.jpg?raw=true</screenshot>
2929
<dependencies>
3030
<nextcloud min-version="33" max-version="33"/>
31-
<php min-version="8.1" max-version="8.4"/>
31+
<php min-version="8.2" max-version="8.5"/>
3232
</dependencies>
3333
</info>

composer.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
{
22
"require": {
3-
"mikehaertl/php-shellcommand": "^1.6"
3+
"mikehaertl/php-shellcommand": "^1.7"
44
},
55
"require-dev": {
6-
"phpunit/phpunit": "^11.0",
7-
"phpunit/php-code-coverage": "^11.0",
8-
"phpunit/phpcov": "^10.0",
9-
"nextcloud/coding-standard": "^1.3",
6+
"phpunit/phpunit": "^11.5.49",
7+
"phpunit/php-code-coverage": "^11.0.12",
8+
"phpunit/phpcov": "^10.0.1",
9+
"nextcloud/coding-standard": "^1.4",
1010
"vimeo/psalm": "6.4.*",
11-
"nextcloud/ocp": "dev-master"
11+
"nextcloud/ocp": "dev-stable33"
1212
},
1313
"config": {
1414
"optimize-autoloader": true,
1515
"platform": {
16-
"php": "8.3"
16+
"php": "8.4"
1717
},
1818
"autoloader-suffix": "WorkflowOcr"
1919
},

0 commit comments

Comments
 (0)