refactor(tests): extract inline PHP seed into integration_helper.php

Signed-off-by: Oleksander Piskun <oleksandr2088@icloud.com>

Author: oleksandr-nc

.github/workflows/tests-deploy.yml

@@ -1654,20 +1654,13 @@ jobs:
 
       - name: Seed stray ex_deploy_options row for a second app
         # Without a second appid in the table, the Update.php bug from #808 is
-        # latent — formatDeployOptions() with no $appId filter still produces
+        # latent: formatDeployOptions() with no $appId filter still produces
         # the single app's rows by luck. The `zz_` prefix ensures this stray row
         # iterates AFTER `app-skeleton-python`, so the last-wins flattening
         # actually clobbers the skeleton's env_vars entry.
         run: |
-          php -r '
-            require "lib/base.php";
-            OCP\Server::get(OCP\App\IAppManager::class)->loadApp("app_api");
-            $svc = OCP\Server::get(OCA\AppAPI\Service\ExAppDeployOptionsService::class);
-            $svc->addExAppDeployOptions("zz_fake_second_app", [
-              "environment_variables" => ["UNRELATED_VAR" => ["name" => "UNRELATED_VAR", "value" => "x"]],
-              "mounts" => [],
-            ]);
-          '
+          php apps/${{ env.APP_NAME }}/tests/integration_helper.php \
+            set-env zz_fake_second_app UNRELATED_VAR x
 
       - name: Build v2 info.xml with bumped version
         # Update.php:153 short-circuits when versions match; bumping to 999.0.0

tests/integration_helper.php

@@ -0,0 +1,59 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+/**
+ * CLI helper for AppAPI integration tests.
+ *
+ * Seeds or clears rows in `ex_deploy_options` directly, without running a full
+ * `app_api:app:register` cycle. Used to reproduce multi-app states that are
+ * awkward to set up via OCC alone (e.g. issue #808).
+ *
+ * Usage:
+ *   php integration_helper.php set-env <appid> <name> <value>
+ *   php integration_helper.php remove  <appid>
+ */
+
+require __DIR__ . '/../../../lib/base.php';
+
+OCP\Server::get(OCP\App\IAppManager::class)->loadApp('app_api');
+$service = OCP\Server::get(OCA\AppAPI\Service\ExAppDeployOptionsService::class);
+
+$command = $argv[1] ?? '';
+$appid = $argv[2] ?? '';
+
+if ($appid === '') {
+	fwrite(STDERR, "usage: integration_helper.php set-env <appid> <name> <value>\n");
+	fwrite(STDERR, "       integration_helper.php remove <appid>\n");
+	exit(1);
+}
+
+switch ($command) {
+	case 'set-env':
+		$name = $argv[3] ?? '';
+		$value = $argv[4] ?? '';
+		if ($name === '') {
+			fwrite(STDERR, "missing <name>\n");
+			exit(1);
+		}
+		$existing = $service->getDeployOption($appid, 'environment_variables');
+		$envVars = $existing !== null ? $existing->getValue() : [];
+		$envVars[$name] = ['name' => $name, 'value' => $value];
+		$service->addExAppDeployOption($appid, 'environment_variables', $envVars);
+		echo "set {$name}={$value} for {$appid}\n";
+		break;
+
+	case 'remove':
+		$service->removeExAppDeployOptions($appid);
+		echo "removed deploy options for {$appid}\n";
+		break;
+
+	default:
+		fwrite(STDERR, "unknown command '{$command}'\n");
+		exit(1);
+}

tests/test_occ_commands_k8s.py

@@ -500,26 +500,19 @@ def test_k8s_update_preserves_deploy_options():
          options merge entirely in the JSON path.
       3. Run `app_api:app:update`.
       4. Assert the env vars declared in info.xml are present on the new
-         Deployment pod spec — TEST_ENV_1 with its default and TEST_ENV_2
+         Deployment pod spec: TEST_ENV_1 with its default and TEST_ENV_2
          with the user-provided value.
     """
     print("  test_k8s_update_preserves_deploy_options...", end=" ", flush=True)
 
-    seed_code = (
-        'require "lib/base.php";'
-        'OCP\\Server::get(OCP\\App\\IAppManager::class)->loadApp("app_api");'
-        '$svc = OCP\\Server::get(OCA\\AppAPI\\Service\\ExAppDeployOptionsService::class);'
-        '$svc->addExAppDeployOptions("app-skeleton-python", ['
-        '"environment_variables" => ["TEST_ENV_2" => ["name" => "TEST_ENV_2", "value" => "user_provided_value"]],'
-        '"mounts" => [],'
-        ']);'
-        '$svc->addExAppDeployOptions("zz_fake_second_app", ['
-        '"environment_variables" => ["UNRELATED_VAR" => ["name" => "UNRELATED_VAR", "value" => "x"]],'
-        '"mounts" => [],'
-        ']);'
-    )
-    r = run(["php", "-r", seed_code], stdout=PIPE, stderr=PIPE)
-    assert r.returncode == 0, f"Seed failed: {r.stderr.decode()}"
+    helper = os.path.join(os.path.dirname(os.path.abspath(__file__)), "integration_helper.php")
+
+    def seed(appid, name, value):
+        r = run(["php", helper, "set-env", appid, name, value], stdout=PIPE, stderr=PIPE)
+        assert r.returncode == 0, f"seed {appid}/{name} failed: {r.stderr.decode()}"
+
+    seed("app-skeleton-python", "TEST_ENV_2", "user_provided_value")
+    seed("zz_fake_second_app", "UNRELATED_VAR", "x")
 
     xml = urllib.request.urlopen(SKELETON_XML_URL, timeout=30).read().decode()
     xml_v2 = re.sub(r"<version>[^<]+</version>", "<version>100.0.0</version>", xml, count=1)
@@ -558,13 +551,7 @@ def test_k8s_update_preserves_deploy_options():
         f"#808 regression: user-provided TEST_ENV_2 lost after update; env_map={env_map}"
     )
 
-    cleanup_code = (
-        'require "lib/base.php";'
-        'OCP\\Server::get(OCP\\App\\IAppManager::class)->loadApp("app_api");'
-        '$svc = OCP\\Server::get(OCA\\AppAPI\\Service\\ExAppDeployOptionsService::class);'
-        '$svc->removeExAppDeployOptions("zz_fake_second_app");'
-    )
-    run(["php", "-r", cleanup_code], stdout=PIPE, stderr=PIPE)
+    run(["php", helper, "remove", "zz_fake_second_app"], stdout=PIPE, stderr=PIPE)
 
     print("OK")