[UPMERGE] 2.0 -> 2.1 (#31)

This PR has been generated automatically.
For more details see
[upmerge_pr.yaml](/Sylius/TestApplication/blob/2.0/.github/workflows/upmerge_pr.yaml).

**Remember!** The upmerge should always be merged with using `Merge pull
request` button.

In case of conflicts, please resolve them manually with usign the
following commands:
```
git fetch upstream
gh pr checkout <this-pr-number>
git merge upstream/2.1 -m "Resolve conflicts between 2.0 and 2.1"
```

If you use other name for the upstream remote, please replace `upstream`
with the name of your remote pointing to the `Sylius/TestApplication`
repository.

Once the conflicts are resolved, please run `git merge --continue` and
push the changes to this PR.

Author: GSadee

README.md

@@ -8,22 +8,15 @@
     </a>
 </p>
 
-TestApplication
-===============
+Test Application
+================
 
-Developer tool that provides a ready-to-use Sylius-based application for testing and running Sylius plugins.
-
-> ⚠️ While TestApplication is still evolving, it is already being used internally and in official plugins.
-   We encourage you to adopt it in your plugins, provide feedback, and contribute to improve the developer experience 
-   for the entire Sylius ecosystem.
-
-## Documentation
-
-For more information about the **Test Application**, please refer to the [Sylius documentation](https://docs.sylius.com/sylius-plugins/plugins-development-guide/testapplication).
+The Test Application is a shared testing environment designed to simplify Sylius plugin development. Instead of setting up 
+a full application in every plugin, you now use a common, pre-configured application maintained by the Sylius team.
 
 ## Purpose
 
-Previously, each plugin had to maintain its own copy of a test application, leading to duplicated configuration, 
+Previously, each plugin had to maintain its own copy of a test application, leading to duplicated configuration,
 maintenance overhead, and version incompatibilities.
 
 This package solves that problem by:
@@ -33,104 +26,14 @@ This package solves that problem by:
 - Simplifying the setup and execution of tests within plugins
 - Creating versioned variants aligned with specific Sylius versions (e.g. `1.14`, `2.0`, etc.)
 
-## Installation and configuration in a Plugin
-
-1. Require the TestApplication as a development dependency:
-
-    ```bash
-    composer require sylius/test-application:2.0.x-dev --dev
-    ```
-
-1. Set environment variables in `tests/TestApplication/.env`:
-
-    ```dotenv
-    DATABASE_URL=mysql://root@127.0.0.1/test_application_%kernel.environment%
-
-    SYLIUS_TEST_APP_CONFIGS_TO_IMPORT="@AcmePlugin/tests/TestApplication/config/config.yaml"
-    SYLIUS_TEST_APP_ROUTES_TO_IMPORT="@AcmePlugin/config/routes.yaml"
-    SYLIUS_TEST_APP_BUNDLES_PATH="tests/TestApplication/config/bundles.php"
-    # Optionally, replace the default bundles entirely
-    SYLIUS_TEST_APP_BUNDLES_REPLACE_PATH="tests/TestApplication/config/bundles.php"
-    # Optionally, use a semicolon-separated list to add needed bundles
-    SYLIUS_TEST_APP_BUNDLES_TO_ENABLE="Acme\Plugin\AcmePlugin"
-    ```
-
-    > 💡 The values provided above are examples and should be adjusted for your plugin.
-
-1. Optionally, return conditionally enabled bundles from `tests/TestApplication/bundles.php`:
-
-    ```php
-    <?php
-
-    return [
-        Acme\\Plugin\\AcmePlugin::class => ['all' => true],
-    ];
-    ```
-
-1. If needed, place plugin-specific configuration files in the `tests/TestApplication/config` directory
-   (e.g. `services.yaml`, `routes.yaml`) and load them by env variables.
-
-1. If your plugin requires additional JavaScript dependencies, add them to `tests/TestApplication/package.json`:
-
-    ```json
-    {
-        "dependencies": {
-            "trix": "^2.0.0"
-        }
-    }
-    ```
-
-   This file will be merged with the main TestApplication `package.json`.
-
-1. If your plugin requires entity extensions, add them in `tests/TestApplication/src/Entity` and ensure:
-
-    - Doctrine mappings are configured:
-
-        ```
-        doctrine:
-            orm:
-                entity_managers:
-                    default:
-                        mappings:
-                            TestApplication:
-                                is_bundle: false
-                                type: attribute
-                                dir: '%kernel.project_dir%/../../../tests/TestApplication/src/Entity'
-                                prefix: Tests\Acme\Plugin\TestApplication
-        ```
-      
-    - The namespace is registered properly in the autoloader, in `composer.json` file
-
-        ```json
-        {
-            "autoload-dev": {
-                "psr-4": {
-                    "Tests\\Acme\\Plugin\\TestApplication\\": "tests/TestApplication/src/"
-                }
-            }
-        }
-
-1. Build the TestApplication in a Plugin:
-
-    ```bash
-    vendor/bin/console doctrine:database:create
-    vendor/bin/console doctrine:migration:migrate -n
-    vendor/bin/console sylius:fixtures:load -n
-    
-    (cd vendor/sylius/test-application && yarn install)
-    (cd vendor/sylius/test-application && yarn build)
-    vendor/bin/console assets:install
-    ```
-
-1. Run your server locally:
+## Documentation
 
-    ```bash
-    symfony serve --dir=vendor/sylius/test-application/public
-    ```
+For more information about the **Test Application**, and on installation and configuration instructions, 
+please refer to the [Sylius documentation](https://docs.sylius.com/sylius-plugins/plugins-development-guide/test-application).
 
 ## Example usage
 
-See an example implementation in [the pull request](https://github.com/Sylius/CmsPlugin/pull/53) to Sylius/CmsPlugin.
+See an example implementation in [the pull request](https://github.com/Sylius/InvoicingPlugin/pull/373) to Sylius/InvoicingPlugin.
 
 ## Community
 

config/bundles.php

@@ -1,6 +1,6 @@
 <?php
 
-return [
+$bundles = [
     Symfony\Bundle\FrameworkBundle\FrameworkBundle::class => ['all' => true],
     Symfony\Bundle\MonologBundle\MonologBundle::class => ['all' => true],
     Symfony\Bundle\SecurityBundle\SecurityBundle::class => ['all' => true],
@@ -41,7 +41,6 @@
     Sylius\Bundle\ShopBundle\SyliusShopBundle::class => ['all' => true],
     Symfony\Bundle\DebugBundle\DebugBundle::class => ['dev' => true, 'test' => true, 'test_cached' => true],
     Symfony\Bundle\WebProfilerBundle\WebProfilerBundle::class => ['dev' => true, 'test' => true, 'test_cached' => true],
-    FriendsOfBehat\SymfonyExtension\Bundle\FriendsOfBehatSymfonyExtensionBundle::class => ['test' => true, 'test_cached' => true],
     ApiPlatform\Symfony\Bundle\ApiPlatformBundle::class => ['all' => true],
     Sylius\Bundle\ApiBundle\SyliusApiBundle::class => ['all' => true],
     Lexik\Bundle\JWTAuthenticationBundle\LexikJWTAuthenticationBundle::class => ['all' => true],
@@ -61,3 +60,9 @@
     Nelmio\Alice\Bridge\Symfony\NelmioAliceBundle::class => ['dev' => true, 'test' => true],
     Fidry\AliceDataFixtures\Bridge\Symfony\FidryAliceDataFixturesBundle::class => ['dev' => true, 'test' => true],
 ];
+
+if (class_exists('FriendsOfBehat\SymfonyExtension\Bundle\FriendsOfBehatSymfonyExtensionBundle')) {
+    $bundles[FriendsOfBehat\SymfonyExtension\Bundle\FriendsOfBehatSymfonyExtensionBundle::class] = ['test' => true, 'test_cached' => true];
+}
+
+return $bundles;

config/services_test.php

@@ -0,0 +1,11 @@
+<?php
+
+declare(strict_types=1);
+
+use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
+
+return function (ContainerConfigurator $container) {
+    if (class_exists('FriendsOfBehat\SymfonyExtension\Bundle\FriendsOfBehatSymfonyExtensionBundle')) {
+        $container->import('../../sylius/src/Sylius/Behat/Resources/config/services.xml');
+    }
+};

config/services_test.yaml

@@ -9,8 +9,8 @@
     "dependencies": {
         "@sylius-ui/admin": "file:../sylius/src/Sylius/Bundle/AdminBundle",
         "@sylius-ui/shop": "file:../sylius/src/Sylius/Bundle/ShopBundle",
-        "@symfony/ux-autocomplete": "file:../../../vendor/symfony/ux-autocomplete/assets",
-        "@symfony/ux-live-component": "file:../../../vendor/symfony/ux-live-component/assets"
+        "@symfony/ux-autocomplete": "file:../../symfony/ux-autocomplete/assets",
+        "@symfony/ux-live-component": "file:../../symfony/ux-live-component/assets"
     },
     "devDependencies": {
         "@hotwired/stimulus": "^3.0.0",

package.json.dist

@@ -10,8 +10,12 @@ const pluginPackagePath = path.join(pluginRoot, 'tests', 'TestApplication', 'pac
 const pluginPackageExists = fs.existsSync(pluginPackagePath);
 const pluginPackage = pluginPackageExists
     ? JSON.parse(fs.readFileSync(pluginPackagePath, 'utf-8'))
-    : { dependencies: {}, devDependencies: {} }
-;
+    : {
+          dependencies: {},
+          devDependencies: {},
+          removeDependencies: [],
+          removeDevDependencies: [],
+      };
 
 const basePackage = JSON.parse(fs.readFileSync(packageDistPath, 'utf-8'));
 
@@ -24,10 +28,26 @@ function mergeDependencies(target = {}, source = {}) {
     return result;
 }
 
+function removeDependencies(target = {}, packages = []) {
+    const result = { ...target };
+
+    for (const pkg of packages) {
+        delete result[pkg];
+    }
+
+    return result;
+}
+
 const finalPackage = {
     ...basePackage,
-    dependencies: mergeDependencies(basePackage.dependencies, pluginPackage.dependencies),
-    devDependencies: mergeDependencies(basePackage.devDependencies, pluginPackage.devDependencies),
+    dependencies: removeDependencies(
+        mergeDependencies(basePackage.dependencies, pluginPackage.dependencies),
+        pluginPackage.removeDependencies ?? []
+    ),
+    devDependencies: removeDependencies(
+        mergeDependencies(basePackage.devDependencies, pluginPackage.devDependencies),
+        pluginPackage.removeDevDependencies ?? []
+    ),
 };
 
 fs.writeFileSync(packagePath, JSON.stringify(finalPackage, null, 4));

scripts/merge-plugin-dependencies.js

@@ -22,7 +22,7 @@ Encore
     .setPublicPath('/build/app/shop')
     .addEntry('app-shop-entry', path.resolve(__dirname, './assets/shop/entrypoint.js'))
     .addAliases({
-        '@vendor': path.resolve(__dirname, '../../vendor'),
+        '@vendor': path.resolve(__dirname, '../..'),
     })
     .disableSingleRuntimeChunk()
     .cleanupOutputBeforeBuild()
@@ -53,7 +53,7 @@ Encore
     .setPublicPath('/build/app/admin')
     .addEntry('app-admin-entry', path.resolve(__dirname, './assets/admin/entrypoint.js'))
     .addAliases({
-        '@vendor': path.resolve(__dirname, '../../vendor'),
+        '@vendor': path.resolve(__dirname, '../..'),
     })
     .disableSingleRuntimeChunk()
     .cleanupOutputBeforeBuild()