Skip to content

Refactor exception handling in ActiveSyncBackend #76

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TDannhauer merged 2 commits into from
Apr 1, 2026
Merged

Refactor exception handling in ActiveSyncBackend #76

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9a7c6dd
Refactor exception handling in ActiveSyncBackend
TDannhauer Mar 31, 2026
c1b0e25
Apply suggestion from @ralflang
TDannhauer Apr 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion lib/Horde/Core/Factory/ActiveSyncBackend.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?php

use Horde\Http\ServerRequest;
use Horde\Injector\NotFoundException as InjectorNotFoundException;

/**
* @category Horde
Expand All @@ -15,7 +16,13 @@ public function create(Horde_Injector $injector)
// Get PSR-7 ServerRequest from injector
try {
$serverRequest = $injector->get(ServerRequest::class);
} catch (Horde_Exception_NotFound $e) {
} catch (Horde_Exception_NotFound | InjectorNotFoundException $e) {
// Injector throws Horde\Injector\NotFoundException when ServerRequest is
// unbound; legacy code threw Horde_Exception_NotFound. Both must use the
// superglobal fallback (PHP 7.4: no union catch).
if (!$e instanceof Horde_Exception_NotFound && !$e instanceof InjectorNotFoundException) {
throw $e;
}
// Fallback: Create from PHP superglobals
$serverRequest = new ServerRequest(
$_SERVER['REQUEST_METHOD'] ?? 'GET',
Expand Down
Loading