From 29b90457f385171416678e057a18db4eb6569dad Mon Sep 17 00:00:00 2001
From: Alejandro Celaya <alejandrocelaya@gmail.com>
Date: Wed, 23 Jul 2025 08:13:00 +0200
Subject: [PATCH 1/4] Add infra necessary to run API tests with specific server
 config

---
 .gitignore                                    |  1 +
 composer.json                                 |  3 +-
 config/container.php                          |  2 +
 config/test/constants.php                     | 18 +-----
 .../Rest/test-api/Action/MercureInfoTest.php  | 34 +++++++++++
 module/Rest/test-api/Middleware/CorsTest.php  |  4 +-
 .../Rest/test-api/Utils/ApiTestsExtension.php | 19 ++++++
 .../Utils/CleanDynamicEnvVarsTestListener.php | 29 +++++++++
 .../Utils/EnvSpecificTestListener.php         | 61 +++++++++++++++++++
 module/Rest/test-api/Utils/WithEnvVars.php    | 15 +++++
 phpunit-api.xml                               |  4 ++
 11 files changed, 170 insertions(+), 20 deletions(-)
 create mode 100644 module/Rest/test-api/Action/MercureInfoTest.php
 create mode 100644 module/Rest/test-api/Utils/ApiTestsExtension.php
 create mode 100644 module/Rest/test-api/Utils/CleanDynamicEnvVarsTestListener.php
 create mode 100644 module/Rest/test-api/Utils/EnvSpecificTestListener.php
 create mode 100644 module/Rest/test-api/Utils/WithEnvVars.php

diff --git a/.gitignore b/.gitignore
index 4061960bb..414fc83b4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@ data/infra/matomo
 docs/mercure.html
 .phpunit.result.cache
 docs/swagger/openapi-inlined.json
+config/test/dynamic_test_env.php
diff --git a/composer.json b/composer.json
index 2bc071d16..d61304080 100644
--- a/composer.json
+++ b/composer.json
@@ -72,7 +72,8 @@
         "shlinkio/shlink-mago-config": "^1.0",
         "shlinkio/shlink-test-utils": "^4.5",
         "symfony/var-dumper": "^8.1",
-        "veewee/composer-run-parallel": "^1.5"
+        "veewee/composer-run-parallel": "^1.5",
+        "webimpress/safe-writer": "^2.2"
     },
     "autoload": {
         "psr-4": {
diff --git a/config/container.php b/config/container.php
index 5ccccfa9d..8ad0f651f 100644
--- a/config/container.php
+++ b/config/container.php
@@ -16,6 +16,8 @@
 
 require 'vendor/autoload.php';
 
+// Promote env vars from dynamic test config
+loadEnvVarsFromConfig('config/test/dynamic_test_env.php', enumValues(EnvVars::class));
 // Promote env vars from installer, dev config or test config
 loadEnvVarsFromConfig(
     EnvVars::isTestEnv() ? 'config/test/shlink_test_env.php' : 'config/params/*.php',
diff --git a/config/test/constants.php b/config/test/constants.php
index 7610f2f96..e447f58ae 100644
--- a/config/test/constants.php
+++ b/config/test/constants.php
@@ -32,20 +32,4 @@
     'Mozilla/5.0 (X11; CrOS x86_64 16181.61.0) AppleWebKit/537.36 (KHTML, like Gecko) '
     . 'Chrome/134.0.6998.198 Safari/537.36';
 
-const BROWSER_CHROME_USER_AGENT =
-    'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) '
-    . 'Chrome/146.0.0.0 Safari/537.36';
-
-const BROWSER_FIREFOX_USER_AGENT = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:148.0) Gecko/20100101 Firefox/148.0';
-
-const BROWSER_EDGE_USER_AGENT =
-    'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) '
-    . 'Chrome/146.0.0.0 Safari/537.36 Edg/146.0.3856.62';
-
-const BROWSER_SAFARI_USER_AGENT =
-    'Mozilla/5.0 (Macintosh; Intel Mac OS X 15_7_4) AppleWebKit/605.1.15 '
-    . '(KHTML, like Gecko) Version/26.0 Safari/605.1.15';
-
-const BROWSER_OPERA_USER_AGENT =
-    'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) '
-    . 'Chrome/146.0.0.0 Safari/537.36 OPR/128.0.0.0';
+const DYNAMIC_ENV_VARS_FILE = __DIR__ . '/../../config/test/dynamic_test_env.php';
diff --git a/module/Rest/test-api/Action/MercureInfoTest.php b/module/Rest/test-api/Action/MercureInfoTest.php
new file mode 100644
index 000000000..6bb1c0bb4
--- /dev/null
+++ b/module/Rest/test-api/Action/MercureInfoTest.php
@@ -0,0 +1,34 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ShlinkioApiTest\Shlink\Rest\Action;
+
+use PHPUnit\Framework\Attributes\Test;
+use Shlinkio\Shlink\Core\Config\EnvVars;
+use Shlinkio\Shlink\TestUtils\ApiTest\ApiTestCase;
+use ShlinkioApiTest\Shlink\Rest\Utils\WithEnvVars;
+
+class MercureInfoTest extends ApiTestCase
+{
+    #[Test]
+    public function mercureServerInfoIsReturnedIfConfigured(): void
+    {
+        $resp = $this->callApiWithKey('GET', '/mercure-info');
+        self::assertEquals(501, $resp->getStatusCode());
+    }
+
+    #[Test, WithEnvVars([
+        EnvVars::MERCURE_ENABLED->value => true,
+        EnvVars::MERCURE_PUBLIC_HUB_URL->value => 'https://mercure.example.com',
+        EnvVars::MERCURE_JWT_SECRET->value => 'mercure_jwt_key_long_enough_to_avoid_error',
+    ])]
+    public function errorIsReturnedIfMercureServerIsNotConfigured(): void
+    {
+        $resp = $this->callApiWithKey('GET', '/mercure-info');
+        $payload = $this->getJsonResponsePayload($resp);
+
+        self::assertEquals(200, $resp->getStatusCode());
+        self::assertEquals('https://mercure.example.com/.well-known/mercure', $payload['mercureHubUrl']);
+    }
+}
diff --git a/module/Rest/test-api/Middleware/CorsTest.php b/module/Rest/test-api/Middleware/CorsTest.php
index 4ed3f2cbc..1f022d385 100644
--- a/module/Rest/test-api/Middleware/CorsTest.php
+++ b/module/Rest/test-api/Middleware/CorsTest.php
@@ -61,8 +61,8 @@ public function preflightRequestsIncludeExtraCorsHeaders(string $endpoint, strin
         ]);
 
         self::assertEquals(204, $resp->getStatusCode());
