Skip to content

Commit 2d1c50f

Browse files
authored
Merge pull request #3416 from kdambekalns/task/handle-non-int-error-codes
TASK: Handle non-integer error codes in throwabe FileStorage
2 parents 4175051 + 4542aff commit 2d1c50f

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

Neos.Flow/Classes/Log/ThrowableStorage/FileStorage.php

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -219,11 +219,16 @@ protected function renderErrorInfo(\Throwable $error, array $additionalData = []
219219
*/
220220
protected function getErrorLogMessage(\Throwable $error)
221221
{
222-
$errorCodeNumber = ($error->getCode() > 0) ? ' #' . $error->getCode() : '';
222+
// getCode() does not always return an integer, e.g. in PDOException it can be a string
223+
if (is_int($error->getCode()) && $error->getCode() > 0) {
224+
$errorCodeString = ' #' . $error->getCode();
225+
} else {
226+
$errorCodeString = ' [' . $error->getCode() . ']';
227+
}
223228
$backTrace = $error->getTrace();
224229
$line = isset($backTrace[0]['line']) ? ' in line ' . $backTrace[0]['line'] . ' of ' . $backTrace[0]['file'] : '';
225230

226-
return 'Exception' . $errorCodeNumber . $line . ': ' . $error->getMessage();
231+
return 'Exception' . $errorCodeString . $line . ': ' . $error->getMessage();
227232
}
228233

229234
/**

0 commit comments

Comments
 (0)