NC28 compat

R0Wi-DEV · Aug 25, 2023 · e6b7e73 · e6b7e73
1 parent 10dc94e
commit e6b7e73
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 19 deletions.
diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
@@ -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 }}
 
@@ -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 }}
 
@@ -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 }}
 

diff --git a/.github/workflows/sonarqube.yml b/.github/workflows/sonarqube.yml
@@ -20,7 +20,7 @@ jobs:
       matrix:
         php-versions: ['8.0']
         databases: ['sqlite']
-        server-versions: ['stable27']
+        server-versions: ['master']
 
     name: php${{ matrix.php-versions }}-${{ matrix.databases }}-COVERAGE
 

diff --git a/Makefile b/Makefile
@@ -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
@@ -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

diff --git a/README.md b/README.md
@@ -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)
 

diff --git a/appinfo/info.xml b/appinfo/info.xml
@@ -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="ro.windey@gmail.com">Robin Windey</author>
 	<namespace>WorkflowOcr</namespace>
@@ -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>
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
@@ -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';