diff --git a/.github/build-packages.php b/.github/build-packages.php index 95d40759d20..b079f99b7c3 100644 --- a/.github/build-packages.php +++ b/.github/build-packages.php @@ -9,7 +9,7 @@ use Symfony\Component\Finder\Finder; $finder = (new Finder()) - ->in([__DIR__.'/../src/*/', __DIR__.'/../src/*/src/Bridge/*/', __DIR__.'/../ux.symfony.com/', __DIR__.'/../test_apps/*/']) + ->in([__DIR__.'/../src/*/', __DIR__.'/../src/*/src/Bridge/*/', __DIR__.'/../ux.symfony.com/', __DIR__.'/../apps/*/']) ->depth(0) ->name('composer.json') ; diff --git a/.github/workflows/app-tests.yaml b/.github/workflows/app-tests.yaml index 62cfa558083..a0a2c0808ee 100644 --- a/.github/workflows/app-tests.yaml +++ b/.github/workflows/app-tests.yaml @@ -51,15 +51,15 @@ jobs: - name: Install PHP dependencies uses: ramsey/composer-install@v3 with: - working-directory: test_apps/encore-app + working-directory: apps/encore dependency-versions: highest - - working-directory: test_apps/encore-app + - working-directory: apps/encore run: npm install --install-links - if: matrix.ux-packages-source == 'js-packages' name: Install UX JS packages with a JS package manager - working-directory: test_apps/encore-app + working-directory: apps/encore run: | PACKAGES_TO_INSTALL='' for PACKAGE_DATA in $(pnpm ls -r --json --depth -1 | jq 'map(select(.private != true))' | jq -c '.[]'); do @@ -71,7 +71,7 @@ jobs: npm add --save-dev --install-links $PACKAGES_TO_INSTALL - name: Ensure UX packages are installed from "${{ env.EXPECTED_PATTERN }}" - working-directory: test_apps/encore-app + working-directory: apps/encore run: | for PACKAGE_DATA in $(cat package.json | jq -c '(.dependencies // {}) + (.devDependencies // {}) | to_entries[] | select(.key | startswith("@symfony/ux-")) | {name: .key, version: .value}'); do PACKAGE=$(echo $PACKAGE_DATA | jq -r '.name') @@ -90,9 +90,9 @@ jobs: EXPECTED_PATTERN: ${{ matrix.ux-packages-source == 'php-vendor' && 'file:vendor/symfony/*' || 'file:../../src/*' }} - name: Ensure project can be built in dev mode - working-directory: test_apps/encore-app + working-directory: apps/encore run: npm run dev - name: Ensure project can be built in prod mode - working-directory: test_apps/encore-app + working-directory: apps/encore run: npm run build diff --git a/.github/workflows/browser-tests.yml b/.github/workflows/browser-tests.yml index cdc5f0b45fc..76971211296 100644 --- a/.github/workflows/browser-tests.yml +++ b/.github/workflows/browser-tests.yml @@ -69,19 +69,19 @@ jobs: - name: Start Docker containers run: docker compose up -d --build - working-directory: test_apps/e2e-app + working-directory: apps/e2e - name: Configure E2E app run: | echo 'APP_ENV=prod' >> .env.local echo 'APP_DEBUG=0' >> .env.local echo 'APP_SECRET=df4c071596e64cc75a349456f2887ae2419ae650' >> .env.local - working-directory: test_apps/e2e-app + working-directory: apps/e2e - name: Install E2E PHP dependencies uses: ramsey/composer-install@v3 with: - working-directory: test_apps/e2e-app + working-directory: apps/e2e dependency-versions: highest composer-options: --no-dev custom-cache-suffix: symfony-${{ matrix.symfony }} @@ -92,11 +92,11 @@ jobs: symfony composer dump-env symfony console asset-map:compile symfony console ux:icons:warm-cache - working-directory: test_apps/e2e-app + working-directory: apps/e2e - name: Start E2E app run: symfony serve --daemon - working-directory: test_apps/e2e-app + working-directory: apps/e2e - name: Run browser tests run: pnpm run test:browser @@ -115,5 +115,5 @@ jobs: if: ${{ always() && steps.browser-tests.conclusion == 'failure' }} with: name: Symfony logs (${{ matrix.symfony }}) - path: test_apps/e2e-app/var/log/ + path: apps/e2e/var/log/ retention-days: 7 diff --git a/test_apps/e2e-app/.editorconfig b/apps/e2e/.editorconfig similarity index 100% rename from test_apps/e2e-app/.editorconfig rename to apps/e2e/.editorconfig diff --git a/test_apps/e2e-app/.env b/apps/e2e/.env similarity index 100% rename from test_apps/e2e-app/.env rename to apps/e2e/.env diff --git a/test_apps/e2e-app/.env.dev b/apps/e2e/.env.dev similarity index 100% rename from test_apps/e2e-app/.env.dev rename to apps/e2e/.env.dev diff --git a/test_apps/e2e-app/.gitignore b/apps/e2e/.gitignore similarity index 100% rename from test_apps/e2e-app/.gitignore rename to apps/e2e/.gitignore diff --git a/test_apps/e2e-app/.symfony.local.yaml b/apps/e2e/.symfony.local.yaml similarity index 100% rename from test_apps/e2e-app/.symfony.local.yaml rename to apps/e2e/.symfony.local.yaml diff --git a/test_apps/e2e-app/README.md b/apps/e2e/README.md similarity index 100% rename from test_apps/e2e-app/README.md rename to apps/e2e/README.md diff --git a/test_apps/e2e-app/assets/app.js b/apps/e2e/assets/app.js similarity index 100% rename from test_apps/e2e-app/assets/app.js rename to apps/e2e/assets/app.js diff --git a/test_apps/e2e-app/assets/bootstrap.js b/apps/e2e/assets/bootstrap.js similarity index 100% rename from test_apps/e2e-app/assets/bootstrap.js rename to apps/e2e/assets/bootstrap.js diff --git a/test_apps/e2e-app/assets/controllers.json b/apps/e2e/assets/controllers.json similarity index 100% rename from test_apps/e2e-app/assets/controllers.json rename to apps/e2e/assets/controllers.json diff --git a/test_apps/e2e-app/assets/controllers/csrf_protection_controller.js b/apps/e2e/assets/controllers/csrf_protection_controller.js similarity index 100% rename from test_apps/e2e-app/assets/controllers/csrf_protection_controller.js rename to apps/e2e/assets/controllers/csrf_protection_controller.js diff --git a/test_apps/e2e-app/assets/controllers/hello_controller.js b/apps/e2e/assets/controllers/hello_controller.js similarity index 100% rename from test_apps/e2e-app/assets/controllers/hello_controller.js rename to apps/e2e/assets/controllers/hello_controller.js diff --git a/test_apps/e2e-app/assets/icons/mdi/eiffel-tower.svg b/apps/e2e/assets/icons/mdi/eiffel-tower.svg similarity index 100% rename from test_apps/e2e-app/assets/icons/mdi/eiffel-tower.svg rename to apps/e2e/assets/icons/mdi/eiffel-tower.svg diff --git a/test_apps/e2e-app/assets/icons/mdi/glass-wine.svg b/apps/e2e/assets/icons/mdi/glass-wine.svg similarity index 100% rename from test_apps/e2e-app/assets/icons/mdi/glass-wine.svg rename to apps/e2e/assets/icons/mdi/glass-wine.svg diff --git a/test_apps/e2e-app/assets/icons/symfony.svg b/apps/e2e/assets/icons/symfony.svg similarity index 100% rename from test_apps/e2e-app/assets/icons/symfony.svg rename to apps/e2e/assets/icons/symfony.svg diff --git a/test_apps/e2e-app/assets/react/controllers/Hello.jsx.ignore b/apps/e2e/assets/react/controllers/Hello.jsx.ignore similarity index 100% rename from test_apps/e2e-app/assets/react/controllers/Hello.jsx.ignore rename to apps/e2e/assets/react/controllers/Hello.jsx.ignore diff --git a/test_apps/e2e-app/assets/styles/app.css b/apps/e2e/assets/styles/app.css similarity index 100% rename from test_apps/e2e-app/assets/styles/app.css rename to apps/e2e/assets/styles/app.css diff --git a/test_apps/e2e-app/assets/svelte/controllers/Hello.svelte.ignore b/apps/e2e/assets/svelte/controllers/Hello.svelte.ignore similarity index 100% rename from test_apps/e2e-app/assets/svelte/controllers/Hello.svelte.ignore rename to apps/e2e/assets/svelte/controllers/Hello.svelte.ignore diff --git a/test_apps/e2e-app/assets/translator.js b/apps/e2e/assets/translator.js similarity index 100% rename from test_apps/e2e-app/assets/translator.js rename to apps/e2e/assets/translator.js diff --git a/test_apps/e2e-app/assets/vue/controllers/Hello.vue.ignore b/apps/e2e/assets/vue/controllers/Hello.vue.ignore similarity index 100% rename from test_apps/e2e-app/assets/vue/controllers/Hello.vue.ignore rename to apps/e2e/assets/vue/controllers/Hello.vue.ignore diff --git a/test_apps/e2e-app/bin/console b/apps/e2e/bin/console similarity index 100% rename from test_apps/e2e-app/bin/console rename to apps/e2e/bin/console diff --git a/test_apps/e2e-app/compose.override.yaml b/apps/e2e/compose.override.yaml similarity index 100% rename from test_apps/e2e-app/compose.override.yaml rename to apps/e2e/compose.override.yaml diff --git a/test_apps/e2e-app/compose.yaml b/apps/e2e/compose.yaml similarity index 100% rename from test_apps/e2e-app/compose.yaml rename to apps/e2e/compose.yaml diff --git a/test_apps/e2e-app/composer.json b/apps/e2e/composer.json similarity index 100% rename from test_apps/e2e-app/composer.json rename to apps/e2e/composer.json diff --git a/test_apps/e2e-app/composer.lock b/apps/e2e/composer.lock similarity index 100% rename from test_apps/e2e-app/composer.lock rename to apps/e2e/composer.lock diff --git a/test_apps/e2e-app/config/bundles.php b/apps/e2e/config/bundles.php similarity index 100% rename from test_apps/e2e-app/config/bundles.php rename to apps/e2e/config/bundles.php diff --git a/test_apps/e2e-app/config/packages/asset_mapper.yaml b/apps/e2e/config/packages/asset_mapper.yaml similarity index 100% rename from test_apps/e2e-app/config/packages/asset_mapper.yaml rename to apps/e2e/config/packages/asset_mapper.yaml diff --git a/test_apps/e2e-app/config/packages/cache.yaml b/apps/e2e/config/packages/cache.yaml similarity index 100% rename from test_apps/e2e-app/config/packages/cache.yaml rename to apps/e2e/config/packages/cache.yaml diff --git a/test_apps/e2e-app/config/packages/csrf.php b/apps/e2e/config/packages/csrf.php similarity index 100% rename from test_apps/e2e-app/config/packages/csrf.php rename to apps/e2e/config/packages/csrf.php diff --git a/test_apps/e2e-app/config/packages/debug.yaml b/apps/e2e/config/packages/debug.yaml similarity index 100% rename from test_apps/e2e-app/config/packages/debug.yaml rename to apps/e2e/config/packages/debug.yaml diff --git a/test_apps/e2e-app/config/packages/doctrine.yaml b/apps/e2e/config/packages/doctrine.yaml similarity index 100% rename from test_apps/e2e-app/config/packages/doctrine.yaml rename to apps/e2e/config/packages/doctrine.yaml diff --git a/test_apps/e2e-app/config/packages/doctrine_migrations.yaml b/apps/e2e/config/packages/doctrine_migrations.yaml similarity index 100% rename from test_apps/e2e-app/config/packages/doctrine_migrations.yaml rename to apps/e2e/config/packages/doctrine_migrations.yaml diff --git a/test_apps/e2e-app/config/packages/framework.yaml b/apps/e2e/config/packages/framework.yaml similarity index 100% rename from test_apps/e2e-app/config/packages/framework.yaml rename to apps/e2e/config/packages/framework.yaml diff --git a/test_apps/e2e-app/config/packages/lazy_image.yaml b/apps/e2e/config/packages/lazy_image.yaml similarity index 100% rename from test_apps/e2e-app/config/packages/lazy_image.yaml rename to apps/e2e/config/packages/lazy_image.yaml diff --git a/test_apps/e2e-app/config/packages/mercure.yaml b/apps/e2e/config/packages/mercure.yaml similarity index 100% rename from test_apps/e2e-app/config/packages/mercure.yaml rename to apps/e2e/config/packages/mercure.yaml diff --git a/test_apps/e2e-app/config/packages/monolog.yaml b/apps/e2e/config/packages/monolog.yaml similarity index 100% rename from test_apps/e2e-app/config/packages/monolog.yaml rename to apps/e2e/config/packages/monolog.yaml diff --git a/test_apps/e2e-app/config/packages/notifier.yaml b/apps/e2e/config/packages/notifier.yaml similarity index 100% rename from test_apps/e2e-app/config/packages/notifier.yaml rename to apps/e2e/config/packages/notifier.yaml diff --git a/test_apps/e2e-app/config/packages/property_info.php b/apps/e2e/config/packages/property_info.php similarity index 100% rename from test_apps/e2e-app/config/packages/property_info.php rename to apps/e2e/config/packages/property_info.php diff --git a/test_apps/e2e-app/config/packages/routing.yaml b/apps/e2e/config/packages/routing.yaml similarity index 100% rename from test_apps/e2e-app/config/packages/routing.yaml rename to apps/e2e/config/packages/routing.yaml diff --git a/test_apps/e2e-app/config/packages/translation.yaml b/apps/e2e/config/packages/translation.yaml similarity index 100% rename from test_apps/e2e-app/config/packages/translation.yaml rename to apps/e2e/config/packages/translation.yaml diff --git a/test_apps/e2e-app/config/packages/twig.yaml b/apps/e2e/config/packages/twig.yaml similarity index 100% rename from test_apps/e2e-app/config/packages/twig.yaml rename to apps/e2e/config/packages/twig.yaml diff --git a/test_apps/e2e-app/config/packages/twig_component.yaml b/apps/e2e/config/packages/twig_component.yaml similarity index 100% rename from test_apps/e2e-app/config/packages/twig_component.yaml rename to apps/e2e/config/packages/twig_component.yaml diff --git a/test_apps/e2e-app/config/packages/ux_icons.yaml b/apps/e2e/config/packages/ux_icons.yaml similarity index 100% rename from test_apps/e2e-app/config/packages/ux_icons.yaml rename to apps/e2e/config/packages/ux_icons.yaml diff --git a/test_apps/e2e-app/config/packages/ux_map.yaml b/apps/e2e/config/packages/ux_map.yaml similarity index 100% rename from test_apps/e2e-app/config/packages/ux_map.yaml rename to apps/e2e/config/packages/ux_map.yaml diff --git a/test_apps/e2e-app/config/packages/ux_translator.yaml b/apps/e2e/config/packages/ux_translator.yaml similarity index 100% rename from test_apps/e2e-app/config/packages/ux_translator.yaml rename to apps/e2e/config/packages/ux_translator.yaml diff --git a/test_apps/e2e-app/config/packages/ux_turbo.php b/apps/e2e/config/packages/ux_turbo.php similarity index 100% rename from test_apps/e2e-app/config/packages/ux_turbo.php rename to apps/e2e/config/packages/ux_turbo.php diff --git a/test_apps/e2e-app/config/packages/validator.yaml b/apps/e2e/config/packages/validator.yaml similarity index 100% rename from test_apps/e2e-app/config/packages/validator.yaml rename to apps/e2e/config/packages/validator.yaml diff --git a/test_apps/e2e-app/config/packages/web_profiler.yaml b/apps/e2e/config/packages/web_profiler.yaml similarity index 100% rename from test_apps/e2e-app/config/packages/web_profiler.yaml rename to apps/e2e/config/packages/web_profiler.yaml diff --git a/test_apps/e2e-app/config/preload.php b/apps/e2e/config/preload.php similarity index 100% rename from test_apps/e2e-app/config/preload.php rename to apps/e2e/config/preload.php diff --git a/test_apps/e2e-app/config/routes.yaml b/apps/e2e/config/routes.yaml similarity index 100% rename from test_apps/e2e-app/config/routes.yaml rename to apps/e2e/config/routes.yaml diff --git a/test_apps/e2e-app/config/routes/framework.yaml b/apps/e2e/config/routes/framework.yaml similarity index 100% rename from test_apps/e2e-app/config/routes/framework.yaml rename to apps/e2e/config/routes/framework.yaml diff --git a/test_apps/e2e-app/config/routes/ux_autocomplete.yaml b/apps/e2e/config/routes/ux_autocomplete.yaml similarity index 100% rename from test_apps/e2e-app/config/routes/ux_autocomplete.yaml rename to apps/e2e/config/routes/ux_autocomplete.yaml diff --git a/test_apps/e2e-app/config/routes/ux_live_component.yaml b/apps/e2e/config/routes/ux_live_component.yaml similarity index 100% rename from test_apps/e2e-app/config/routes/ux_live_component.yaml rename to apps/e2e/config/routes/ux_live_component.yaml diff --git a/test_apps/e2e-app/config/routes/web_profiler.yaml b/apps/e2e/config/routes/web_profiler.yaml similarity index 100% rename from test_apps/e2e-app/config/routes/web_profiler.yaml rename to apps/e2e/config/routes/web_profiler.yaml diff --git a/test_apps/e2e-app/config/services.yaml b/apps/e2e/config/services.yaml similarity index 100% rename from test_apps/e2e-app/config/services.yaml rename to apps/e2e/config/services.yaml diff --git a/test_apps/e2e-app/importmap.php b/apps/e2e/importmap.php similarity index 100% rename from test_apps/e2e-app/importmap.php rename to apps/e2e/importmap.php diff --git a/test_apps/e2e-app/migrations/.gitignore b/apps/e2e/migrations/.gitignore similarity index 100% rename from test_apps/e2e-app/migrations/.gitignore rename to apps/e2e/migrations/.gitignore diff --git a/test_apps/e2e-app/public/index.php b/apps/e2e/public/index.php similarity index 100% rename from test_apps/e2e-app/public/index.php rename to apps/e2e/public/index.php diff --git a/test_apps/e2e-app/src/Controller/.gitignore b/apps/e2e/src/Controller/.gitignore similarity index 100% rename from test_apps/e2e-app/src/Controller/.gitignore rename to apps/e2e/src/Controller/.gitignore diff --git a/test_apps/e2e-app/src/Controller/AutocompleteController.php b/apps/e2e/src/Controller/AutocompleteController.php similarity index 100% rename from test_apps/e2e-app/src/Controller/AutocompleteController.php rename to apps/e2e/src/Controller/AutocompleteController.php diff --git a/test_apps/e2e-app/src/Controller/ChartjsController.php b/apps/e2e/src/Controller/ChartjsController.php similarity index 100% rename from test_apps/e2e-app/src/Controller/ChartjsController.php rename to apps/e2e/src/Controller/ChartjsController.php diff --git a/test_apps/e2e-app/src/Controller/CropperjsController.php b/apps/e2e/src/Controller/CropperjsController.php similarity index 100% rename from test_apps/e2e-app/src/Controller/CropperjsController.php rename to apps/e2e/src/Controller/CropperjsController.php diff --git a/test_apps/e2e-app/src/Controller/DropzoneController.php b/apps/e2e/src/Controller/DropzoneController.php similarity index 100% rename from test_apps/e2e-app/src/Controller/DropzoneController.php rename to apps/e2e/src/Controller/DropzoneController.php diff --git a/test_apps/e2e-app/src/Controller/HomeController.php b/apps/e2e/src/Controller/HomeController.php similarity index 100% rename from test_apps/e2e-app/src/Controller/HomeController.php rename to apps/e2e/src/Controller/HomeController.php diff --git a/test_apps/e2e-app/src/Controller/IconsController.php b/apps/e2e/src/Controller/IconsController.php similarity index 100% rename from test_apps/e2e-app/src/Controller/IconsController.php rename to apps/e2e/src/Controller/IconsController.php diff --git a/test_apps/e2e-app/src/Controller/LiveComponentController.php b/apps/e2e/src/Controller/LiveComponentController.php similarity index 100% rename from test_apps/e2e-app/src/Controller/LiveComponentController.php rename to apps/e2e/src/Controller/LiveComponentController.php diff --git a/test_apps/e2e-app/src/Controller/MapController.php b/apps/e2e/src/Controller/MapController.php similarity index 100% rename from test_apps/e2e-app/src/Controller/MapController.php rename to apps/e2e/src/Controller/MapController.php diff --git a/test_apps/e2e-app/src/Controller/NotifyController.php b/apps/e2e/src/Controller/NotifyController.php similarity index 100% rename from test_apps/e2e-app/src/Controller/NotifyController.php rename to apps/e2e/src/Controller/NotifyController.php diff --git a/test_apps/e2e-app/src/Controller/ReactController.php b/apps/e2e/src/Controller/ReactController.php similarity index 100% rename from test_apps/e2e-app/src/Controller/ReactController.php rename to apps/e2e/src/Controller/ReactController.php diff --git a/test_apps/e2e-app/src/Controller/SvelteController.php b/apps/e2e/src/Controller/SvelteController.php similarity index 100% rename from test_apps/e2e-app/src/Controller/SvelteController.php rename to apps/e2e/src/Controller/SvelteController.php diff --git a/test_apps/e2e-app/src/Controller/TranslatorController.php b/apps/e2e/src/Controller/TranslatorController.php similarity index 100% rename from test_apps/e2e-app/src/Controller/TranslatorController.php rename to apps/e2e/src/Controller/TranslatorController.php diff --git a/test_apps/e2e-app/src/Controller/TurboController.php b/apps/e2e/src/Controller/TurboController.php similarity index 100% rename from test_apps/e2e-app/src/Controller/TurboController.php rename to apps/e2e/src/Controller/TurboController.php diff --git a/test_apps/e2e-app/src/Controller/TwigComponentController.php b/apps/e2e/src/Controller/TwigComponentController.php similarity index 100% rename from test_apps/e2e-app/src/Controller/TwigComponentController.php rename to apps/e2e/src/Controller/TwigComponentController.php diff --git a/test_apps/e2e-app/src/Controller/TypedController.php b/apps/e2e/src/Controller/TypedController.php similarity index 100% rename from test_apps/e2e-app/src/Controller/TypedController.php rename to apps/e2e/src/Controller/TypedController.php diff --git a/test_apps/e2e-app/src/Controller/VueController.php b/apps/e2e/src/Controller/VueController.php similarity index 100% rename from test_apps/e2e-app/src/Controller/VueController.php rename to apps/e2e/src/Controller/VueController.php diff --git a/test_apps/e2e-app/src/Entity/.gitignore b/apps/e2e/src/Entity/.gitignore similarity index 100% rename from test_apps/e2e-app/src/Entity/.gitignore rename to apps/e2e/src/Entity/.gitignore diff --git a/test_apps/e2e-app/src/Kernel.php b/apps/e2e/src/Kernel.php similarity index 100% rename from test_apps/e2e-app/src/Kernel.php rename to apps/e2e/src/Kernel.php diff --git a/test_apps/e2e-app/src/MapRenderer.php b/apps/e2e/src/MapRenderer.php similarity index 100% rename from test_apps/e2e-app/src/MapRenderer.php rename to apps/e2e/src/MapRenderer.php diff --git a/test_apps/e2e-app/src/Repository/.gitignore b/apps/e2e/src/Repository/.gitignore similarity index 100% rename from test_apps/e2e-app/src/Repository/.gitignore rename to apps/e2e/src/Repository/.gitignore diff --git a/test_apps/e2e-app/symfony.lock b/apps/e2e/symfony.lock similarity index 100% rename from test_apps/e2e-app/symfony.lock rename to apps/e2e/symfony.lock diff --git a/test_apps/e2e-app/templates/base.html.twig b/apps/e2e/templates/base.html.twig similarity index 100% rename from test_apps/e2e-app/templates/base.html.twig rename to apps/e2e/templates/base.html.twig diff --git a/test_apps/e2e-app/templates/home.html.twig b/apps/e2e/templates/home.html.twig similarity index 100% rename from test_apps/e2e-app/templates/home.html.twig rename to apps/e2e/templates/home.html.twig diff --git a/test_apps/e2e-app/templates/ux_autocomplete/index.html.twig b/apps/e2e/templates/ux_autocomplete/index.html.twig similarity index 100% rename from test_apps/e2e-app/templates/ux_autocomplete/index.html.twig rename to apps/e2e/templates/ux_autocomplete/index.html.twig diff --git a/test_apps/e2e-app/templates/ux_chartjs/index.html.twig b/apps/e2e/templates/ux_chartjs/index.html.twig similarity index 100% rename from test_apps/e2e-app/templates/ux_chartjs/index.html.twig rename to apps/e2e/templates/ux_chartjs/index.html.twig diff --git a/test_apps/e2e-app/templates/ux_cropperjs/index.html.twig b/apps/e2e/templates/ux_cropperjs/index.html.twig similarity index 100% rename from test_apps/e2e-app/templates/ux_cropperjs/index.html.twig rename to apps/e2e/templates/ux_cropperjs/index.html.twig diff --git a/test_apps/e2e-app/templates/ux_dropzone/index.html.twig b/apps/e2e/templates/ux_dropzone/index.html.twig similarity index 100% rename from test_apps/e2e-app/templates/ux_dropzone/index.html.twig rename to apps/e2e/templates/ux_dropzone/index.html.twig diff --git a/test_apps/e2e-app/templates/ux_icons/index.html.twig b/apps/e2e/templates/ux_icons/index.html.twig similarity index 100% rename from test_apps/e2e-app/templates/ux_icons/index.html.twig rename to apps/e2e/templates/ux_icons/index.html.twig diff --git a/test_apps/e2e-app/templates/ux_live_component/index.html.twig b/apps/e2e/templates/ux_live_component/index.html.twig similarity index 100% rename from test_apps/e2e-app/templates/ux_live_component/index.html.twig rename to apps/e2e/templates/ux_live_component/index.html.twig diff --git a/test_apps/e2e-app/templates/ux_map/render_map.html.twig b/apps/e2e/templates/ux_map/render_map.html.twig similarity index 100% rename from test_apps/e2e-app/templates/ux_map/render_map.html.twig rename to apps/e2e/templates/ux_map/render_map.html.twig diff --git a/test_apps/e2e-app/templates/ux_notify/index.html.twig b/apps/e2e/templates/ux_notify/index.html.twig similarity index 100% rename from test_apps/e2e-app/templates/ux_notify/index.html.twig rename to apps/e2e/templates/ux_notify/index.html.twig diff --git a/test_apps/e2e-app/templates/ux_react/index.html.twig b/apps/e2e/templates/ux_react/index.html.twig similarity index 100% rename from test_apps/e2e-app/templates/ux_react/index.html.twig rename to apps/e2e/templates/ux_react/index.html.twig diff --git a/test_apps/e2e-app/templates/ux_svelte/index.html.twig b/apps/e2e/templates/ux_svelte/index.html.twig similarity index 100% rename from test_apps/e2e-app/templates/ux_svelte/index.html.twig rename to apps/e2e/templates/ux_svelte/index.html.twig diff --git a/test_apps/e2e-app/templates/ux_translator/index.html.twig b/apps/e2e/templates/ux_translator/index.html.twig similarity index 100% rename from test_apps/e2e-app/templates/ux_translator/index.html.twig rename to apps/e2e/templates/ux_translator/index.html.twig diff --git a/test_apps/e2e-app/templates/ux_turbo/index.html.twig b/apps/e2e/templates/ux_turbo/index.html.twig similarity index 100% rename from test_apps/e2e-app/templates/ux_turbo/index.html.twig rename to apps/e2e/templates/ux_turbo/index.html.twig diff --git a/test_apps/e2e-app/templates/ux_twig_component/index.html.twig b/apps/e2e/templates/ux_twig_component/index.html.twig similarity index 100% rename from test_apps/e2e-app/templates/ux_twig_component/index.html.twig rename to apps/e2e/templates/ux_twig_component/index.html.twig diff --git a/test_apps/e2e-app/templates/ux_typed/index.html.twig b/apps/e2e/templates/ux_typed/index.html.twig similarity index 100% rename from test_apps/e2e-app/templates/ux_typed/index.html.twig rename to apps/e2e/templates/ux_typed/index.html.twig diff --git a/test_apps/e2e-app/templates/ux_vue/index.html.twig b/apps/e2e/templates/ux_vue/index.html.twig similarity index 100% rename from test_apps/e2e-app/templates/ux_vue/index.html.twig rename to apps/e2e/templates/ux_vue/index.html.twig diff --git a/test_apps/e2e-app/translations/.gitignore b/apps/e2e/translations/.gitignore similarity index 100% rename from test_apps/e2e-app/translations/.gitignore rename to apps/e2e/translations/.gitignore diff --git a/test_apps/encore-app/.env b/apps/encore/.env similarity index 100% rename from test_apps/encore-app/.env rename to apps/encore/.env diff --git a/test_apps/encore-app/.env.dev b/apps/encore/.env.dev similarity index 100% rename from test_apps/encore-app/.env.dev rename to apps/encore/.env.dev diff --git a/test_apps/encore-app/.gitignore b/apps/encore/.gitignore similarity index 100% rename from test_apps/encore-app/.gitignore rename to apps/encore/.gitignore diff --git a/test_apps/encore-app/assets/app.js b/apps/encore/assets/app.js similarity index 100% rename from test_apps/encore-app/assets/app.js rename to apps/encore/assets/app.js diff --git a/test_apps/encore-app/assets/bootstrap.js b/apps/encore/assets/bootstrap.js similarity index 100% rename from test_apps/encore-app/assets/bootstrap.js rename to apps/encore/assets/bootstrap.js diff --git a/test_apps/encore-app/assets/controllers.json b/apps/encore/assets/controllers.json similarity index 100% rename from test_apps/encore-app/assets/controllers.json rename to apps/encore/assets/controllers.json diff --git a/test_apps/encore-app/assets/controllers/csrf_protection_controller.js b/apps/encore/assets/controllers/csrf_protection_controller.js similarity index 100% rename from test_apps/encore-app/assets/controllers/csrf_protection_controller.js rename to apps/encore/assets/controllers/csrf_protection_controller.js diff --git a/test_apps/encore-app/assets/controllers/hello_controller.js b/apps/encore/assets/controllers/hello_controller.js similarity index 100% rename from test_apps/encore-app/assets/controllers/hello_controller.js rename to apps/encore/assets/controllers/hello_controller.js diff --git a/test_apps/encore-app/assets/icons/symfony.svg b/apps/encore/assets/icons/symfony.svg similarity index 100% rename from test_apps/encore-app/assets/icons/symfony.svg rename to apps/encore/assets/icons/symfony.svg diff --git a/test_apps/encore-app/assets/react/controllers/Hello.jsx b/apps/encore/assets/react/controllers/Hello.jsx similarity index 100% rename from test_apps/encore-app/assets/react/controllers/Hello.jsx rename to apps/encore/assets/react/controllers/Hello.jsx diff --git a/test_apps/encore-app/assets/styles/app.css b/apps/encore/assets/styles/app.css similarity index 100% rename from test_apps/encore-app/assets/styles/app.css rename to apps/encore/assets/styles/app.css diff --git a/test_apps/encore-app/assets/svelte/controllers/Hello.svelte b/apps/encore/assets/svelte/controllers/Hello.svelte similarity index 100% rename from test_apps/encore-app/assets/svelte/controllers/Hello.svelte rename to apps/encore/assets/svelte/controllers/Hello.svelte diff --git a/test_apps/encore-app/assets/translator.js b/apps/encore/assets/translator.js similarity index 100% rename from test_apps/encore-app/assets/translator.js rename to apps/encore/assets/translator.js diff --git a/test_apps/encore-app/assets/vue/controllers/Hello.vue b/apps/encore/assets/vue/controllers/Hello.vue similarity index 100% rename from test_apps/encore-app/assets/vue/controllers/Hello.vue rename to apps/encore/assets/vue/controllers/Hello.vue diff --git a/test_apps/encore-app/bin/console b/apps/encore/bin/console similarity index 100% rename from test_apps/encore-app/bin/console rename to apps/encore/bin/console diff --git a/test_apps/encore-app/compose.override.yaml b/apps/encore/compose.override.yaml similarity index 100% rename from test_apps/encore-app/compose.override.yaml rename to apps/encore/compose.override.yaml diff --git a/test_apps/encore-app/compose.yaml b/apps/encore/compose.yaml similarity index 100% rename from test_apps/encore-app/compose.yaml rename to apps/encore/compose.yaml diff --git a/test_apps/encore-app/composer.json b/apps/encore/composer.json similarity index 100% rename from test_apps/encore-app/composer.json rename to apps/encore/composer.json diff --git a/test_apps/encore-app/config/bundles.php b/apps/encore/config/bundles.php similarity index 100% rename from test_apps/encore-app/config/bundles.php rename to apps/encore/config/bundles.php diff --git a/test_apps/encore-app/config/packages/cache.yaml b/apps/encore/config/packages/cache.yaml similarity index 100% rename from test_apps/encore-app/config/packages/cache.yaml rename to apps/encore/config/packages/cache.yaml diff --git a/test_apps/encore-app/config/packages/csrf.yaml b/apps/encore/config/packages/csrf.yaml similarity index 100% rename from test_apps/encore-app/config/packages/csrf.yaml rename to apps/encore/config/packages/csrf.yaml diff --git a/test_apps/encore-app/config/packages/framework.yaml b/apps/encore/config/packages/framework.yaml similarity index 100% rename from test_apps/encore-app/config/packages/framework.yaml rename to apps/encore/config/packages/framework.yaml diff --git a/test_apps/encore-app/config/packages/lazy_image.yaml b/apps/encore/config/packages/lazy_image.yaml similarity index 100% rename from test_apps/encore-app/config/packages/lazy_image.yaml rename to apps/encore/config/packages/lazy_image.yaml diff --git a/test_apps/encore-app/config/packages/mercure.yaml b/apps/encore/config/packages/mercure.yaml similarity index 100% rename from test_apps/encore-app/config/packages/mercure.yaml rename to apps/encore/config/packages/mercure.yaml diff --git a/test_apps/encore-app/config/packages/notifier.yaml b/apps/encore/config/packages/notifier.yaml similarity index 100% rename from test_apps/encore-app/config/packages/notifier.yaml rename to apps/encore/config/packages/notifier.yaml diff --git a/test_apps/encore-app/config/packages/routing.yaml b/apps/encore/config/packages/routing.yaml similarity index 100% rename from test_apps/encore-app/config/packages/routing.yaml rename to apps/encore/config/packages/routing.yaml diff --git a/test_apps/encore-app/config/packages/translation.yaml b/apps/encore/config/packages/translation.yaml similarity index 100% rename from test_apps/encore-app/config/packages/translation.yaml rename to apps/encore/config/packages/translation.yaml diff --git a/test_apps/encore-app/config/packages/twig.yaml b/apps/encore/config/packages/twig.yaml similarity index 100% rename from test_apps/encore-app/config/packages/twig.yaml rename to apps/encore/config/packages/twig.yaml diff --git a/test_apps/encore-app/config/packages/twig_component.yaml b/apps/encore/config/packages/twig_component.yaml similarity index 100% rename from test_apps/encore-app/config/packages/twig_component.yaml rename to apps/encore/config/packages/twig_component.yaml diff --git a/test_apps/encore-app/config/packages/ux_map.yaml b/apps/encore/config/packages/ux_map.yaml similarity index 100% rename from test_apps/encore-app/config/packages/ux_map.yaml rename to apps/encore/config/packages/ux_map.yaml diff --git a/test_apps/encore-app/config/packages/ux_translator.yaml b/apps/encore/config/packages/ux_translator.yaml similarity index 100% rename from test_apps/encore-app/config/packages/ux_translator.yaml rename to apps/encore/config/packages/ux_translator.yaml diff --git a/test_apps/encore-app/config/packages/validator.yaml b/apps/encore/config/packages/validator.yaml similarity index 100% rename from test_apps/encore-app/config/packages/validator.yaml rename to apps/encore/config/packages/validator.yaml diff --git a/test_apps/encore-app/config/packages/webpack_encore.yaml b/apps/encore/config/packages/webpack_encore.yaml similarity index 100% rename from test_apps/encore-app/config/packages/webpack_encore.yaml rename to apps/encore/config/packages/webpack_encore.yaml diff --git a/test_apps/encore-app/config/preload.php b/apps/encore/config/preload.php similarity index 100% rename from test_apps/encore-app/config/preload.php rename to apps/encore/config/preload.php diff --git a/test_apps/encore-app/config/routes.yaml b/apps/encore/config/routes.yaml similarity index 100% rename from test_apps/encore-app/config/routes.yaml rename to apps/encore/config/routes.yaml diff --git a/test_apps/encore-app/config/routes/framework.yaml b/apps/encore/config/routes/framework.yaml similarity index 100% rename from test_apps/encore-app/config/routes/framework.yaml rename to apps/encore/config/routes/framework.yaml diff --git a/test_apps/encore-app/config/routes/ux_autocomplete.yaml b/apps/encore/config/routes/ux_autocomplete.yaml similarity index 100% rename from test_apps/encore-app/config/routes/ux_autocomplete.yaml rename to apps/encore/config/routes/ux_autocomplete.yaml diff --git a/test_apps/encore-app/config/routes/ux_live_component.yaml b/apps/encore/config/routes/ux_live_component.yaml similarity index 100% rename from test_apps/encore-app/config/routes/ux_live_component.yaml rename to apps/encore/config/routes/ux_live_component.yaml diff --git a/test_apps/encore-app/config/services.yaml b/apps/encore/config/services.yaml similarity index 100% rename from test_apps/encore-app/config/services.yaml rename to apps/encore/config/services.yaml diff --git a/test_apps/encore-app/package.json b/apps/encore/package.json similarity index 100% rename from test_apps/encore-app/package.json rename to apps/encore/package.json diff --git a/test_apps/encore-app/public/index.php b/apps/encore/public/index.php similarity index 100% rename from test_apps/encore-app/public/index.php rename to apps/encore/public/index.php diff --git a/test_apps/encore-app/src/Controller/.gitignore b/apps/encore/src/Controller/.gitignore similarity index 100% rename from test_apps/encore-app/src/Controller/.gitignore rename to apps/encore/src/Controller/.gitignore diff --git a/test_apps/encore-app/src/Kernel.php b/apps/encore/src/Kernel.php similarity index 100% rename from test_apps/encore-app/src/Kernel.php rename to apps/encore/src/Kernel.php diff --git a/test_apps/encore-app/symfony.lock b/apps/encore/symfony.lock similarity index 100% rename from test_apps/encore-app/symfony.lock rename to apps/encore/symfony.lock diff --git a/test_apps/encore-app/templates/base.html.twig b/apps/encore/templates/base.html.twig similarity index 100% rename from test_apps/encore-app/templates/base.html.twig rename to apps/encore/templates/base.html.twig diff --git a/test_apps/encore-app/translations/.gitignore b/apps/encore/translations/.gitignore similarity index 100% rename from test_apps/encore-app/translations/.gitignore rename to apps/encore/translations/.gitignore diff --git a/test_apps/encore-app/webpack.config.js b/apps/encore/webpack.config.js similarity index 100% rename from test_apps/encore-app/webpack.config.js rename to apps/encore/webpack.config.js diff --git a/test/playwright-helpers.ts b/test/playwright-helpers.ts index cb60739e631..1b2c70510fa 100644 --- a/test/playwright-helpers.ts +++ b/test/playwright-helpers.ts @@ -2,7 +2,7 @@ import * as path from 'node:path'; import * as fs from 'fs'; export function getSymfonyKernelVersionId(): number { - const kernelPath = path.join(import.meta.dirname, '../test_apps/e2e-app/vendor/symfony/http-kernel/Kernel.php'); + const kernelPath = path.join(import.meta.dirname, '../apps/e2e/vendor/symfony/http-kernel/Kernel.php'); if (!fs.existsSync(kernelPath)) { throw new Error(`Unable to read Symfony Kernel version ID, the file "${kernelPath}" does not exist.`) }