chore: update structure from standard edition (#518)

Author: vincentchalamon

.gitattributes

@@ -18,3 +18,4 @@ pnpm-lock.yaml text eol=lf merge=ours
 *.png binary
 
 update-deps.sh export-ignore
+.github/CONTRIBUTING.md

.github/workflows/ci.yml

@@ -175,39 +175,9 @@ jobs:
       -
         name: Load Fixtures
         run: docker compose run --rm php bin/console doctrine:fixtures:load --no-interaction
-      -
-        name: Cache Playwright Binaries
-        uses: actions/cache@v4
-        with:
-          path: ~/.cache/ms-playwright
-          key: ${{ runner.os }}-playwright
-      -
-        name: Install PNPM
-        uses: pnpm/action-setup@v4
-        with:
-          version: latest
-      -
-        name: Cache PNPM
-        uses: actions/cache@v4
-        with:
-          path: ${{ env.PNPM_HOME }}
-          key: ${{ runner.os }}-pnpm-${{ github.run_id }}
-          restore-keys: |
-            ${{ runner.os }}-pnpm-
-      -
-        name: Install Dependencies
-        working-directory: pwa
-        run: pnpm install
-      -
-        name: Install Playwright Browsers with Deps
-        working-directory: pwa
-        run: pnpm exec playwright install --with-deps
       -
         name: Run Playwright
-        working-directory: pwa
-        timeout-minutes: 10
-        # use 1 worker to prevent conflict between scenarios (longer but safer)
-        run: pnpm exec playwright test --workers=1 --grep ${{ matrix.annotation }}
+        run: docker run --network host -w /app -v ./e2e:/app --rm --ipc=host mcr.microsoft.com/playwright:v1.50.0-noble /bin/sh -c 'npm i; npx playwright test --grep ${{ matrix.annotation }};'
       -
         name: Debug Services
         if: failure()
@@ -219,7 +189,7 @@ jobs:
         if: failure()
         with:
           name: playwright-screenshots
-          path: pwa/test-results
+          path: e2e/test-results
 
   lint:
     name: Lint

api/.env.test

@@ -2,8 +2,6 @@
 KERNEL_CLASS='App\Kernel'
 APP_SECRET='$ecretf0rt3st'
 SYMFONY_DEPRECATIONS_HELPER=999999
-PANTHER_APP_ENV=panther
-PANTHER_ERROR_SCREENSHOT_DIR=./var/error-screenshots
 OIDC_JWK='{"kty": "EC","d": "cT3_vKHaGOAhhmzR0Jbi1ko40dNtpjtaiWzm_7VNwLA","use": "sig","crv": "P-256","x": "n6PnJPqNK5nP-ymwwsOIqZvjiCKFNzRyqWA8KNyBsDo","y": "bQSmMlDXOmtgyS1rhsKUmqlxq-8Kw0Iw9t50cSloTMM","alg": "ES256"}'
 
 # API Platform distribution

api/Dockerfile

@@ -1,12 +1,10 @@
-#syntax=docker/dockerfile:1.4
+#syntax=docker/dockerfile:1
 
 # Adapted from https://github.com/dunglas/symfony-docker
 
 
 # Versions
-# hadolint ignore=DL3007
 FROM dunglas/frankenphp:1-php8.3 AS frankenphp_upstream
-FROM composer/composer:2-bin AS composer_upstream
 
 
 # The different stages of this Dockerfile are meant to be built into separate images
@@ -20,19 +18,21 @@ FROM frankenphp_upstream AS frankenphp_base
 WORKDIR /app
 
 # persistent / runtime deps
-# hadolint ignore=DL3018
-RUN apt-get update; \
-	apt-get install --no-install-recommends -y \
-		acl \
-		file \
-		gettext \
-		git \
-		zip \
-	; \
-	rm -rf /var/lib/apt/lists/*
+# hadolint ignore=DL3008
+RUN apt-get update && apt-get install --no-install-recommends -y \
+	acl \
+	file \
+	gettext \
+	git \
+	zip \
+	&& rm -rf /var/lib/apt/lists/*
+
+# https://getcomposer.org/doc/03-cli.md#composer-allow-superuser
+ENV COMPOSER_ALLOW_SUPERUSER=1
 
 RUN set -eux; \
 	install-php-extensions \
+		@composer \
 		apcu \
 		bcmath \
 		intl \
@@ -53,19 +53,14 @@ COPY --link frankenphp/Caddyfile /etc/caddy/Caddyfile
 
 ENTRYPOINT ["docker-entrypoint"]
 
-# https://getcomposer.org/doc/03-cli.md#composer-allow-superuser
-ENV COMPOSER_ALLOW_SUPERUSER=1
-ENV PATH="${PATH}:/root/.composer/vendor/bin"
-
-COPY --from=composer_upstream --link /composer /usr/bin/composer
-
 HEALTHCHECK --start-period=60s CMD curl -f http://localhost:2019/metrics || exit 1
 CMD [ "frankenphp", "run", "--config", "/etc/caddy/Caddyfile" ]
 
 # Dev FrankenPHP image
 FROM frankenphp_base AS frankenphp_dev
 
 ENV APP_ENV=dev XDEBUG_MODE=off
+VOLUME /app/var/
 
 RUN mv "$PHP_INI_DIR/php.ini-development" "$PHP_INI_DIR/php.ini"
 
@@ -104,4 +99,4 @@ RUN set -eux; \
 	composer dump-env prod; \
 	composer run-script --no-dev post-install-cmd; \
 	chmod +x bin/console; sync; \
-    cp public/assets/react.production.min.js public/bundles/apiplatform/react/react.production.min.js;
+	cp public/assets/react.production.min.js public/bundles/apiplatform/react/react.production.min.js;

api/composer.json

@@ -8,25 +8,25 @@
         "api-platform/doctrine-orm": "^4.1.7",
         "api-platform/graphql": "^4.1.7",
         "api-platform/symfony": "^4.1.7",
-        "doctrine/common": "^3.4",
-        "doctrine/doctrine-bundle": "^2.11",
-        "doctrine/doctrine-fixtures-bundle": "^4.0",
-        "doctrine/doctrine-migrations-bundle": "^3.3",
-        "doctrine/orm": "^3.1",
+        "doctrine/common": "^3.5",
+        "doctrine/doctrine-bundle": "^2.14",
+        "doctrine/doctrine-fixtures-bundle": "^4.1",
+        "doctrine/doctrine-migrations-bundle": "^3.4.1",
+        "doctrine/orm": "^3.3.2",
         "doctrine/persistence": "^3.4",
-        "myclabs/php-enum": "^1.8",
-        "nelmio/cors-bundle": "^2.4",
+        "myclabs/php-enum": "^1.8.5",
+        "nelmio/cors-bundle": "^2.5",
         "runtime/frankenphp-symfony": "^0.2.0",
-        "seld/jsonlint": "^1.10",
+        "seld/jsonlint": "^1.11",
         "symfony/asset": "7.2.*",
         "symfony/clock": "7.2.*",
         "symfony/console": "7.2.*",
         "symfony/dotenv": "7.2.*",
         "symfony/expression-language": "7.2.*",
-        "symfony/flex": "^2.4",
+        "symfony/flex": "^2.5",
         "symfony/framework-bundle": "7.2.*",
         "symfony/http-client": "7.2.*",
-        "symfony/mercure-bundle": "^0.3.8",
+        "symfony/mercure-bundle": "^0.3.9",
         "symfony/monolog-bundle": "^3.10",
         "symfony/property-access": "7.2.*",
         "symfony/property-info": "7.2.*",
@@ -37,24 +37,24 @@
         "symfony/uid": "7.2.*",
         "symfony/validator": "7.2.*",
         "symfony/yaml": "7.2.*",
-        "web-token/jwt-bundle": "^4.0",
-        "webonyx/graphql-php": "^15.8",
-        "zenstruck/foundry": "^2.0"
+        "web-token/jwt-bundle": "^4.0.4",
+        "webonyx/graphql-php": "^15.20",
+        "zenstruck/foundry": "^2.3.10"
     },
     "require-dev": {
-        "dama/doctrine-test-bundle": "^8.0",
-        "justinrainbow/json-schema": "^6.0",
-        "phpstan/extension-installer": "^1.3",
-        "phpstan/phpdoc-parser": "^2.0",
-        "phpstan/phpstan": "^2.0",
-        "phpstan/phpstan-doctrine": "^2.0",
-        "phpstan/phpstan-phpunit": "^2.0",
-        "phpstan/phpstan-symfony": "^2.0",
-        "phpunit/phpunit": "^12.0",
+        "dama/doctrine-test-bundle": "^8.3",
+        "justinrainbow/json-schema": "^6.4.1",
+        "phpstan/extension-installer": "^1.4.3",
+        "phpstan/phpdoc-parser": "^2.1",
+        "phpstan/phpstan": "^2.1.11",
+        "phpstan/phpstan-doctrine": "^2.0.2",
+        "phpstan/phpstan-phpunit": "^2.0.6",
+        "phpstan/phpstan-symfony": "^2.0.4",
+        "phpunit/phpunit": "^12.1.2",
         "symfony/browser-kit": "7.2.*",
         "symfony/css-selector": "7.2.*",
         "symfony/debug-bundle": "7.2.*",
-        "symfony/maker-bundle": "^1.52",
+        "symfony/maker-bundle": "^1.62.1",
         "symfony/stopwatch": "7.2.*",
         "symfony/var-dumper": "7.2.*",
         "symfony/web-profiler-bundle": "7.2.*"