clean(ZMS-3429): Resolve merge conflicts from next

.ddev/.env.template

@@ -1,5 +1,5 @@
 # ZMS Core
-ZMS_API_URL=https://localhost/terminvereinbarung/api/2
+ZMS_API_URL=https://zms.ddev.site/terminvereinbarung/api/2
 ZMS_CRONROOT=1
 ZMS_ENV=dev
 #ZMS_TIMEADJUST='2016-04-01 H:i'

.github/workflows/static.yaml → .github/workflows/build-api-docs.yaml

@@ -1,27 +1,20 @@
-# Workflow for deploying API documentation to Pages
-name: Deploy API Documentation to Pages
+name: Build API Documentation
 
 on:
-  push:
-    branches: ["main"]
-  workflow_dispatch:
+  workflow_call:
+    outputs:
+      result:
+        description: "Build result"
+        value: ${{ jobs.build.outputs.result }}
 
 permissions:
   contents: read
-  pages: write
-  id-token: write
-
-concurrency:
-  group: "pages"
-  cancel-in-progress: false
 
 jobs:
-  deploy:
-    environment:
-      name: github-pages
-      url: ${{ steps.deployment.outputs.page_url }}
+  build:
     runs-on: ubuntu-latest
-
+    outputs:
+      result: ${{ steps.set-result.outputs.result }}
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -70,14 +63,15 @@ jobs:
           npx swagger-cli bundle -o public/doc/swagger.json public/doc/swagger.yaml
           cd ..
 
-      - name: Setup Pages
-        uses: actions/configure-pages@v5
-
-      - name: Upload artifact
-        uses: actions/upload-pages-artifact@v3
+      - name: Upload API docs artifact
+        uses: actions/upload-artifact@v4
         with:
-          path: '.'
+          name: api-docs
+          path: |
+            zmsapi/public/doc/
+            zmscitizenapi/public/doc/
 
-      - name: Deploy to GitHub Pages
-        id: deployment
-        uses: actions/deploy-pages@v4
+      - name: Set job result
+        id: set-result
+        if: always()
+        run: echo "result=${{ job.status }}" >> $GITHUB_OUTPUT

.github/workflows/combined-workflow-with-docs.yaml

@@ -0,0 +1,55 @@
+name: Combined Workflow with Documentation
+
+on:
+  push:
+    branches: [next]
+
+permissions:
+  contents: read
+  packages: write
+  pages: write
+  id-token: write
+
+jobs:
+  call-php-code-quality:
+    uses: ./.github/workflows/php-code-quality.yaml
+
+  call-php-unit-tests:
+    uses: ./.github/workflows/php-unit-tests.yaml
+
+  combine-php-test-coverage:
+    needs: [call-php-unit-tests]
+    runs-on: ubuntu-latest
+    steps:
+      - name: Download all coverage reports
+        uses: actions/download-artifact@v4
+        with:
+          pattern: 'coverage-*'
+          path: public/coverage
+          merge-multiple: false
+
+      - name: Upload coverage artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: coverage-reports
+          path: public/coverage/
+          retention-days: 7
+
+  call-build-api-docs:
+    uses: ./.github/workflows/build-api-docs.yaml
+
+  deploy-to-pages:
+    needs: [combine-php-test-coverage, call-build-api-docs]
+    if: needs.call-build-api-docs.result == 'success'
+    uses: ./.github/workflows/deploy-pages.yaml
+    with:
+      coverage_artifact: coverage-reports
+      api_docs_artifact: api-docs
+
+  call-php-build-images:
+    needs: [call-php-code-quality, call-php-unit-tests]
+    if: |
+      always() &&
+      needs.call-php-code-quality.result == 'success' &&
+      needs.call-php-unit-tests.result == 'success'
+    uses: ./.github/workflows/php-build-images.yaml

.github/workflows/combined-workflow.yaml

@@ -1,11 +1,25 @@
 name: Combined Workflow
 
-on: [push]
+on:
+  push:
+    branches-ignore: [next]
+  workflow_call:
+
+permissions:
+  contents: read
+  packages: write
 
 jobs:
-  call-unit-tests:
-    uses: ./.github/workflows/unit-tests.yaml
+  call-php-code-quality:
+    uses: ./.github/workflows/php-code-quality.yaml
+
+  call-php-unit-tests:
+    uses: ./.github/workflows/php-unit-tests.yaml
 
-  call-build-images:
-    needs: call-unit-tests
-    uses: ./.github/workflows/build-images.yaml
+  call-php-build-images:
+    needs: [call-php-code-quality, call-php-unit-tests]
+    if: |
+      always() &&
+      needs.call-php-code-quality.result == 'success' &&
+      needs.call-php-unit-tests.result == 'success'
+    uses: ./.github/workflows/php-build-images.yaml

.github/workflows/deploy-pages.yaml

