Merge pull request #25444 from nextcloud/bug/25415/move-generic-error…

…s-to-end Check for generic errors at last.
nextcloud · Feb 2, 2021 · ad2033e · ad2033e
2 parents 392dc8b + fe37820
commit ad2033e
Showing 1 changed file with 13 additions and 13 deletions.
diff --git a/lib/private/DB/Exceptions/DbalException.php b/lib/private/DB/Exceptions/DbalException.php
@@ -75,19 +75,6 @@ public static function wrap(\Doctrine\DBAL\Exception $original, string $message
 	}
 
 	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 @@ public function getReason(): ?int {
 			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;
 	}
 }