[UPMERGE] 2.0 -> 2.1 (#22)

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

@@ -45,11 +45,14 @@ This package solves that problem by:
 
     ```dotenv
     DATABASE_URL=mysql://root@127.0.0.1/test_application_%kernel.environment%
-    CONFIGS_TO_IMPORT="@AcmePlugin/tests/TestApplication/config/config.yaml"
-    ROUTES_TO_IMPORT="@AcmePlugin/config/routes.yaml"
-    TEST_APP_BUNDLES_PATH="tests/TestApplication/config/bundles.php"
-    # Optional: fall back to a semicolon-separated list of bundles
-    BUNDLES_TO_ENABLE="Acme\Plugin\AcmePlugin"
+
+    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.

bin/console

@@ -39,23 +39,26 @@ if ($_SERVER['APP_DEBUG']) {
     }
 }
 
-if (isset($_ENV['CONFIGS_TO_IMPORT'])) {
-    $_SERVER['CONFIGS_TO_IMPORT'] = $_ENV['CONFIGS_TO_IMPORT'];
+if (isset($_ENV['SYLIUS_TEST_APP_CONFIGS_TO_IMPORT']) || isset($_ENV['CONFIGS_TO_IMPORT'])) {
+    $_SERVER['SYLIUS_TEST_APP_CONFIGS_TO_IMPORT'] = $_ENV['SYLIUS_TEST_APP_CONFIGS_TO_IMPORT'] ?? $_ENV['CONFIGS_TO_IMPORT'];
 }
 
-if (isset($_ENV['ROUTES_TO_IMPORT'])) {
-    $_SERVER['ROUTES_TO_IMPORT'] = $_ENV['ROUTES_TO_IMPORT'];
+if (isset($_ENV['SYLIUS_TEST_APP_ROUTES_TO_IMPORT']) || isset($_ENV['ROUTES_TO_IMPORT'])) {
+    $_SERVER['SYLIUS_TEST_APP_ROUTES_TO_IMPORT'] = $_ENV['SYLIUS_TEST_APP_ROUTES_TO_IMPORT'] ?? $_ENV['ROUTES_TO_IMPORT'];
 }
 
-if (isset($_ENV["BUNDLES_TO_ENABLE"])) {
-    $_SERVER["BUNDLES_TO_ENABLE"] = $_ENV["BUNDLES_TO_ENABLE"];
+if (isset($_ENV['SYLIUS_TEST_APP_BUNDLES_TO_ENABLE']) || isset($_ENV['BUNDLES_TO_ENABLE'])) {
+    $_SERVER['SYLIUS_TEST_APP_BUNDLES_TO_ENABLE'] = $_ENV['SYLIUS_TEST_APP_BUNDLES_TO_ENABLE'] ?? $_ENV['BUNDLES_TO_ENABLE'];
 }
 
-if (isset($_ENV["TEST_APP_BUNDLES_PATH"])) {
-    $_SERVER["TEST_APP_BUNDLES_PATH"] = $_ENV["TEST_APP_BUNDLES_PATH"];
+if (isset($_ENV['SYLIUS_TEST_APP_BUNDLES_PATH']) || isset($_ENV['TEST_APP_BUNDLES_PATH'])) {
+    $_SERVER['SYLIUS_TEST_APP_BUNDLES_PATH'] = $_ENV['SYLIUS_TEST_APP_BUNDLES_PATH'] ?? $_ENV['TEST_APP_BUNDLES_PATH'];
+}
+
+if (isset($_ENV["SYLIUS_TEST_APP_BUNDLES_REPLACE_PATH"])) {
+    $_SERVER["SYLIUS_TEST_APP_BUNDLES_REPLACE_PATH"] = $_ENV["SYLIUS_TEST_APP_BUNDLES_REPLACE_PATH"];
 }
 
 $kernel = new Kernel($_SERVER['APP_ENV'], (bool) $_SERVER['APP_DEBUG']);
 $application = new Application($kernel);
 $application->run($input);
-

config/bootstrap.php

@@ -6,9 +6,12 @@
 
 (new Dotenv())->bootEnv(dirname(__DIR__) . '/.env');
 
-$pluginEnvPath = dirname(__DIR__, 4) . '/tests/TestApplication/.env';
-if (file_exists($pluginEnvPath)) {
+$pluginDir = dirname(__DIR__, 4);
+if (file_exists($pluginEnvPath = $pluginDir . '/tests/TestApplication/.env')) {
     (new Dotenv())->bootEnv($pluginEnvPath);
+
+    $_SERVER['APP_CACHE_DIR'] = $_SERVER['APP_CACHE_DIR'] ?? $pluginDir . '/var/cache';
+    $_SERVER['APP_LOG_DIR'] = $_SERVER['APP_LOG_DIR'] ?? $pluginDir . '/var/log';
 }
 
 $_SERVER['APP_ENV'] = $_ENV['APP_ENV'] = ($_SERVER['APP_ENV'] ?? $_ENV['APP_ENV'] ?? null) ?: 'dev';

src/Kernel.php

@@ -76,8 +76,9 @@ public function registerContainerConfiguration(LoaderInterface $loader): void
 
             $container->setAlias($kernelClass, 'kernel')->setPublic(true);
 
-            if (isset($_SERVER['CONFIGS_TO_IMPORT'])) {
-                foreach (explode(';', $_SERVER['CONFIGS_TO_IMPORT']) as $filePath) {
+            $configsToImport = $_SERVER['SYLIUS_TEST_APP_CONFIGS_TO_IMPORT'] ?? null;
+            if (null !== $configsToImport) {
+                foreach (explode(';', $configsToImport) as $filePath) {
                     $kernelLoader->import($filePath);
                 }
             }
@@ -88,7 +89,8 @@ public function registerBundles(): iterable
     {
         $env = $this->getEnvironment();
 
-        if (!is_file($bundlesPath = $this->getBundlesPath())) {
+        $bundlesPath = $this->resolveBundlesPath();
+        if (!is_file($bundlesPath)) {
             yield new FrameworkBundle();
             return;
         }
@@ -119,8 +121,9 @@ public function loadRoutes(LoaderInterface $loader): RouteCollection
         $routes = new RoutingConfigurator($collection, $kernelLoader, $file, $file, $this->getEnvironment());
         $configureRoutes->getClosure($this)($routes);
 
-        if (isset($_SERVER['ROUTES_TO_IMPORT'])) {
-            foreach (explode(';', $_SERVER['ROUTES_TO_IMPORT']) as $filePath) {
+        $routesToImport = $_SERVER['SYLIUS_TEST_APP_ROUTES_TO_IMPORT'] ?? null;
+        if (null !== $routesToImport) {
+            foreach (explode(';', $routesToImport) as $filePath) {
                 $routes->import($filePath);
             }
         }
@@ -145,12 +148,12 @@ private function loadMainBundles(string $path): array
 
     private function loadAdditionalBundlesFromEnv(array &$contents): bool
     {
-        if (!isset($_SERVER['TEST_APP_BUNDLES_PATH'])) {
+        $bundlesPathEnv = $_SERVER['SYLIUS_TEST_APP_BUNDLES_PATH'] ?? null;
+        if (null === $bundlesPathEnv) {
             return false;
         }
 
-        $relativePath = $_SERVER['TEST_APP_BUNDLES_PATH'];
-        $absolutePath = \dirname($this->getProjectDir(), 3) . '/' . ltrim($relativePath, '/');
+        $absolutePath = \dirname($this->getProjectDir(), 3) . '/' . ltrim($bundlesPathEnv, '/');
 
         if (!is_file($absolutePath)) {
             return false;
@@ -172,14 +175,29 @@ private function loadAdditionalBundlesFromEnv(array &$contents): bool
 
     private function loadBundlesToEnable(array &$contents): void
     {
-        if (!isset($_SERVER['BUNDLES_TO_ENABLE'])) {
+        $bundlesToEnable = $_SERVER['SYLIUS_TEST_APP_BUNDLES_TO_ENABLE'] ?? null;
+        if (null === $bundlesToEnable) {
             return;
         }
 
-        foreach (explode(';', $_SERVER['BUNDLES_TO_ENABLE']) as $bundleClass) {
+        foreach (explode(';', $bundlesToEnable) as $bundleClass) {
             if (\class_exists($bundleClass)) {
                 $contents[$bundleClass] = ['all' => true];
             }
         }
     }
+
+    private function resolveBundlesPath(): string
+    {
+        if (isset($_SERVER['SYLIUS_TEST_APP_BUNDLES_REPLACE_PATH'])) {
+            $relativePath = $_SERVER['SYLIUS_TEST_APP_BUNDLES_REPLACE_PATH'];
+            $absolutePath = \dirname($this->getProjectDir(), 3) . '/' . ltrim($relativePath, '/');
+
+            if (is_file($absolutePath)) {
+                return $absolutePath;
+            }
+        }
+
+        return $this->getBundlesPath();
+    }
 }