Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

NC28 compat #224

Merged
merged 1 commit into from
Aug 25, 2023
Merged
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
6 changes: 3 additions & 3 deletions .github/workflows/phpunit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
matrix:
php-versions: ['8.1']
databases: ['sqlite']
server-versions: ['stable27']
server-versions: ['master']

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

Expand Down Expand Up @@ -76,7 +76,7 @@ jobs:
matrix:
php-versions: ['8.0', '8.1', '8.2']
databases: ['mysql']
server-versions: ['stable27']
server-versions: ['master']

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

Expand Down Expand Up @@ -141,7 +141,7 @@ jobs:
matrix:
php-versions: ['8.1']
databases: ['pgsql']
server-versions: ['stable27']
server-versions: ['master']

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

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/sonarqube.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ jobs:
# do not stop on another job's failure
fail-fast: false
matrix:
php-versions: ['8.0']
php-versions: ['8.2']
databases: ['sqlite']
server-versions: ['stable27']
server-versions: ['master']

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

Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ appstore:
--exclude="../$(app_name)/psalm.xml" \
../$(app_name) \

.PHONY: test
.PHONY: php-test
php-test: composer
$(CURDIR)/vendor/phpunit/phpunit/phpunit -c phpunit.xml
$(CURDIR)/vendor/phpunit/phpunit/phpunit -c phpunit.integration.xml
Expand Down Expand Up @@ -222,7 +222,7 @@ lint-fix: composer npm-install
npm run lint:fix

.PHONY: js-test
js-test:
js-test: npm-install
npm run test:unit

.PHONY: test
Expand Down
2 changes: 1 addition & 1 deletion 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-27-orange)](https://github.com/nextcloud/server)
[![Generic badge](https://img.shields.io/badge/Nextcloud-28-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
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.27.0</version>
<version>1.28.0</version>
<licence>agpl</licence>
<author mail="[email protected]">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="27" max-version="27"/>
<nextcloud min-version="28" max-version="28"/>
<php min-version="8.0" max-version="8.2"/>
</dependencies>
</info>
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"optimize-autoloader": true,
"classmap-authoritative": true,
"platform": {
"php": "8.0"
"php": "8.2"
},
"autoloader-suffix": "WorkflowOcr"
},
Expand Down
2 changes: 1 addition & 1 deletion psalm.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
xmlns="https://getpsalm.org/schema/config"
xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
errorBaseline="./tests/psalm-baseline.xml"
phpVersion="8.0"
phpVersion="8.2"
>
<projectFiles>
<directory name="lib" />
Expand Down
11 changes: 1 addition & 10 deletions tests/bootstrap.php
Original file line number Diff line number Diff line change
@@ -1,13 +1,4 @@
<?php

use OCA\WorkflowOcr\AppInfo;

require_once __DIR__ . '/../../../tests/bootstrap.php';

\OC_App::loadApp(AppInfo\Application::APP_NAME);

if (!class_exists('PHPUnit\Framework\TestCase')) {
require_once('PHPUnit/Autoload.php');
}

OC_Hook::clear();
require_once __DIR__ . '/../composer/autoload.php';
Loading