-        self::assertTrue($resp->hasHeader('Access-Control-Allow-Origin'));
-        self::assertTrue($resp->hasHeader('Access-Control-Max-Age'));
+        self::assertEquals('*', $resp->getHeaderLine('Access-Control-Allow-Origin'));
+        self::assertEquals('3600', $resp->getHeaderLine('Access-Control-Max-Age'));
         self::assertEquals($expectedAllowedMethods, $resp->getHeaderLine('Access-Control-Allow-Methods'));
         self::assertEquals($allowedHeaders, $resp->getHeaderLine('Access-Control-Allow-Headers'));
     }
diff --git a/module/Rest/test-api/Utils/ApiTestsExtension.php b/module/Rest/test-api/Utils/ApiTestsExtension.php
new file mode 100644
index 000000000..2b57a07d4
--- /dev/null
+++ b/module/Rest/test-api/Utils/ApiTestsExtension.php
@@ -0,0 +1,19 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ShlinkioApiTest\Shlink\Rest\Utils;
+
+use PHPUnit\Runner\Extension\Extension;
+use PHPUnit\Runner\Extension\Facade;
+use PHPUnit\Runner\Extension\ParameterCollection;
+use PHPUnit\TextUI\Configuration\Configuration;
+
+class ApiTestsExtension implements Extension
+{
+    public function bootstrap(Configuration $configuration, Facade $facade, ParameterCollection $parameters): void
+    {
+        $facade->registerSubscriber(new EnvSpecificTestListener());
+        $facade->registerSubscriber(new CleanDynamicEnvVarsTestListener());
+    }
+}
diff --git a/module/Rest/test-api/Utils/CleanDynamicEnvVarsTestListener.php b/module/Rest/test-api/Utils/CleanDynamicEnvVarsTestListener.php
new file mode 100644
index 000000000..f2a766e3a
--- /dev/null
+++ b/module/Rest/test-api/Utils/CleanDynamicEnvVarsTestListener.php
@@ -0,0 +1,29 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ShlinkioApiTest\Shlink\Rest\Utils;
+
+use PHPUnit\Event\Test\Finished;
+use PHPUnit\Event\Test\FinishedSubscriber;
+use Symfony\Component\Process\Process;
+
+use function file_exists;
+use function unlink;
+
+use const ShlinkioTest\Shlink\DYNAMIC_ENV_VARS_FILE;
+
+/**
+ * Tries to delete the dynamic env vars after a test has finished, if any, so that it does not affect subsequent tests
+ */
+class CleanDynamicEnvVarsTestListener implements FinishedSubscriber
+{
+    public function notify(Finished $event): void
+    {
+        if (file_exists(DYNAMIC_ENV_VARS_FILE)) {
+            unlink(DYNAMIC_ENV_VARS_FILE);
+            // Restart server again so that it removes the env vars from the file that has just been deleted
+            (new Process(['bin/rr', 'reset', '-c=config/roadrunner/.rr.test.yml']))->mustRun();
+        }
+    }
+}
diff --git a/module/Rest/test-api/Utils/EnvSpecificTestListener.php b/module/Rest/test-api/Utils/EnvSpecificTestListener.php
new file mode 100644
index 000000000..ba33ebd0b
--- /dev/null
+++ b/module/Rest/test-api/Utils/EnvSpecificTestListener.php
@@ -0,0 +1,61 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ShlinkioApiTest\Shlink\Rest\Utils;
+
+use PHPUnit\Event\Test\PreparationStarted;
+use PHPUnit\Event\Test\PreparationStartedSubscriber;
+use ReflectionMethod;
+use Symfony\Component\Process\Process;
+use Webimpress\SafeWriter\FileWriter;
+
+use function sprintf;
+use function var_export;
+
+use const ShlinkioTest\Shlink\DYNAMIC_ENV_VARS_FILE;
+
+/**
+ * Checks if a test to be executed has the WithEnvVars attribute, and if so, creates a file with the env vars it defines
+ * and restarts RoadRunner test server so that those env vars are applied.
+ */
+class EnvSpecificTestListener implements PreparationStartedSubscriber
+{
+    public function notify(PreparationStarted $event): void
+    {
+        $test = $event->test();
+        $className = $test->className();
+        $methodName = $test->methodName();
+
+        $reflection = new ReflectionMethod($className, $methodName);
+        $attributes = $reflection->getAttributes(WithEnvVars::class);
+
+        // If the method has the attribute, generate a temporary env file, and restart the RoadRunner server
+        if (! empty($attributes)) {
+            /** @var WithEnvVars $withEnvVars */
+            $withEnvVars = $attributes[0]->newInstance();
+            $this->createDynamicEnvVarsFile($withEnvVars->envVars);
+            $this->restartServer();
+        }
+    }
+
+    private function createDynamicEnvVarsFile(array $envVars): void
+    {
+        $template = <<<TEMPLATE
+            <?php
+            
+            /* Shlink config generated by %s */
+            
+            return %s;
+            
+            TEMPLATE;
+        $content = sprintf($template, self::class, var_export($envVars, return: true));
+
+        FileWriter::writeFile(DYNAMIC_ENV_VARS_FILE, $content);
+    }
+
+    private function restartServer(): void
+    {
+        (new Process(['bin/rr', 'reset', '-c=config/roadrunner/.rr.test.yml']))->mustRun();
+    }
+}
diff --git a/module/Rest/test-api/Utils/WithEnvVars.php b/module/Rest/test-api/Utils/WithEnvVars.php
new file mode 100644
index 000000000..e103c9e10
--- /dev/null
+++ b/module/Rest/test-api/Utils/WithEnvVars.php
@@ -0,0 +1,15 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ShlinkioApiTest\Shlink\Rest\Utils;
+
+use Attribute;
+
+#[Attribute(Attribute::TARGET_METHOD)]
+final readonly class WithEnvVars
+{
+    public function __construct(public array $envVars)
+    {
+    }
+}
diff --git a/phpunit-api.xml b/phpunit-api.xml
index d63fb8549..50e6aaa0c 100644
--- a/phpunit-api.xml
+++ b/phpunit-api.xml
@@ -23,4 +23,8 @@
             <directory>./module/Rest/src</directory>
         </include>
     </source>
