upsun · fabpot · Aug 20, 2025 · Aug 20, 2025 · Aug 20, 2025 · Aug 20, 2025
diff --git a/.github/workflows/check-openapi-spec-update.yaml b/.github/workflows/check-openapi-spec-update.yaml
@@ -25,7 +25,14 @@ jobs:
             -   name: Install OpenAPI Generator CLI
                 run: |
                     npm install -g @openapitools/openapi-generator-cli
-
+
+            -   name: Keep existing files (removed by openapi-generator-cli generate)
+                run: |
+                    mv .gitignore .gitignore.bak
+                    mv README.md README.md.bak
+                    mv composer.json composer.json.bak
+                    mv phpunit.xml.dist phpunit.xml.dist.bak
+
             -   name: Download and patch OpenAPI spec
                 run: |
                     echo "Download OpenAPI spec..."
@@ -42,11 +49,25 @@ jobs:
                       -i ./schema/openapispec-platformsh.json \
                       -g php \
                       -o apisgen \
-                      --additional-properties=apiPackage=apisgen
+                      --additional-properties="apiPackage=.,invokerPackage=Upsun\\Client,apiPackage=Api,modelPackage=Model,srcBasePath=src \
+                      --library="psr-18"
 
-            -   name: Force-add apisgen to Git
+            -   name: Move generated OpenAPI test from /test to /tests
+                run: |
+                    if [ -d "./test" ]; then
+                        rm -Rf ./tests/API
+                        rm -Rf ./tests/Model
+                        mv ./test/* "./tests/"
+                        rm -Rf "./test"
+                    fi
+            -   name: Get back existing files (removed by openapi-generator-cli generate)
                 run: |
-                    git add apisgen
+                    mv README.md README-OPENAPI.md
+                    mv README.md.bak README.md
+                    mv .gitignore.bak .gitignore
+                    mv composer.json.bak composer.json
+                    rm -Rf phpunit.xml.dist
+                    mv phpunit.xml.dist.bak phpunit.xml.dist
 
             -   name: Create Pull Request if changes
                 uses: peter-evans/create-pull-request@v6
@@ -68,3 +89,9 @@ jobs:
                         automated pr
                     add-paths: |
                         schema/openapispec-platformsh.json
+                        src/
+                        tests/
+                        docs/
+                        README-OPENAPI.md
+
+
diff --git a/.github/workflows/phpunit.yml b/.github/workflows/phpunit.yml
@@ -0,0 +1,34 @@
+name: PHPUnit Tests
+
+on:
+  pull_request:
+    branches:
+      - main
+  push:
+    branches:
+      - main
+
+jobs:
+  phpunit:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        php-version: [8.2, 8.3, 8.4] 
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Set up PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php-version }}
+          coverage: none
+          extensions: mbstring, intl, json, curl
+
+      - name: Install dependencies
+        run: composer install --prefer-dist --no-progress
+
+      - name: Run PHPUnit
+        run: vendor/bin/phpunit --configuration phpunit.xml.dist --testsuite "Project Test Suite"
diff --git a/.gitignore b/.gitignore
@@ -4,4 +4,4 @@ apisgen/git_push.sh
 apisgen/.openapi-generator/
 apisgen/.openapi-generator-ignore
 vendor
-composer.lock
+composer.lock
diff --git a/apisgen/.gitignore b/apisgen/.gitignore
diff --git a/apisgen/.php-cs-fixer.dist.php b/apisgen/.php-cs-fixer.dist.php