Merge branch '3.3' into fix/admin-permissions

api-platform · Sep 15, 2024 · caa746d · caa746d
2 parents a9bd17c + 7e88f29
commit caa746d
Show file tree

Hide file tree

Showing 19 changed files with 1,469 additions and 1,800 deletions.
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
@@ -66,9 +66,15 @@ jobs:
             compose.yaml
             compose.prod.yaml
           set: |
-            *.cache-from=type=gha,scope=${{ github.ref }}
-            *.cache-from=type=gha,scope=refs/heads/main
-            *.cache-to=type=gha,scope=${{ github.ref }},mode=max
+            php.cache-from=type=gha,scope=${{ github.ref }}
+            php.cache-from=type=gha,scope=refs/heads/main
+            php.cache-to=type=gha,scope=${{ github.ref }},mode=max
+            pwa.cache-from=type=gha,scope=${{ github.ref }}
+            pwa.cache-from=type=gha,scope=refs/heads/main
+            pwa.cache-to=type=gha,scope=${{ github.ref }},mode=max
+            keycloak.cache-from=type=gha,scope=${{ github.ref }}
+            keycloak.cache-from=type=gha,scope=refs/heads/main
+            keycloak.cache-to=type=gha,scope=${{ github.ref }},mode=max
       -
         name: Docker push
         run: |

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -39,9 +39,15 @@ jobs:
             compose.yaml
             compose.override.yaml
           set: |
-            *.cache-from=type=gha,scope=${{ github.ref }}
-            *.cache-from=type=gha,scope=refs/heads/main
-            *.cache-to=type=gha,scope=${{ github.ref }},mode=max
+            php.cache-from=type=gha,scope=${{ github.ref }}
+            php.cache-from=type=gha,scope=refs/heads/main
+            php.cache-to=type=gha,scope=${{ github.ref }},mode=max
+            pwa.cache-from=type=gha,scope=${{ github.ref }}
+            pwa.cache-from=type=gha,scope=refs/heads/main
+            pwa.cache-to=type=gha,scope=${{ github.ref }},mode=max
+            keycloak.cache-from=type=gha,scope=${{ github.ref }}
+            keycloak.cache-from=type=gha,scope=refs/heads/main
+            keycloak.cache-to=type=gha,scope=${{ github.ref }},mode=max
       -
         name: Start services
         run: docker compose up --wait --no-build
@@ -130,10 +136,18 @@ jobs:
             compose.yaml
             compose.prod.yaml
           set: |
-            *.cache-from=type=gha,scope=${{ github.ref }}-e2e
-            *.cache-from=type=gha,scope=${{ github.ref }}
-            *.cache-from=type=gha,scope=refs/heads/main
-            *.cache-to=type=gha,scope=${{ github.ref }}-e2e,mode=max
+            php.cache-from=type=gha,scope=${{ github.ref }}-e2e
+            php.cache-from=type=gha,scope=${{ github.ref }}
+            php.cache-from=type=gha,scope=refs/heads/main
+            php.cache-to=type=gha,scope=${{ github.ref }}-e2e,mode=max
+            pwa.cache-from=type=gha,scope=${{ github.ref }}-e2e
+            pwa.cache-from=type=gha,scope=${{ github.ref }}
+            pwa.cache-from=type=gha,scope=refs/heads/main
+            pwa.cache-to=type=gha,scope=${{ github.ref }}-e2e,mode=max
+            keycloak.cache-from=type=gha,scope=${{ github.ref }}-e2e
+            keycloak.cache-from=type=gha,scope=${{ github.ref }}
+            keycloak.cache-from=type=gha,scope=refs/heads/main
+            keycloak.cache-to=type=gha,scope=${{ github.ref }}-e2e,mode=max
       -
         name: Start Services
         run: docker compose up --wait --no-build
@@ -229,7 +243,7 @@ jobs:
       -
         name: Get API changed files
         id: api-changed-files
-        uses: tj-actions/changed-files@v44
+        uses: tj-actions/changed-files@v45
         with:
           files: api/**/*.php
       -

diff --git a/api/composer.json b/api/composer.json
@@ -34,20 +34,20 @@
         "symfony/uid": "7.1.*",
         "symfony/validator": "7.1.*",
         "symfony/yaml": "7.1.*",
-        "web-token/jwt-bundle": "^3.3",
+        "web-token/jwt-bundle": "^4.0",
         "webonyx/graphql-php": "^15.8",
         "zenstruck/foundry": "^2.0"
     },
     "require-dev": {
         "dama/doctrine-test-bundle": "^8.0",
-        "justinrainbow/json-schema": "^5.2",
+        "justinrainbow/json-schema": "^6.0",
         "phpstan/extension-installer": "^1.3",
         "phpstan/phpdoc-parser": "^1.26",
         "phpstan/phpstan": "^1.10",
         "phpstan/phpstan-doctrine": "^1.3",
         "phpstan/phpstan-phpunit": "^1.3",
         "phpstan/phpstan-symfony": "^1.3",
-        "phpunit/phpunit": "^11.0",
+        "phpunit/phpunit": "^11.3",
         "symfony/browser-kit": "7.1.*",
         "symfony/css-selector": "7.1.*",
         "symfony/debug-bundle": "7.1.*",