@@ -113,8 +113,12 @@ discard block |
||
| 113 | 113 | try { |
| 114 | 114 | $values[] = $this->getValueFromArray($variable); |
| 115 | 115 | } catch(RuntimeException $e) { |
| 116 | - if ($this->throwException) throw new GherkinParamException(); |
|
| 117 | - if ($this->nullable) $values[] = null; |
|
| 116 | + if ($this->throwException) { |
|
| 117 | + throw new GherkinParamException(); |
|
| 118 | + } |
|
| 119 | + if ($this->nullable) { |
|
| 120 | + $values[] = null; |
|
| 121 | + } |
|
| 118 | 122 | } |
| 119 | 123 | } |
| 120 | 124 | // normal case |
@@ -122,13 +126,19 @@ discard block |
||
| 122 | 126 | try { |
| 123 | 127 | $values[] = Fixtures::get($variable); |
| 124 | 128 | } catch(RuntimeException $e) { |
| 125 | - if ($this->throwException) throw new GherkinParamException(); |
|
| 126 | - if ($this->nullable) $values[] = null; |
|
| 129 | + if ($this->throwException) { |
|
| 130 | + throw new GherkinParamException(); |
|
| 131 | + } |
|
| 132 | + if ($this->nullable) { |
|
| 133 | + $values[] = null; |
|
| 134 | + } |
|
| 127 | 135 | } |
| 128 | 136 | } |
| 129 | 137 | // if machting value return is not found (null) |
| 130 | 138 | if (is_null(end($values))) { |
| 131 | - if ($this->throwException) throw new GherkinParamException(); |
|
| 139 | + if ($this->throwException) { |
|
| 140 | + throw new GherkinParamException(); |
|
| 141 | + } |
|
| 132 | 142 | } |
| 133 | 143 | } |
| 134 | 144 | |
@@ -168,15 +178,23 @@ discard block |
||
| 168 | 178 | $replacement = $values[$i]; |
| 169 | 179 | if (is_array($replacement)) { |
| 170 | 180 | // case of replacement is an array (case of config param), ie param does not exists |
| 171 | - if ($this->throwException) throw new GherkinParamException(); |
|
| 172 | - if ($this->nullable) $param = null; |
|
| 181 | + if ($this->throwException) { |
|
| 182 | + throw new GherkinParamException(); |
|
| 183 | + } |
|
| 184 | + if ($this->nullable) { |
|
| 185 | + $param = null; |
|
| 186 | + } |
|
| 173 | 187 | break; |
| 174 | 188 | } |
| 175 | 189 | //TODO: replace str_replace by strtr (performance) |
| 176 | 190 | $param = str_replace($search, $replacement, $param); |
| 177 | 191 | } else { |
| 178 | - if ($this->throwException) throw new GherkinParamException(); |
|
| 179 | - if ($this->nullable) $param = null; |
|
| 192 | + if ($this->throwException) { |
|
| 193 | + throw new GherkinParamException(); |
|
| 194 | + } |
|
| 195 | + if ($this->nullable) { |
|
| 196 | + $param = null; |
|
| 197 | + } |
|
| 180 | 198 | } |
| 181 | 199 | } |
| 182 | 200 | return $param; |