Skip to content

Commit d180cc8

Browse files
committed
removed dependency on Debugger::tryError()
1 parent 0eebf15 commit d180cc8

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

src/Mail/SendmailMailer.php

+6-6
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ public function send(Message $mail)
4040

4141
$parts = explode(Message::EOL . Message::EOL, $tmp->generateMessage(), 2);
4242

43-
Nette\Diagnostics\Debugger::tryError();
4443
$args = array(
4544
str_replace(Message::EOL, PHP_EOL, $mail->getEncodedHeader('To')),
4645
str_replace(Message::EOL, PHP_EOL, $mail->getEncodedHeader('Subject')),
@@ -50,12 +49,13 @@ public function send(Message $mail)
5049
if ($this->commandArgs) {
5150
$args[] = (string) $this->commandArgs;
5251
}
52+
set_error_handler(function($severity, $message) {
53+
restore_error_handler();
54+
throw new Nette\InvalidStateException("mail(): $message");
55+
});
5356
$res = call_user_func_array('mail', $args);
54-
55-
if (Nette\Diagnostics\Debugger::catchError($e)) {
56-
throw new Nette\InvalidStateException('mail(): ' . $e->getMessage(), 0, $e);
57-
58-
} elseif (!$res) {
57+
restore_error_handler();
58+
if (!$res) {
5959
throw new Nette\InvalidStateException('Unable to send email.');
6060
}
6161
}

0 commit comments

Comments
 (0)