Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/copilot-instructions.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ Current target: Nextcloud 33 (check `appinfo/info.xml` for updates)

### Technology Stack

- **Backend**: PHP 8.1-8.4
- **Backend**: PHP 8.2-8.5
- **Frontend**: Vue 3, Node 24, npm 11.6
- **Build Tools**: rspack, vitest, eslint, stylelint
- **PHP Tools**: composer, phpunit, psalm, php-cs-fixer
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/composer-update.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ jobs:
ref: ${{ github.head_ref }}
token: ${{ secrets.WORKFLOW_OCR_COMPOSER_DEPS_AUTO_UPDATE }} # To be able to trigger workflows in case of git push

- name: Set up php 8.4
- name: Set up php 8.5
uses: shivammathur/setup-php@v2
with:
php-version: 8.4
php-version: 8.5
extensions: mbstring, iconv, fileinfo, intl, sqlite, pdo_sqlite, gd, zip, imagick
coverage: none

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint-fix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:

strategy:
matrix:
php-versions: ['8.4']
php-versions: ['8.5']

steps:
- name: Checkout
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/phpunit-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
strategy:
fail-fast: false
matrix:
php-versions: ['8.4']
php-versions: ['8.5']
databases: ['mysql']
server-versions: ['master']
backend: ['remote', 'local'] # Do not change these names, they're used in the integration tests
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/phpunit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
strategy:
fail-fast: true
matrix:
php-versions: ['8.4']
php-versions: ['8.5']
databases: ['sqlite']
server-versions: ['master']

Expand Down Expand Up @@ -140,7 +140,7 @@ jobs:
# do not stop on another job's failure
fail-fast: false
matrix:
php-versions: ['8.4']
php-versions: ['8.5']
databases: ['pgsql']
server-versions: ['master']

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/psalm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
strategy:
matrix:
ocp-version: [ 'dev-master' ]
php-version: [ '8.4' ]
php-version: [ '8.5' ]

name: Nextcloud ${{ matrix.ocp-version }} PHP${{ matrix.php-version }}
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sonarqube.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
# do not stop on another job's failure
fail-fast: false
matrix:
php-versions: ['8.4']
php-versions: ['8.5']
databases: ['sqlite']
server-versions: ['master']

Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
[![Coverage](https://sonarcloud.io/api/project_badges/measure?project=R0Wi_workflow_ocr&metric=coverage)](https://sonarcloud.io/summary/new_code?id=R0Wi_workflow_ocr)
![Lint](https://github.com/R0Wi/workflow_ocr/workflows/Lint/badge.svg)
[![Generic badge](https://img.shields.io/github/v/release/R0Wi/workflow_ocr)](https://github.com/R0Wi/workflow_ocr/releases)
[![Generic badge](https://img.shields.io/badge/Nextcloud-34-orange)](https://github.com/nextcloud/server)
[![Generic badge](https://img.shields.io/badge/Nextcloud-35-orange)](https://github.com/nextcloud/server)

[!["Buy Me A Coffee"](https://www.buymeacoffee.com/assets/img/custom_images/orange_img.png)](https://www.buymeacoffee.com/R0Wi)

Expand Down Expand Up @@ -283,7 +283,7 @@ port `9003`. Depending on your system a possible configuration could
look like this:

```ini
; /etc/php/8.4/cli/php.ini
; /etc/php/8.5/cli/php.ini
; ...
[Xdebug]
zend_extension=/usr/lib/php/20190902/xdebug.so
Expand All @@ -294,7 +294,7 @@ xdebug.remote_autostart=1
```

```ini
; /etc/php/8.4/apache2/php.ini
; /etc/php/8.5/apache2/php.ini
; ...
[Xdebug]
zend_extension=/usr/lib/php/20190902/xdebug.so
Expand Down Expand Up @@ -349,7 +349,7 @@ services:
networks:
- web_dev
```
`IMAGE` could be set to `IMAGE=thecodingmachine/php:8.4-v4-apache-node14` and the content of `Dockerfile` might
`IMAGE` could be set to `IMAGE=thecodingmachine/php:8.5-v4-apache-node14` and the content of `Dockerfile` might
look like this:

```dockerfile
Expand Down
4 changes: 2 additions & 2 deletions appinfo/info.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
The processing is done via workflow-engine and can therefore easily be customized.
Please note that you'll have to install the OcrMyPDF CLI on your Nextcloud server to
process PDF files. More installation instructions can be found in the docs https://github.com/R0Wi/workflow_ocr/blob/master/README.md.</description>
<version>1.34.0</version>
<version>1.35.0</version>
<licence>agpl</licence>
<author mail="ro.windey@gmail.com">Robin Windey</author>
<namespace>WorkflowOcr</namespace>
Expand All @@ -27,7 +27,7 @@
<repository type="git">https://github.com/R0Wi/workflow_ocr.git</repository>
<screenshot>https://github.com/R0Wi/workflow_ocr/blob/eb2d65e9610406bbab22c4c8dda1cea015b5c791/doc/img/usage_1.jpg?raw=true</screenshot>
<dependencies>
<nextcloud min-version="34" max-version="34"/>
<nextcloud min-version="35" max-version="35"/>
<php min-version="8.2" max-version="8.5"/>
</dependencies>
</info>
1 change: 0 additions & 1 deletion appinfo/routes.php
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
*
*/


return [
'routes' => [
['name' => 'GlobalSettings#getGlobalSettings', 'url' => '/globalSettings', 'verb' => 'GET'],
Expand Down
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@
"phpunit/php-code-coverage": "^12.0",
"phpunit/phpcov": "^11.0",
"nextcloud/coding-standard": "^1.3",
"vimeo/psalm": "6.4.*",
"vimeo/psalm": "6.16.*",
"nextcloud/ocp": "dev-master"
},
"config": {
"optimize-autoloader": true,
"platform": {
"php": "8.4"
"php": "8.5"
},
"autoloader-suffix": "WorkflowOcr"
},
Expand Down
Loading
Loading