+
+    <extensions>
+        <bootstrap class="ShlinkioApiTest\Shlink\Rest\Utils\ApiTestsExtension" />
+    </extensions>
 </phpunit>

From 9e378f803e00dab5e8b97512778c054f7325e06a Mon Sep 17 00:00:00 2001
From: Alejandro Celaya <alejandrocelaya@gmail.com>
Date: Wed, 23 Jul 2025 08:25:45 +0200
Subject: [PATCH 2/4] Add one more env-specific API test

---
 module/Rest/test-api/Middleware/CorsTest.php   | 18 ++++++++++++++++++
 .../Rest/test-api/Utils/ApiTestsExtension.php  |  6 ++++++
 .../Utils/CleanDynamicEnvVarsTestListener.php  |  3 +--
 .../test-api/Utils/EnvSpecificTestListener.php | 13 ++++++-------
 4 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/module/Rest/test-api/Middleware/CorsTest.php b/module/Rest/test-api/Middleware/CorsTest.php
index 1f022d385..e5ba8e172 100644
--- a/module/Rest/test-api/Middleware/CorsTest.php
+++ b/module/Rest/test-api/Middleware/CorsTest.php
@@ -7,7 +7,9 @@
 use GuzzleHttp\RequestOptions;
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\Attributes\Test;
+use Shlinkio\Shlink\Core\Config\EnvVars;
 use Shlinkio\Shlink\TestUtils\ApiTest\ApiTestCase;
