__toString handles Throwable errors

dg · dg · commit 0bd93d90bcf6 · 2015-11-24T15:21:36.000+01:00
diff --git a/src/Database/Table/ActiveRow.php b/src/Database/Table/ActiveRow.php
@@ -55,7 +55,10 @@ public function __toString()
 	{
 		try {
 			return (string) $this->getPrimary();
+		} catch (\Throwable $e) {
 		} catch (\Exception $e) {
+		}
+		if (isset($e)) {
 			if (func_num_args()) {
 				throw $e;
 			}

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,10 @@ public function __toString()`
`55`	`55`	`{`
`56`	`56`	`try {`
`57`	`57`	`return (string) $this->getPrimary();`
	`58`	`+ } catch (\Throwable $e) {`
`58`	`59`	`} catch (\Exception $e) {`
	`60`	`+ }`
	`61`	`+ if (isset($e)) {`
`59`	`62`	`if (func_num_args()) {`
`60`	`63`	`throw $e;`
`61`	`64`	`}`