diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2fa36c21..da7e3585 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -107,8 +107,6 @@ jobs: POSTGRES_PASSWORD: aae5bf316ef5fe87ad806c6a9240fff68bcfdaf7 KEYCLOAK_POSTGRES_PASSWORD: 26d7f630f1524eb210bbf496443f2038a9316e9e KEYCLOAK_ADMIN_PASSWORD: 2f31e2fad93941b818449fd8d57fd019b6ce7fa5 - KEYCLOAK_HTTPS_CERTIFICATE_FILE: ./helm/api-platform/keycloak/certs/tls.crt - KEYCLOAK_HTTPS_CERTIFICATE_KEY_FILE: ./helm/api-platform/keycloak/certs/tls.pem # https://docs.docker.com/compose/environment-variables/envvars/#compose_file COMPOSE_FILE: compose.yaml:compose.prod.yaml:compose.e2e.yaml steps: diff --git a/api/composer.json b/api/composer.json index aa633a0f..247b8f02 100644 --- a/api/composer.json +++ b/api/composer.json @@ -33,8 +33,7 @@ "symfony/uid": "7.0.*", "symfony/validator": "7.0.*", "symfony/yaml": "7.0.*", - "web-token/jwt-checker": "^3.2", - "web-token/jwt-signature-algorithm-ecdsa": "^3.2", + "web-token/jwt-library": "^3.3", "webonyx/graphql-php": "^15.8", "zenstruck/foundry": "^1.36" }, @@ -47,7 +46,7 @@ "phpstan/phpstan-doctrine": "^1.3", "phpstan/phpstan-phpunit": "^1.3", "phpstan/phpstan-symfony": "^1.3", - "phpunit/phpunit": "^10.5", + "phpunit/phpunit": "^11.0", "symfony/browser-kit": "7.0.*", "symfony/css-selector": "7.0.*", "symfony/debug-bundle": "7.0.*", diff --git a/api/composer.lock b/api/composer.lock index c0e9500c..d99a42cc 100644 --- a/api/composer.lock +++ b/api/composer.lock @@ -4,20 +4,20 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "7a9f45095d3c9c2465f5fdbd4ed26c0a", + "content-hash": "b86c6b806b61dc9938b2bbf049db4c92", "packages": [ { "name": "api-platform/core", - "version": "v3.2.16", + "version": "v3.2.17", "source": { "type": "git", "url": "https://github.com/api-platform/core.git", - "reference": "055fb38027e3125a2d5df58f77134d81f42075ca" + "reference": "1cc114b93e95bdce5b48be46f84c1e11446a8d2f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/api-platform/core/zipball/055fb38027e3125a2d5df58f77134d81f42075ca", - "reference": "055fb38027e3125a2d5df58f77134d81f42075ca", + "url": "https://api.github.com/repos/api-platform/core/zipball/1cc114b93e95bdce5b48be46f84c1e11446a8d2f", + "reference": "1cc114b93e95bdce5b48be46f84c1e11446a8d2f", "shasum": "" }, "require": { @@ -168,9 +168,9 @@ ], "support": { "issues": "https://github.com/api-platform/core/issues", - "source": "https://github.com/api-platform/core/tree/v3.2.16" + "source": "https://github.com/api-platform/core/tree/v3.2.17" }, - "time": "2024-03-05T10:51:18+00:00" + "time": "2024-03-15T15:26:20+00:00" }, { "name": "brick/math", diff --git a/api/config/packages/api_platform.yaml b/api/config/packages/api_platform.yaml index 96dc7c89..1b846497 100644 --- a/api/config/packages/api_platform.yaml +++ b/api/config/packages/api_platform.yaml @@ -1,6 +1,6 @@ api_platform: title: API Platform's demo - version: 3.2.16 + version: 3.2.17 description: | This is a demo application of the [API Platform](https://api-platform.com) framework. [Its source code](https://github.com/api-platform/demo) includes various examples, check it out! diff --git a/compose.e2e.yaml b/compose.e2e.yaml index 9cb638db..c8b0f2c2 100644 --- a/compose.e2e.yaml +++ b/compose.e2e.yaml @@ -8,8 +8,8 @@ services: KEYCLOAK_HTTPS_CERTIFICATE_FILE: /opt/bitnami/keycloak/certs/tls.crt KEYCLOAK_HTTPS_CERTIFICATE_KEY_FILE: /opt/bitnami/keycloak/certs/tls.key volumes: - - ${KEYCLOAK_HTTPS_CERTIFICATE_FILE}:/opt/bitnami/keycloak/certs/tls.crt:ro - - ${KEYCLOAK_HTTPS_CERTIFICATE_KEY_FILE}:/opt/bitnami/keycloak/certs/tls.key:ro + - ./helm/api-platform/keycloak/certs/tls.crt:/opt/bitnami/keycloak/certs/tls.crt:ro + - ./helm/api-platform/keycloak/certs/tls.pem:/opt/bitnami/keycloak/certs/tls.key:ro keycloak-config-cli: extends: diff --git a/compose.override.yaml b/compose.override.yaml index adb9a4c2..26c5cc99 100644 --- a/compose.override.yaml +++ b/compose.override.yaml @@ -64,7 +64,5 @@ services: KEYCLOAK_AVAILABILITYCHECK_ENABLED: "true" KEYCLOAK_AVAILABILITYCHECK_TIMEOUT: 120s IMPORT_FILES_LOCATIONS: "/config/*" - depends_on: - - keycloak volumes: - ./helm/api-platform/keycloak/config:/config diff --git a/helm/api-platform/Chart.yaml b/helm/api-platform/Chart.yaml index 6a3b0029..5b37d8dc 100644 --- a/helm/api-platform/Chart.yaml +++ b/helm/api-platform/Chart.yaml @@ -17,12 +17,12 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 3.2.16 +version: 3.2.17 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to # follow Semantic Versioning. They should reflect the version the application is using. -appVersion: 3.2.16 +appVersion: 3.2.17 dependencies: - name: postgresql diff --git a/pwa/tests/admin/pages/BookPage.ts b/pwa/tests/admin/pages/BookPage.ts index 3c740be2..257c3aac 100644 --- a/pwa/tests/admin/pages/BookPage.ts +++ b/pwa/tests/admin/pages/BookPage.ts @@ -35,7 +35,7 @@ export class BookPage extends AbstractPage { await this.page.getByLabel("Add filter").click(); await this.page.getByRole("menu").getByText("Title").waitFor({ state: "visible" }); await this.page.getByRole("menu").getByText("Title").click(); - await this.page.getByLabel("Title").fill(filters.title); + await this.page.getByRole("textbox", { name: "Title" }).fill(filters.title); await this.page.waitForResponse(/\/books/); }