Merge pull request #25444 from nextcloud/bug/25415/move-generic-errors-to-end
Check for generic errors at last.
This commit is contained in:
commit
ad2033ef1d
|
@ -75,19 +75,6 @@ class DbalException extends Exception {
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getReason(): ?int {
|
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
|
* Constraint errors
|
||||||
*/
|
*/
|
||||||
|
@ -131,6 +118,19 @@ class DbalException extends Exception {
|
||||||
return parent::REASON_SERVER;
|
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;
|
return null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue