Release: merge development into beta

.github/workflows/code-quality.yml

@@ -397,3 +397,14 @@ jobs:
       # construction — <= v1.4.0 passed over it (permanently green) and v1.5.0
       # refused with exit 99 (permanently red). The scope is now
       # `github.event.before...HEAD`, what the push actually changed.
+      # ── Cost controls (see ConductionNL/.github#596, #599) ───────────────
+      # Run PHPUnit and Playwright only when the diff could change their
+      # verdict. Fails safe TOWARDS running: an unreadable diff, a force-push,
+      # a branch creation or a dispatch all run everything, and a filtered
+      # skip is a declared state in the Quality Report, not a missing one.
+      enable-path-filtering: true
+      # PR-time PHPUnit runs the primary PHP against the newest declared
+      # Nextcloud; the full matrix still runs on every push to a default
+      # branch and on the release PR into beta. Breadth moves from
+      # per-commit to per-merge, it is not dropped.
+      reduce-pr-matrix: true

appinfo/info.xml

@@ -64,7 +64,7 @@ Gratis en open source onder de EUPL-1.2 licentie.
 		which quoted the grep command in order to WARN about the problem —
 		made it read ")[^". The warning reproduced the bug it described.
 	-->
-	<version>1.2.0</version>
+	<version>1.2.2-unstable.20260910104940</version>
 	<licence>EUPL-1.2</licence>
 	<author mail="info@conduction.nl" homepage="https://www.conduction.nl/">Conduction</author>
 	<namespace>Thematiq</namespace>

composer.json

@@ -40,10 +40,10 @@
         "phpcs": "./vendor/bin/phpcs --standard=phpcs.xml",
         "phpcs:fix": "./vendor/bin/phpcbf --standard=phpcs.xml",
         "phpcs:output": "./vendor/bin/phpcs --standard=phpcs.xml --report=json lib/ 2>/dev/null | tail -1 > phpcs-output.json",
-        "phpmd": "E=0; ./vendor/bin/phpmd lib text phpmd.xml || E=$?; ./vendor/bin/phpmd lib text vendor/conduction/hydra-gates/quality-config/phpmd-unusedparams.xml || E=$?; exit $E",
+        "phpmd": "E=0; php -d memory_limit=2G ./vendor/bin/phpmd lib text phpmd.xml || E=$?; php -d memory_limit=2G ./vendor/bin/phpmd lib text vendor/conduction/hydra-gates/quality-config/phpmd-unusedparams.xml || E=$?; exit $E",
         "phpmetrics": "./vendor/bin/phpmetrics --report-html=phpmetrics lib/",
         "phpmetrics:violations": "./vendor/bin/phpmetrics --violations-xml=phpmetrics/violations.xml lib/",
-        "psalm": "./vendor/bin/psalm --threads=1 --no-cache",
+        "psalm": "./vendor/bin/psalm --threads=1 --no-cache --memory-limit=2G",
         "phpstan": "./vendor/bin/phpstan analyse --memory-limit=1G",
         "test:unit": "if [ ! -f vendor/bin/phpunit ]; then echo 'SKIPPED: phpunit not installed - run composer install'; elif [ ! -f ../../lib/base.php ]; then echo 'SKIPPED: the unit suite DID NOT RUN - it needs a Nextcloud server tree (../../lib/base.php not found).'; echo '  Verbatim failure in a bare checkout (measured 2026-08-04, PHP 8.4.22):'; echo '    Interface \"OCP\\Files\\AppData\\IAppDataFactory\" not found'; echo '    at tests/Unit/Controller/SettingsControllerAuditTest.php:40 -- phpunit exits 255'; echo '  A 255 is an ABORT, not a test verdict: the suite type-hints OCP interfaces that'; echo '  only a Nextcloud server checkout provides. Do NOT \"fix\" this by deleting the'; echo '  guard - that trades a documented skip for a crash that still runs zero tests.'; echo '  Measured with a server tree present: a failing suite exits 1 and a passing one'; echo '  exits 0, so this guard does not weaken a real run. Run from inside a Nextcloud'; echo '  checkout, or rely on the CI PHPUnit job, for a real test verdict.'; else ./vendor/bin/phpunit --colors=always --no-coverage; fi",
         "test:all": "if [ ! -f vendor/bin/phpunit ]; then echo 'SKIPPED: phpunit not installed - run composer install'; elif [ ! -f ../../lib/base.php ]; then echo 'SKIPPED: the unit suite DID NOT RUN - it needs a Nextcloud server tree (../../lib/base.php not found).'; echo '  Verbatim failure in a bare checkout (measured 2026-08-04, PHP 8.4.22):'; echo '    Interface \"OCP\\Files\\AppData\\IAppDataFactory\" not found'; echo '    at tests/Unit/Controller/SettingsControllerAuditTest.php:40 -- phpunit exits 255'; echo '  A 255 is an ABORT, not a test verdict: the suite type-hints OCP interfaces that'; echo '  only a Nextcloud server checkout provides. Do NOT \"fix\" this by deleting the'; echo '  guard - that trades a documented skip for a crash that still runs zero tests.'; echo '  Measured with a server tree present: a failing suite exits 1 and a passing one'; echo '  exits 0, so this guard does not weaken a real run. Run from inside a Nextcloud'; echo '  checkout, or rely on the CI PHPUnit job, for a real test verdict.'; else ./vendor/bin/phpunit --colors=always --no-coverage; fi",

lib/Mail/NLDesignEMailTemplate.php

@@ -69,6 +69,7 @@ class NLDesignEMailTemplate extends EMailTemplate {
 	 */
 	protected function getEmailThemingService(): ?EmailThemingService {
 		try {
+			// phpcs:ignore CustomSniffs.Nextcloud.NoServiceLocator.GlobalContainerLookup -- Not a DI-built class: the server's Mailer::makeTemplate() constructs this template with a fixed argument list, so there is no constructor to inject a container into.
 			$service = \OCP\Server::get(EmailThemingService::class);
 			if ($service instanceof EmailThemingService === false) {
 				return null;