@@ -84,12 +84,10 @@ discard block |
||
| 84 | 84 | |
| 85 | 85 | try { |
| 86 | 86 | $conn->disconnect(); |
| 87 | - } |
|
| 88 | - catch (\Exception $e) |
|
| 87 | + } catch (\Exception $e) |
|
| 89 | 88 | { |
| 90 | 89 | $errorObject = ($e instanceof \LogicException); |
| 91 | - } |
|
| 92 | - finally |
|
| 90 | + } finally |
|
| 93 | 91 | { |
| 94 | 92 | $this->assertNotTrue($conn->isConnected()); |
| 95 | 93 | $this->assertTrue($errorObject, $e->getMessage()); |
@@ -125,12 +123,10 @@ discard block |
||
| 125 | 123 | |
| 126 | 124 | try { |
| 127 | 125 | $conn->reconnect(); |
| 128 | - } |
|
| 129 | - catch (\Exception $e) |
|
| 126 | + } catch (\Exception $e) |
|
| 130 | 127 | { |
| 131 | 128 | $errorObject = ($e instanceof \LogicException); |
| 132 | - } |
|
| 133 | - finally |
|
| 129 | + } finally |
|
| 134 | 130 | { |
| 135 | 131 | $this->assertTrue($errorObject, $e->getMessage()); |
| 136 | 132 | $this->assertNotTrue($conn->isConnected()); |
@@ -155,13 +151,11 @@ discard block |
||
| 155 | 151 | |
| 156 | 152 | try { |
| 157 | 153 | $mysqliObject = $conn->connect(); |
| 158 | - } |
|
| 159 | - catch (\Exception $e) |
|
| 154 | + } catch (\Exception $e) |
|
| 160 | 155 | { |
| 161 | 156 | $errorObject = ($e instanceof ConnectionException); |
| 162 | 157 | $message = $e->getMessage(); |
| 163 | - } |
|
| 164 | - finally |
|
| 158 | + } finally |
|
| 165 | 159 | { |
| 166 | 160 | $this->assertTrue($errorObject, $message); |
| 167 | 161 | $this->assertNotTrue($conn->isConnected()); |
@@ -241,13 +235,11 @@ discard block |
||
| 241 | 235 | { |
| 242 | 236 | $sql = "INSERT INTO MYTABLE (DESCRIPTION, WRONG) VALUES ('Hello world!')"; |
| 243 | 237 | $result = $conn->execute($sql); |
| 244 | - } |
|
| 245 | - catch (\Exception $e) |
|
| 238 | + } catch (\Exception $e) |
|
| 246 | 239 | { |
| 247 | 240 | $errorObject = ($e instanceof InvalidQueryException); |
| 248 | 241 | $message = $e->getMessage(); |
| 249 | - } |
|
| 250 | - finally |
|
| 242 | + } finally |
|
| 251 | 243 | { |
| 252 | 244 | $this->assertTrue($errorObject, $message); |
| 253 | 245 | } |
@@ -516,8 +508,7 @@ discard block |
||
| 516 | 508 | |
| 517 | 509 | $sql = "INSERT INTO MYTABLE (DESCRIPTION, WRONG) VALUES ('TRANS_SHORTCUT_2')"; |
| 518 | 510 | $result = $conn->execute($sql); |
| 519 | - } |
|
| 520 | - catch (InvalidQueryException $e) |
|
| 511 | + } catch (InvalidQueryException $e) |
|
| 521 | 512 | { |
| 522 | 513 | $message = $e->getMessage(); |
| 523 | 514 | #·not necessary! |