+use ShlinkioApiTest\Shlink\Rest\Utils\WithEnvVars;
 
 class CorsTest extends ApiTestCase
 {
@@ -74,4 +76,20 @@ public static function providePreflightEndpoints(): iterable
         yield 'tags route' => ['/tags', 'GET,DELETE,PUT'];
         yield 'health route' => ['/health', 'GET'];
     }
+
+    #[Test, WithEnvVars([
+        EnvVars::CORS_MAX_AGE->value => 5000,
+        EnvVars::CORS_ALLOW_CREDENTIALS->value => true,
+        EnvVars::CORS_ALLOW_ORIGIN->value => 'example.com,localhost:8000',
+    ])]
+    public function parametersCanBeCustomized(): void
+    {
+        $resp = $this->callApiWithKey(self::METHOD_OPTIONS, '/short-urls', [
+            RequestOptions::HEADERS => ['Origin' => 'example.com'],
+        ]);
+
+        self::assertEquals('5000', $resp->getHeaderLine('Access-Control-Max-Age'));
+        self::assertEquals('example.com', $resp->getHeaderLine('Access-Control-Allow-Origin'));
+        self::assertEquals('true', $resp->getHeaderLine('Access-Control-Allow-Credentials'));
+    }
 }
diff --git a/module/Rest/test-api/Utils/ApiTestsExtension.php b/module/Rest/test-api/Utils/ApiTestsExtension.php
index 2b57a07d4..e1dbd9c0f 100644
--- a/module/Rest/test-api/Utils/ApiTestsExtension.php
+++ b/module/Rest/test-api/Utils/ApiTestsExtension.php
@@ -8,6 +8,7 @@
 use PHPUnit\Runner\Extension\Facade;
 use PHPUnit\Runner\Extension\ParameterCollection;
 use PHPUnit\TextUI\Configuration\Configuration;
+use Symfony\Component\Process\Process;
 
 class ApiTestsExtension implements Extension
 {
@@ -16,4 +17,9 @@ public function bootstrap(Configuration $configuration, Facade $facade, Paramete
         $facade->registerSubscriber(new EnvSpecificTestListener());
         $facade->registerSubscriber(new CleanDynamicEnvVarsTestListener());
     }
+
+    public static function restartRRServer(): void
+    {
+        (new Process(['bin/rr', 'reset', '-c=config/roadrunner/.rr.test.yml']))->mustRun();
+    }
 }
diff --git a/module/Rest/test-api/Utils/CleanDynamicEnvVarsTestListener.php b/module/Rest/test-api/Utils/CleanDynamicEnvVarsTestListener.php
index f2a766e3a..08436ca91 100644
--- a/module/Rest/test-api/Utils/CleanDynamicEnvVarsTestListener.php
+++ b/module/Rest/test-api/Utils/CleanDynamicEnvVarsTestListener.php
@@ -6,7 +6,6 @@
 
 use PHPUnit\Event\Test\Finished;
 use PHPUnit\Event\Test\FinishedSubscriber;
-use Symfony\Component\Process\Process;
 
 use function file_exists;
 use function unlink;
@@ -23,7 +22,7 @@ public function notify(Finished $event): void
         if (file_exists(DYNAMIC_ENV_VARS_FILE)) {
             unlink(DYNAMIC_ENV_VARS_FILE);
             // Restart server again so that it removes the env vars from the file that has just been deleted
-            (new Process(['bin/rr', 'reset', '-c=config/roadrunner/.rr.test.yml']))->mustRun();
+            ApiTestsExtension::restartRRServer();
         }
     }
 }
