Skip to content

Commit 0f7e384

Browse files
committed
log 'error' if 'message' and 'msg' are not set
1 parent a16a8b2 commit 0f7e384

File tree

5 files changed

+22
-1
lines changed

5 files changed

+22
-1
lines changed

.github/workflows/test.yml

+6
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,12 @@ jobs:
1111
steps:
1212
- name: Checkout code
1313
uses: actions/checkout@v4
14+
15+
- name: Setup PHP
16+
uses: shivammathur/setup-php@v2
17+
with:
18+
php-version: 8.1
19+
1420
- name: Test
1521
run: |
1622
composer self-update && composer --version

Makefile

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
install:
2+
docker run --rm -v .:/data -w /data silintl/php8:8.1 composer install

composer.json

+6
Original file line numberDiff line numberDiff line change
@@ -38,5 +38,11 @@
3838
"scripts": {
3939
"test": "codecept run",
4040
"e2e": "php tests/sentry-fill"
41+
},
42+
"config": {
43+
"allow-plugins": {
44+
"php-http/discovery": false,
45+
"yiisoft/yii2-composer": false
46+
}
4147
}
4248
}

src/SentryTarget.php

+6-1
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,12 @@ public function export()
126126
$data['message'] = (string)$text['message'];
127127
unset($text['message']);
128128
}
129-
if (!isset($text['message'])) {
129+
if (isset($text['error'])) {
130+
$data['message'] = (string)$text['error'];
131+
unset($text['message']);
132+
}
133+
// if none of the above have text, stringify the object
134+
if (!isset($data['message'])) {
130135
$data['message'] = json_encode($text);
131136
}
132137

tests/unit/SentryTargetTest.php

+2
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,8 @@ public function messageDataProvider()
7979

8080
yield [$msg, ['msg' => $msg]];
8181

82+
yield [$msg, ['error' => $msg]];
83+
8284
yield [$msg, ['message' => $msg]];
8385

8486
yield [$msg, ['message' => $msg, 'msg' => 'Ignored']];

0 commit comments

Comments
 (0)