|
@@ -87,14 +87,14 @@ discard block |
|
|
block discarded – undo |
|
87
|
87
|
$this->environment = $environment; |
|
88
|
88
|
} |
|
89
|
89
|
|
|
90
|
|
- private function getScenarioTags(){ |
|
|
90
|
+ private function getScenarioTags() { |
|
91
|
91
|
return $this->beforeScenarioSubscriber->getScenarioTags(); |
|
92
|
92
|
} |
|
93
|
93
|
|
|
94
|
94
|
private function replaceRecursively($placeholder, $replaced = array()) |
|
95
|
95
|
{ |
|
96
|
96
|
// if the current placeholder was already replaced before, this is a cyclic dependecy |
|
97
|
|
- if (in_array($placeholder, $replaced)){ |
|
|
97
|
+ if (in_array($placeholder, $replaced)) { |
|
98
|
98
|
$tree = implode('>', $replaced); |
|
99
|
99
|
throw new Exception("Cyclic placeholder dependecy detected. Trying to replace $placeholder again when already replaced: $tree"); |
|
100
|
100
|
} |
|
@@ -116,13 +116,13 @@ discard block |
|
|
block discarded – undo |
|
116
|
116
|
|
|
117
|
117
|
|
|
118
|
118
|
// Then look in the placeholder files |
|
119
|
|
- if ($replacement === null && $configTag !== false ) { |
|
|
119
|
+ if ($replacement === null && $configTag !== false) { |
|
120
|
120
|
$section = PlaceholderUtils::getSectionKey($configTag); |
|
121
|
121
|
$placeholders = $this->getSectionPlaceholders($configKey, $section); |
|
122
|
122
|
$replacement = $this->recursiveReplacementSearch($keys, $placeholders); |
|
123
|
123
|
} |
|
124
|
124
|
|
|
125
|
|
- if ($replacement === null && $configTag !== false){ |
|
|
125
|
+ if ($replacement === null && $configTag !== false) { |
|
126
|
126
|
$configPath = $this->getFilePath($configKey); |
|
127
|
127
|
$treePosition = "$configPath>$section>placeholders"; |
|
128
|
128
|
throw new UndefinedPlaceholderException("No $placeholder replacement was defined on runtime or on $treePosition>$placeholder for variant $variant and environment $environment"); |