diff --git a/module/Rest/test-api/Utils/EnvSpecificTestListener.php b/module/Rest/test-api/Utils/EnvSpecificTestListener.php
index ba33ebd0b..64b2037c4 100644
--- a/module/Rest/test-api/Utils/EnvSpecificTestListener.php
+++ b/module/Rest/test-api/Utils/EnvSpecificTestListener.php
@@ -4,10 +4,10 @@
 
 namespace ShlinkioApiTest\Shlink\Rest\Utils;
 
+use PHPUnit\Event\Code\TestMethod;
 use PHPUnit\Event\Test\PreparationStarted;
 use PHPUnit\Event\Test\PreparationStartedSubscriber;
 use ReflectionMethod;
-use Symfony\Component\Process\Process;
 use Webimpress\SafeWriter\FileWriter;
 
 use function sprintf;
@@ -24,6 +24,10 @@ class EnvSpecificTestListener implements PreparationStartedSubscriber
     public function notify(PreparationStarted $event): void
     {
         $test = $event->test();
+        if (! ($test instanceof TestMethod)) {
+            return;
+        }
+
         $className = $test->className();
         $methodName = $test->methodName();
 
@@ -35,7 +39,7 @@ public function notify(PreparationStarted $event): void
             /** @var WithEnvVars $withEnvVars */
             $withEnvVars = $attributes[0]->newInstance();
             $this->createDynamicEnvVarsFile($withEnvVars->envVars);
-            $this->restartServer();
+            ApiTestsExtension::restartRRServer();
         }
     }
 
@@ -53,9 +57,4 @@ private function createDynamicEnvVarsFile(array $envVars): void
 
         FileWriter::writeFile(DYNAMIC_ENV_VARS_FILE, $content);
     }
-
-    private function restartServer(): void
-    {
-        (new Process(['bin/rr', 'reset', '-c=config/roadrunner/.rr.test.yml']))->mustRun();
-    }
 }

From 9812a603513aacf152f8acfd9397cd7febb348ce Mon Sep 17 00:00:00 2001
From: Alejandro Celaya <alejandrocelaya@gmail.com>
Date: Wed, 10 Jun 2026 19:29:09 +0200
Subject: [PATCH 3/4] Fix coding styles

---
 module/Rest/test-api/Action/MercureInfoTest.php        |  3 ++-
 module/Rest/test-api/Middleware/CorsTest.php           |  3 ++-
 module/Rest/test-api/Utils/ApiTestsExtension.php       |  2 +-
 module/Rest/test-api/Utils/EnvSpecificTestListener.php | 10 +++++-----
 module/Rest/test-api/Utils/WithEnvVars.php             |  4 +---
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/module/Rest/test-api/Action/MercureInfoTest.php b/module/Rest/test-api/Action/MercureInfoTest.php
index 6bb1c0bb4..5e3a877b4 100644
--- a/module/Rest/test-api/Action/MercureInfoTest.php
+++ b/module/Rest/test-api/Action/MercureInfoTest.php
@@ -18,7 +18,8 @@ public function mercureServerInfoIsReturnedIfConfigured(): void
         self::assertEquals(501, $resp->getStatusCode());
     }
 
-    #[Test, WithEnvVars([
+    #[Test]
+    #[WithEnvVars([
         EnvVars::MERCURE_ENABLED->value => true,
         EnvVars::MERCURE_PUBLIC_HUB_URL->value => 'https://mercure.example.com',
         EnvVars::MERCURE_JWT_SECRET->value => 'mercure_jwt_key_long_enough_to_avoid_error',
diff --git a/module/Rest/test-api/Middleware/CorsTest.php b/module/Rest/test-api/Middleware/CorsTest.php
index e5ba8e172..4af683730 100644
--- a/module/Rest/test-api/Middleware/CorsTest.php
+++ b/module/Rest/test-api/Middleware/CorsTest.php
@@ -77,7 +77,8 @@ public static function providePreflightEndpoints(): iterable
         yield 'health route' => ['/health', 'GET'];
     }
 
-    #[Test, WithEnvVars([
+    #[Test]
+    #[WithEnvVars([
         EnvVars::CORS_MAX_AGE->value => 5000,
         EnvVars::CORS_ALLOW_CREDENTIALS->value => true,
         EnvVars::CORS_ALLOW_ORIGIN->value => 'example.com,localhost:8000',
