sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #25444 from nextcloud/bug/25415/move-generic-errors-to-end 

Check for generic errors at last.
pull/25446/head
Christoph Wurst 2021-02-02 18:59:43 +07:00 committed by GitHub
parent 392dc8b8fa fe378200fa
commit ad2033ef1d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
lib/private/DB/Exceptions/DbalException.php
Unescape Escape View File

@ -75,19 +75,6 @@ class DbalException extends Exception {
}
public function getReason(): ?int {
/**
* Generic errors
*/
if ($this->original instanceof ConnectionException) {
return parent::REASON_CONNECTION_LOST;
}
if ($this->original instanceof DriverException) {
return parent::REASON_DRIVER;
}
if ($this->original instanceof InvalidArgumentException) {
return parent::REASON_INVALID_ARGUMENT;
}
/**
* Constraint errors
*/
@ -131,6 +118,19 @@ class DbalException extends Exception {
return parent::REASON_SERVER;
}
/**
* Generic errors
*/
if ($this->original instanceof ConnectionException) {
return parent::REASON_CONNECTION_LOST;
}
if ($this->original instanceof InvalidArgumentException) {
return parent::REASON_INVALID_ARGUMENT;
}
if ($this->original instanceof DriverException) {
return parent::REASON_DRIVER;
}
return null;
}
}