Skip to content

Bump psalm to level 3 #1747

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
nickvergessen merged 12 commits into from
Dec 11, 2023
Merged

Bump psalm to level 3 #1747

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
8c7ee94
fix(OCP): Migrate to OCP\DB\Types
nickvergessen Dec 8, 2023
d8ecfab
fix(CI): Update scripts and fix versions
nickvergessen Dec 8, 2023
89f28d6
fix(CI): Remove unmaintained library
nickvergessen Dec 8, 2023
e2d06e2
fix(API): Move to public API for Authentication where possible
nickvergessen Dec 8, 2023
5479d70
fix(API): Use typed execute*() methods
nickvergessen Dec 8, 2023
cfaea0d
fix(listener): Help psalm understand that we always have a user
nickvergessen Dec 8, 2023
282391d
fix(docs): Fix returned notification list type
nickvergessen Dec 8, 2023
561d30c
fix(mail): Make sure the timezone is not empty
nickvergessen Dec 8, 2023
02b5140
fix(push): Fix some type checks
nickvergessen Dec 8, 2023
e33e5c3
fix(CI): Bump psalm error level to 3
nickvergessen Dec 8, 2023
d7571dc
fix(CI): Fix path to psalm config.xsd
nickvergessen Dec 8, 2023
91f911c
fix(tests): Handle JSON exceptions
nickvergessen Dec 8, 2023
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
Prev Previous commit
fix(tests): Handle JSON exceptions 
Signed-off-by: Joas Schilling <[email protected]>
  • Loading branch information
@nickvergessen
nickvergessen committed Dec 8, 2023
commit 91f911c5b2101b237b635a6cf9607b8dfa7762ac
12 changes: 10 additions & 2 deletions lib/Push.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -501,13 +501,21 @@ protected function sendNotificationsToProxies(): void {
$response = $client->post($proxyServer . '/notifications', $requestData);
$status = $response->getStatusCode();
$body = (string) $response->getBody();
$bodyData = json_decode($body, true, flags: JSON_THROW_ON_ERROR);
try {
$bodyData = json_decode($body, true);
} catch (\JsonException $e) {
$bodyData = null;
}
} catch (ClientException $e) {
// Server responded with 4xx (400 Bad Request mostlikely)
$response = $e->getResponse();
$status = $response->getStatusCode();
$body = $response->getBody()->getContents();
$bodyData = json_decode($body, true, flags: JSON_THROW_ON_ERROR);
try {
$bodyData = json_decode($body, true);
} catch (\JsonException $e) {
$bodyData = null;
}
} catch (ServerException $e) {
// Server responded with 5xx
$response = $e->getResponse();
Expand Down