@@ -0,0 +1,147 @@
+name: Deploy to GitHub Pages
+
+on:
+  workflow_call:
+    inputs:
+      coverage_artifact:
+        description: 'Name of the coverage reports artifact'
+        required: true
+        type: string
+        default: 'coverage-reports'
+      api_docs_artifact:
+        description: 'Name of the API documentation artifact'
+        required: true
+        type: string
+        default: 'api-docs'
+
+permissions:
+  pages: write
+  id-token: write
+
+concurrency:
+  group: "pages"
+  cancel-in-progress: false
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+    steps:
+      - name: Create public directory
+        run: mkdir -p public
+
+      - name: Download coverage reports
+        uses: actions/download-artifact@v4
+        with:
+          name: ${{ inputs.coverage_artifact }}
+          path: public/coverage
+
+      - name: Download API docs
+        uses: actions/download-artifact@v4
+        with:
+          name: ${{ inputs.api_docs_artifact }}
+          path: public
+
+      - name: Create index page
+        run: |
+          cat > public/index.html <<'EOL'
+          <!DOCTYPE html>
+          <html>
+            <head>
+              <title>eAppointment Documentation</title>
+              <style>
+                :root {
+                  --primary: #0366d6;
+                  --bg: #ffffff;
+                  --text: #24292e;
+                }
+                body {
+                  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Helvetica, Arial, sans-serif;
+                  line-height: 1.6;
+                  color: var(--text);
+                  max-width: 1200px;
+                  margin: 0 auto;
+                  padding: 2rem;
+                  background: var(--bg);
+                }
+                h1, h2 {
+                  border-bottom: 1px solid #eaecef;
+                  padding-bottom: 0.3em;
+                }
+                .grid {
+                  display: grid;
+                  grid-template-columns: repeat(auto-fit, minmax(300px, 1fr));
+                  gap: 2rem;
+                  margin: 2rem 0;
+                }
+                .card {
+                  background: #f6f8fa;
+                  border-radius: 6px;
+                  padding: 1.5rem;
+                }
+                .card h2 {
+                  margin-top: 0;
+                }
+                ul {
+                  list-style-type: none;
+                  padding: 0;
+                }
+                li {
+                  margin: 0.5rem 0;
+                }
+                a {
+                  color: var(--primary);
+                  text-decoration: none;
+                }
+                a:hover {
+                  text-decoration: underline;
+                }
+              </style>
+            </head>
+            <body>
+              <h1>ZMS eAppointment Technical Documentation</h1>
+
+              <div class="grid">
+                <div class="card">
+                  <h2>API Documentation</h2>
+                  <ul>
+                    <li><a href="https://it-at-m.github.io/eappointment/zmscitizenapi/public/doc/index.html">Zmscitizenapi API Documentation</a></li>
+                    <li><a href="https://it-at-m.github.io/eappointment/zmsapi/public/doc/index.html">Zmsapi Documentation</a></li>
+                  </ul>
+                </div>
+
+                <div class="card">
+                  <h2>Code Test Coverage Reports</h2>
+                  <ul>
+                    <li><a href="coverage/coverage-zmsadmin/html/">Zmsadmin Coverage</a></li>
+                    <li><a href="coverage/coverage-zmscalldisplay/html/">Zmscalldisplay Coverage</a></li>
+                    <li><a href="coverage/coverage-zmscitizenapi/html/">Zmscitizenapi Coverage</a></li>
+                    <li><a href="coverage/coverage-zmsdldb/html/">Zmsdldb Coverage</a></li>
+                    <li><a href="coverage/coverage-zmsentities/html/">Zmsentities Coverage</a></li>
+                    <li><a href="coverage/coverage-zmsmessaging/html/">Zmsmessaging Coverage</a></li>
+                    <li><a href="coverage/coverage-zmsslim/html/">Zmsslim Coverage</a></li>
+                    <li><a href="coverage/coverage-zmsstatistic/html/">Zmsstatistic Coverage</a></li>
+                    <li><a href="coverage/coverage-zmsticketprinter/html/">Zmsticketprinter Coverage</a></li>
+                    <li><a href="coverage/coverage-zmsapi/html/">Zmsapi Coverage</a></li>
+                    <li><a href="coverage/coverage-zmsdb/html/">Zmsdb Coverage</a></li>
+                    <li><a href="coverage/coverage-zmsclient/html/">Zmsclient Coverage</a></li>
+                  </ul>
+                </div>
+              </div>
+            </body>
+          </html>
+          EOL
+
+      - name: Setup Pages
+        uses: actions/configure-pages@v4
+
+      - name: Upload Pages artifact
+        uses: actions/upload-pages-artifact@v3
+        with:
+          path: public
+
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v4

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

@@ -0,0 +1,59 @@
+name: code quality
+
+on:
+  workflow_call:
+
+jobs:
+  module-code-quality:
+    runs-on: ubuntu-latest
+    container:
+      image: "ghcr.io/it-at-m/eappointment-php-base:${{ matrix.php_version }}-dev"
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Install Composer Dependencies
+        run: |
+          cd "${{ matrix.module }}"
+          composer install --no-progress --prefer-dist --optimize-autoloader
+
+      - name: PHPCS / PSR-12
+        run: |
+          cd "${{ matrix.module }}"
+          echo "Running phpcs (ignoring warnings)..."
+          vendor/bin/phpcs --standard=psr12 --warning-severity=0 src/
+
+      - name: PHPMD
+        run: |
+          cd "${{ matrix.module }}"
+          echo "Running phpmd..."
+          vendor/bin/phpmd src/ text ../phpmd.rules.xml
+
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - module: zmsadmin
+            php_version: "8.0"
+          - module: zmsapi
+            php_version: "8.0"
+          - module: zmscalldisplay
+            php_version: "8.0"
+          - module: zmscitizenapi
+            php_version: "8.0"
+          - module: zmsclient
+            php_version: "8.0"
+          - module: zmsdb
+            php_version: "8.0"
+          - module: zmsdldb
+            php_version: "8.0"
+          - module: zmsentities
+            php_version: "8.0"
+          - module: zmsmessaging
+            php_version: "8.0"
+          - module: zmsslim
+            php_version: "8.0"
+          - module: zmsstatistic
+            php_version: "8.0"
+          - module: zmsticketprinter
+            php_version: "8.0"