Switch to phpunit

.github/actions/test_tests-phpunit.sh

@@ -0,0 +1,18 @@
+#!/bin/bash
+set -e -u -x -o pipefail
+
+PHPUNIT_ADDITIONNAL_OPTIONS=""
+if [[ "$CODE_COVERAGE" = true ]]; then
+  export COVERAGE_DIR="coverage-functional"
+  PHPUNIT_ADDITIONNAL_OPTIONS="--coverage-filter src --coverage-clover phpunit/$COVERAGE_DIR/clover.xml"
+
+else
+  PHPUNIT_ADDITIONNAL_OPTIONS="--no-coverage";
+fi
+
+#temporary hack to prevent dual configuration
+ln -s ../tests/config/ phpunit/
+
+vendor/bin/phpunit $PHPUNIT_ADDITIONNAL_OPTIONS
+
+unset COVERAGE_DIR

.github/workflows/ci.yml

@@ -175,6 +175,10 @@ jobs:
         run: |
           .github/actions/init_initialize-9.5-db.sh
           docker compose exec -T app .github/actions/test_update-from-9.5.sh
+      - name: "PHPUnit tests"
+        if: env.skip != 'true'
+        run: |
+          docker compose exec -T app .github/actions/test_tests-phpunit.sh
       - name: "Functional tests"
         if: "${{ env.skip != 'true' && (success() || failure()) }}"
         run: |

.github/workflows/coverage.yml

@@ -61,6 +61,9 @@ jobs:
       - name: "Install database"
         run: |
           docker compose exec -T app .github/actions/test_install.sh
+      - name: "PHPUnit tests"
+        run: |
+          docker compose exec -T app .github/actions/test_tests-phpunit.sh
       - name: "Functional tests"
         run: |
           docker compose exec -T app .github/actions/test_tests-functional.sh
@@ -77,5 +80,5 @@ jobs:
         env:
           CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
         with:
-          files: ./tests/coverage-functional/clover.xml,./tests/coverage-ldap/clover.xml,./tests/coverage-imap/clover.xml
+          files: ./phpunit/coverage-functional/clover.xml,./tests/coverage-functional/clover.xml,./tests/coverage-ldap/clover.xml,./tests/coverage-imap/clover.xml
           override_branch: ${{ inputs.branch }}

.gitignore

@@ -48,3 +48,6 @@ phpunit.xml
 /inc/downstream.php
 /docker-compose.override.yaml
 /.devcontainer/docker-compose.override.yaml
+/.phpunit.result.cache
+/phpunit/files/
+/phpunit/config

composer.json

@@ -87,6 +87,7 @@
         "phpstan/extension-installer": "^1.4",
         "phpstan/phpstan": "^1.11",
         "phpstan/phpstan-deprecation-rules": "^1.2",
+        "phpunit/phpunit": "^9.6",
         "squizlabs/php_codesniffer": "^3.10",
         "symfony/browser-kit": "^5.4",
         "symfony/http-client": "^5.4",