Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions .github/workflows/phpunit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
# do not stop on another job's failure
fail-fast: false
matrix:
php-versions: ['7.4', '8.0', '8.1']
php-versions: ['8.0', '8.1']
databases: ['sqlite']
server-versions: ['master']

Expand Down Expand Up @@ -73,7 +73,7 @@ jobs:
# do not stop on another job's failure
fail-fast: false
matrix:
php-versions: ['7.4']
php-versions: ['8.1']
databases: ['mysql']
server-versions: ['master']

Expand Down Expand Up @@ -138,7 +138,7 @@ jobs:
# do not stop on another job's failure
fail-fast: false
matrix:
php-versions: ['7.4']
php-versions: ['8.1']
databases: ['pgsql']
server-versions: ['master']

Expand Down Expand Up @@ -205,7 +205,7 @@ jobs:
# do not stop on another job's failure
fail-fast: false
matrix:
php-versions: ['7.4']
php-versions: ['8.1']
databases: ['oci']
server-versions: ['master']

Expand Down
3 changes: 1 addition & 2 deletions js/logreader-main.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion js/logreader-main.css.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion js/logreader-main.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/logreader-main.js.map

Large diffs are not rendered by default.

7 changes: 6 additions & 1 deletion src/ExceptionParser.js
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,12 @@ export class ExceptionParser {
`${' '.repeat(widestIndex + 2)}${trace.class || ''}${trace.type || ''}${trace.function}(${args.join(', ')})`;
}
).join('\n');
return message;

if (parsed.Previous) {
return message + "\n\nCaused by:\n\n" + this.format(parsed.Previous);
} else {
return message;
}
} else {
return parsed;
}
Expand Down
10 changes: 9 additions & 1 deletion src/Providers/LogFile.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,15 @@ export class LogFile extends LogProvider {
constructor (content: string, limit: number) {
super(limit);

this.cachedEntries = parseLog(content).reverse();
let id = 1;

this.cachedEntries = parseLog(content).map(entry => {
if (!entry.id) {
entry.id = id;
id++;
}
return entry;
}).reverse();
}

async loadEntries (offset: number, count: number = 50) {
Expand Down