Merge pull request #2415 from nextcloud/backport/2385/stable23

[stable23] Add support for different encodings
nextcloud · Jun 9, 2022 · 652efeb · 652efeb
2 parents 5521bfb + 2ccdfd9
commit 652efeb
Show file tree

Hide file tree

Showing 10 changed files with 221 additions and 138 deletions.
diff --git a/.github/workflows/oci.yml b/.github/workflows/oci.yml
@@ -73,6 +73,6 @@ jobs:
           ./occ app:enable --force ${{ env.APP_NAME }}
 
       - name: PHPUnit
-        working-directory: apps/${{ env.APP_NAME }}/tests
-        run: phpunit -c phpunit.xml
+        working-directory: apps/${{ env.APP_NAME }}
+        run: phpunit -c tests/phpunit.xml
 
diff --git a/composer.json b/composer.json
@@ -6,7 +6,8 @@
         "christophwurst/nextcloud": "dev-stable23",
         "jakub-onderka/php-parallel-lint": "^1.0.0",
         "nextcloud/coding-standard": "^0.5.0",
-        "psalm/phar": "^4.3"
+        "psalm/phar": "^4.3",
+		"ext-mbstring": "*"
     },
     "license": "AGPLv3",
     "authors": [