chore(ZMS): move the coverage to the regular unit test workflow

Author: Thomas Fink

.github/workflows/combined-workflow.yaml

@@ -25,7 +25,4 @@ jobs:
       always() &&
       needs.call-php-unit-tests.result == 'success' &&
       needs.call-php-code-quality.result == 'success'
-    uses: ./.github/workflows/build-images.yaml
-
-  call-php-code-coverage:
-    uses: ./.github/workflows/php-code-coverage.yaml
+    uses: ./.github/workflows/build-images.yaml

.github/workflows/php-code-coverage.yaml

@@ -15,10 +15,18 @@ jobs:
         run: |
           cd "${{ matrix.module }}"
           composer install --no-progress --prefer-dist --optimize-autoloader
-      - name: Run Unit Tests
+      - name: Run Unit Tests with Coverage
         run: |
           cd "${{ matrix.module }}"
-          ./vendor/bin/phpunit
+          mkdir -p coverage
+          php -dzend_extension=xdebug.so -dmemory_limit=-1 ./vendor/bin/phpunit \
+            --coverage-html coverage/html --coverage-clover coverage/clover.xml
+      - name: Upload Coverage
+        uses: actions/upload-artifact@v4
+        with:
+          name: coverage-${{ matrix.module }}
+          path: ${{ matrix.module }}/coverage/
+          retention-days: 1
     strategy:
       fail-fast: false
       matrix:
@@ -42,7 +50,6 @@ jobs:
           - module: zmsticketprinter
             php_version: "8.0"
 
-
   zmsapi-test:
     runs-on: ubuntu-latest
     container:
@@ -91,9 +98,15 @@ jobs:
           ln -s vendor/eappointment/zmsdb/tests/Zmsdb/fixtures data
           echo "Importing test data..."
           vendor/bin/importTestData --commit
+          mkdir -p coverage
           php -dzend_extension=xdebug.so -dmemory_limit=-1 vendor/bin/phpunit \
-            -v --colors=never --coverage-text --coverage-html public/_tests/coverage/ --log-junit \
-            public/_tests/junit.xml
+            --coverage-html coverage/html --coverage-clover coverage/clover.xml
+      - name: Upload Coverage
+        uses: actions/upload-artifact@v4
+        with:
+          name: coverage-zmsapi
+          path: zmsapi/coverage/
+          retention-days: 1
 
   zmsdb-test:
     runs-on: ubuntu-latest
@@ -139,12 +152,15 @@ jobs:
         run: |
           cd zmsdb
           bin/importTestData --commit
+          mkdir -p coverage
           php -dzend_extension=xdebug.so -dmemory_limit=-1 vendor/bin/phpunit \
-            -v --colors=never --coverage-text --coverage-html public/_tests/coverage/ --log-junit \
-            public/_tests/junit.xml
-
-
-
+            --coverage-html coverage/html --coverage-clover coverage/clover.xml
+      - name: Upload Coverage
+        uses: actions/upload-artifact@v4
+        with:
+          name: coverage-zmsdb
+          path: zmsdb/coverage/
+          retention-days: 1
 
   zmsclient-test:
     runs-on: ubuntu-latest
@@ -166,11 +182,6 @@ jobs:
             echo "Installing Composer dependencies for $module"
             (cd "$module" && composer install --no-progress --prefer-dist --optimize-autoloader)
           done
-      - name: Install Docker Compose
-        run: |
-          sudo curl -L "https://github.com/docker/compose/releases/download/1.29.2/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
-          sudo chmod +x /usr/local/bin/docker-compose
-          docker-compose --version
 
       - name: Install Docker Compose
         run: |
@@ -180,4 +191,42 @@ jobs:
 
       - name: Run Unit Tests
         run: |
-          /bin/bash -c "cd ./zmsclient && docker-compose up -d && docker-compose exec -T test ./vendor/bin/phpunit"
+          cd ./zmsclient
+          mkdir -p coverage
+          docker-compose up -d
+          docker-compose exec -T test php -dzend_extension=xdebug.so -dmemory_limit=-1 \
+            ./vendor/bin/phpunit --coverage-html coverage/html --coverage-clover coverage/clover.xml
+
+      - name: Upload Coverage
+        uses: actions/upload-artifact@v4
+        with:
+          name: coverage-zmsclient
+          path: zmsclient/coverage/
+          retention-days: 1
+
+  combine-coverage:
+    needs: [module-test, zmsapi-test, zmsdb-test, zmsclient-test]
+    runs-on: ubuntu-latest
+    steps:
+      - name: Download all coverage reports
+        uses: actions/download-artifact@v4
+        with:
+          path: all-coverage
+          merge-multiple: true
+
+      - name: Combine reports
+        run: |
+          mkdir -p combined-coverage
+          for module in zmsadmin zmscalldisplay zmscitizenapi zmsdldb zmsentities zmsmessaging zmsslim zmsstatistic zmsticketprinter zmsapi zmsdb zmsclient; do
+            if [ -d "all-coverage/coverage-$module" ]; then
+              mkdir -p "combined-coverage/$module"
+              cp -r "all-coverage/coverage-$module"/* "combined-coverage/$module/"
+            fi
+          done
+
+      - name: Upload combined coverage
+        uses: actions/upload-artifact@v4
+        with:
+          name: coverage-reports
+          path: combined-coverage/
+          retention-days: 7