@@ -93,8 +93,7 @@ discard block |
||
| 93 | 93 | $string = '(new ' . get_called_class(); |
| 94 | 94 | if (is_string($this->expectedTarget)) { |
| 95 | 95 | $string .= '(' . var_export($this->expectedTarget, true) . ')'; |
| 96 | - } |
|
| 97 | - elseif (is_object($this->expectedTarget)) { |
|
| 96 | + } elseif (is_object($this->expectedTarget)) { |
|
| 98 | 97 | $string .= '( ' . get_class($this->expectedTarget) . '#' . spl_object_id($this->expectedTarget) . ' )'; |
| 99 | 98 | } |
| 100 | 99 | $string .= ')'; |
@@ -107,8 +106,7 @@ discard block |
||
| 107 | 106 | return var_export($argument, true); |
| 108 | 107 | }, $call['arguments'])); |
| 109 | 108 | $string .= ')'; |
| 110 | - } |
|
| 111 | - else { |
|
| 109 | + } else { |
|
| 112 | 110 | $string .= '[' . var_export($call['entry'], true) . ']'; |
| 113 | 111 | } |
| 114 | 112 | } |
@@ -131,30 +129,25 @@ discard block |
||
| 131 | 129 | } |
| 132 | 130 | |
| 133 | 131 | $out = $this->expectedTarget; |
| 134 | - } |
|
| 135 | - elseif (is_string($this->expectedTarget)) { |
|
| 132 | + } elseif (is_string($this->expectedTarget)) { |
|
| 136 | 133 | if (class_exists($this->expectedTarget)) { |
| 137 | 134 | if (! $target instanceof $this->expectedTarget) { |
| 138 | 135 | throw new BadTargetClassException($this, $this->expectedTarget, $target); |
| 139 | 136 | } |
| 140 | - } |
|
| 141 | - elseif (interface_exists($this->expectedTarget)) { |
|
| 137 | + } elseif (interface_exists($this->expectedTarget)) { |
|
| 142 | 138 | if (! $target instanceof $this->expectedTarget) { |
| 143 | 139 | throw new BadTargetInterfaceException($this, $this->expectedTarget, $target); |
| 144 | 140 | } |
| 145 | - } |
|
| 146 | - elseif (type_exists($this->expectedTarget)) { |
|
| 141 | + } elseif (type_exists($this->expectedTarget)) { |
|
| 147 | 142 | if (gettype($target) != $this->expectedTarget) { |
| 148 | 143 | throw new BadTargetTypeException($this, $this->expectedTarget, $target); |
| 149 | 144 | } |
| 150 | - } |
|
| 151 | - else { |
|
| 145 | + } else { |
|
| 152 | 146 | throw new UndefinedTargetClassException($this, $this->expectedTarget); |
| 153 | 147 | } |
| 154 | 148 | |
| 155 | 149 | $out = $target; |
| 156 | - } |
|
| 157 | - else { |
|
| 150 | + } else { |
|
| 158 | 151 | $out = $target; |
| 159 | 152 | } |
| 160 | 153 | |
@@ -182,16 +175,14 @@ discard block |
||
| 182 | 175 | [$current_chained_subject, $method_name], |
| 183 | 176 | $arguments |
| 184 | 177 | ); |
| 185 | - } |
|
| 186 | - catch (\BadMethodCallException $e) { |
|
| 178 | + } catch (\BadMethodCallException $e) { |
|
| 187 | 179 | if ($this->exceptionTrownFromMagicCall( |
| 188 | 180 | $e->getTrace(), |
| 189 | 181 | $current_chained_subject, |
| 190 | 182 | $method_name |
| 191 | 183 | )) { |
| 192 | 184 | $is_called = false; |
| 193 | - } |
|
| 194 | - else { |
|
| 185 | + } else { |
|
| 195 | 186 | throw $e; |
| 196 | 187 | } |
| 197 | 188 | } |
@@ -261,12 +252,10 @@ discard block |
||
| 261 | 252 | . " nor a function" |
| 262 | 253 | ); |
| 263 | 254 | } |
| 264 | - } |
|
| 265 | - else { |
|
| 255 | + } else { |
|
| 266 | 256 | $out = $out[ $call['entry'] ]; |
| 267 | 257 | } |
| 268 | - } |
|
| 269 | - catch (\Exception $e) { |
|
| 258 | + } catch (\Exception $e) { |
|
| 270 | 259 | // Throw $e with the good stack (usage exception) |
| 271 | 260 | throw $e; |
| 272 | 261 | } |