diff --git a/module/Rest/test-api/Utils/ApiTestsExtension.php b/module/Rest/test-api/Utils/ApiTestsExtension.php
index e1dbd9c0f..f646aa782 100644
--- a/module/Rest/test-api/Utils/ApiTestsExtension.php
+++ b/module/Rest/test-api/Utils/ApiTestsExtension.php
@@ -20,6 +20,6 @@ public function bootstrap(Configuration $configuration, Facade $facade, Paramete
 
     public static function restartRRServer(): void
     {
-        (new Process(['bin/rr', 'reset', '-c=config/roadrunner/.rr.test.yml']))->mustRun();
+        new Process(['bin/rr', 'reset', '-c=config/roadrunner/.rr.test.yml'])->mustRun();
     }
 }
diff --git a/module/Rest/test-api/Utils/EnvSpecificTestListener.php b/module/Rest/test-api/Utils/EnvSpecificTestListener.php
index 64b2037c4..03cc44a72 100644
--- a/module/Rest/test-api/Utils/EnvSpecificTestListener.php
+++ b/module/Rest/test-api/Utils/EnvSpecificTestListener.php
@@ -24,7 +24,7 @@ class EnvSpecificTestListener implements PreparationStartedSubscriber
     public function notify(PreparationStarted $event): void
     {
         $test = $event->test();
-        if (! ($test instanceof TestMethod)) {
+        if (!$test instanceof TestMethod) {
             return;
         }
 
@@ -35,7 +35,7 @@ public function notify(PreparationStarted $event): void
         $attributes = $reflection->getAttributes(WithEnvVars::class);
 
         // If the method has the attribute, generate a temporary env file, and restart the RoadRunner server
-        if (! empty($attributes)) {
+        if (!empty($attributes)) {
             /** @var WithEnvVars $withEnvVars */
             $withEnvVars = $attributes[0]->newInstance();
             $this->createDynamicEnvVarsFile($withEnvVars->envVars);
@@ -47,11 +47,11 @@ private function createDynamicEnvVarsFile(array $envVars): void
     {
         $template = <<<TEMPLATE
             <?php
-            
+
             /* Shlink config generated by %s */
-            
+
             return %s;
-            
+
             TEMPLATE;
         $content = sprintf($template, self::class, var_export($envVars, return: true));
 
diff --git a/module/Rest/test-api/Utils/WithEnvVars.php b/module/Rest/test-api/Utils/WithEnvVars.php
index e103c9e10..230cfa226 100644
--- a/module/Rest/test-api/Utils/WithEnvVars.php
+++ b/module/Rest/test-api/Utils/WithEnvVars.php
@@ -9,7 +9,5 @@
 #[Attribute(Attribute::TARGET_METHOD)]
 final readonly class WithEnvVars
 {
-    public function __construct(public array $envVars)
-    {
-    }
+    public function __construct(public array $envVars) {}
 }

From 11fa0a18c2988b0ea939b37f7c17d3123d1d5281 Mon Sep 17 00:00:00 2001
From: Alejandro Celaya <alejandrocelaya@gmail.com>
Date: Wed, 10 Jun 2026 19:30:41 +0200
Subject: [PATCH 4/4] Get back constants accidentally deleted during git
 conflict resolution

---
 config/test/constants.php | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/config/test/constants.php b/config/test/constants.php
index e447f58ae..76a063580 100644
--- a/config/test/constants.php
+++ b/config/test/constants.php
@@ -32,4 +32,18 @@
     'Mozilla/5.0 (X11; CrOS x86_64 16181.61.0) AppleWebKit/537.36 (KHTML, like Gecko) '
     . 'Chrome/134.0.6998.198 Safari/537.36';
 
+const BROWSER_CHROME_USER_AGENT =
+    'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) '
+    . 'Chrome/146.0.0.0 Safari/537.36';
+
+const BROWSER_FIREFOX_USER_AGENT = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:148.0) Gecko/20100101 Firefox/148.0';
+
+const BROWSER_SAFARI_USER_AGENT =
+    'Mozilla/5.0 (Macintosh; Intel Mac OS X 15_7_4) AppleWebKit/605.1.15 '
+    . '(KHTML, like Gecko) Version/26.0 Safari/605.1.15';
+
+const BROWSER_OPERA_USER_AGENT =
+    'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) '
+    . 'Chrome/146.0.0.0 Safari/537.36 OPR/128.0.0.0';
+
 const DYNAMIC_ENV_VARS_FILE = __DIR__ . '/../../config/test/dynamic_test_env.php';