@@ -33,7 +33,7 @@ discard block |
||
33 | 33 | * |
34 | 34 | * @param string $key The entry to acces |
35 | 35 | */ |
36 | - public function __construct($class_type_or_instance=null) |
|
36 | + public function __construct($class_type_or_instance = null) |
|
37 | 37 | { |
38 | 38 | if ($class_type_or_instance) { |
39 | 39 | $this->expectedTarget = $class_type_or_instance; |
@@ -102,7 +102,7 @@ discard block |
||
102 | 102 | foreach ($this->stack as $i => $call) { |
103 | 103 | if (isset($call['method'])) { |
104 | 104 | $string .= '->'; |
105 | - $string .= $call['method'].'('; |
|
105 | + $string .= $call['method'] . '('; |
|
106 | 106 | $string .= implode(', ', array_map(function($argument) { |
107 | 107 | return var_export($argument, true); |
108 | 108 | }, $call['arguments'])); |
@@ -134,12 +134,12 @@ discard block |
||
134 | 134 | } |
135 | 135 | elseif (is_string($this->expectedTarget)) { |
136 | 136 | if (class_exists($this->expectedTarget)) { |
137 | - if (! $target instanceof $this->expectedTarget) { |
|
137 | + if (!$target instanceof $this->expectedTarget) { |
|
138 | 138 | throw new BadTargetClassException($this, $this->expectedTarget, $target); |
139 | 139 | } |
140 | 140 | } |
141 | 141 | elseif (interface_exists($this->expectedTarget)) { |
142 | - if (! $target instanceof $this->expectedTarget) { |
|
142 | + if (!$target instanceof $this->expectedTarget) { |
|
143 | 143 | throw new BadTargetInterfaceException($this, $this->expectedTarget, $target); |
144 | 144 | } |
145 | 145 | } |
@@ -233,7 +233,7 @@ discard block |
||
233 | 233 | * @param mixed $target The target to apply the callchain on |
234 | 234 | * @return mixde The value returned once the call chain is called uppon $target |
235 | 235 | */ |
236 | - public function __invoke($target=null) |
|
236 | + public function __invoke($target = null) |
|
237 | 237 | { |
238 | 238 | $out = $this->checkTarget($target); |
239 | 239 | |
@@ -249,13 +249,13 @@ discard block |
||
249 | 249 | ); |
250 | 250 | } |
251 | 251 | |
252 | - if (! $is_called && is_callable($call['method'])) { |
|
252 | + if (!$is_called && is_callable($call['method'])) { |
|
253 | 253 | $arguments = $this->prepareArgs($call['arguments'], $out); |
254 | 254 | $out = call_user_func_array($call['method'], $arguments); |
255 | 255 | $is_called = true; |
256 | 256 | } |
257 | 257 | |
258 | - if (! $is_called) { |
|
258 | + if (!$is_called) { |
|
259 | 259 | throw new \BadMethodCallException( |
260 | 260 | $call['method'] . "() is neither a method of " . get_class($out) |
261 | 261 | . " nor a function" |
@@ -263,7 +263,7 @@ discard block |
||
263 | 263 | } |
264 | 264 | } |
265 | 265 | else { |
266 | - $out = $out[ $call['entry'] ]; |
|
266 | + $out = $out[$call['entry']]; |
|
267 | 267 | } |
268 | 268 | } |
269 | 269 | catch (\Exception $e) { |
@@ -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 | } |