[TDannhauer]

Summary

• Horde_ActiveSync_Driver_Base::changeMessage() may now return ['error' => <Sync status>] in addition to a stat array or false.
• Horde_ActiveSync_Connector_Importer::importMessageChange() propagates that status into the per-item failure list instead of always reporting Status 5.

Part of horde/turba#73 (follow-up to #110, which stopped the same failure from aborting the whole Sync request).

Motivation

When a backend cannot store a client change because the data is invalid (a contact field over its configured length, for example), the importer reported Status 5 (server error). Clients treat Status 5 as transient and resend the item on every Sync. Status 6 (STATUS_INVALID) tells the client to drop the change — but the driver API had no way to say which one applies.

Changes

• lib/Horde/ActiveSync/Driver/Base.php: changeMessage() docblock documents the return contract — stat array on success, false for a server error (retryable, Status 5), ['error' => STATUS_*] for a backend-chosen status (STATUS_INVALID for rejected data).
• lib/Horde/ActiveSync/Connector/Importer.php
  • main path: if (!$stat || !empty($stat['error'])) → status from $stat['error'], default STATUS_SERVERERROR; log line includes the status; return [0 => $id ?: false, 'error' => $status] as before.
  • task duplicate-addition path: && empty($stat['error']) so an error array is not mistaken for a stat array.
• doc/architecture.md: one paragraph on the per-item status in the importer section.
• test/unit/Horde/ActiveSync/Connector/ImporterChangeStatusTest.php (new, 4 tests): false → STATUS_SERVERERROR; ['error' => STATUS_INVALID] → STATUS_INVALID for ADD and MODIFY; stat array → success and change map updated.

Compatibility

Existing drivers that return a stat array or false are unaffected. Request/Sync.php already encodes importfailures[$id] per item, so no change there.

Dependencies

• fix(core): report rejected client data as ActiveSync Status 6 Core#248 makes Horde_Core_ActiveSync_Driver return STATUS_INVALID for Horde\Exception\InvalidDataThrowable; merge this PR first (or together).

Test plan

• ImporterChangeStatusTest (4 tests); test/unit/Horde/ActiveSync/Connector 36 tests OK
• Full unit suite: only the pre-existing AppointmentTest / FindRequestTest / Rfc822Test failures (reproduced on pristine FRAMEWORK_6_0), nothing new
• Device test with fix(turba): enforce attribute constraints on every write path turba#74 and fix(core): report rejected client data as ActiveSync Status 6 Core#248: contact with an over-long ZIP → Status 6 for that item, device stops resending

[github-actions]

🔍 CI Results

Overall: ❌ 12/12 lanes failed

TL;DR: ❌ Quality issues: PHP-CS-Fixer: 47 files.

Summary by PHP Version

PHP	dev	stable
8.1	❌	❌
8.2	❌	❌
8.3	❌	❌
8.4	❌	❌
8.5	❌	❌
8.6	❌	❌

Quality Metrics

• PHPUnit: did not run (12 lanes exited non-zero with no test output) ❌
• PHPStan: No errors found ✅ — 8 advisories at level 2
• PHP-CS-Fixer: 47 unique files with issues (of 233 checked) ⚠️

❌ Failed Lanes

php8.1-dev

• PHPUnit: 0 failures, 0 errors

php8.1-stable

• PHPUnit: 0 failures, 0 errors

php8.2-dev

• PHPUnit: 0 failures, 0 errors

php8.2-stable

• PHPUnit: 0 failures, 0 errors

php8.3-dev

• PHPUnit: 0 failures, 0 errors

php8.3-stable

• PHPUnit: 0 failures, 0 errors

php8.4-dev

• PHPUnit: 0 failures, 0 errors
• PHP-CS-Fixer: 47 files with issues

php8.4-stable

• PHPUnit: 0 failures, 0 errors

php8.5-dev

• PHPUnit: 0 failures, 0 errors

php8.5-stable

• PHPUnit: 0 failures, 0 errors

php8.6-dev

• PHPUnit: 0 failures, 0 errors

php8.6-stable

• PHPUnit: 0 failures, 0 errors

---

CI powered by horde-components • View full results