|
@@ -114,7 +114,7 @@ discard block |
|
|
block discarded – undo |
|
114
|
114
|
foreach ($data as $k => $val) { |
|
115
|
115
|
if (!is_array($val)) { |
|
116
|
116
|
// Find the self referenced placeholders and fill them. |
|
117
|
|
- $data[$k] = preg_replace_callback('/@\[([a-zA-Z0-9_.-]*?)]/', function ($matches) { |
|
|
117
|
+ $data[$k] = preg_replace_callback('/@\[([a-zA-Z0-9_.-]*?)]/', function($matches) { |
|
118
|
118
|
// Does this key exist, is so fill this match, if not, just return the match intact. |
|
119
|
119
|
return $this->get($matches[1]) ?: $matches[0]; |
|
120
|
120
|
}, $val); |
|
@@ -125,7 +125,7 @@ discard block |
|
|
block discarded – undo |
|
125
|
125
|
} |
|
126
|
126
|
|
|
127
|
127
|
// Find the environment variable placeholders and fill them. |
|
128
|
|
- $data[$k] = preg_replace_callback('/\$\[([a-zA-Z0-9_.-]*?)]/', static function ($matches) { |
|
|
128
|
+ $data[$k] = preg_replace_callback('/\$\[([a-zA-Z0-9_.-]*?)]/', static function($matches) { |
|
129
|
129
|
// If locally set environment variable (variable not set by a SAPI) found, replace with it's value. |
|
130
|
130
|
if (!empty(getenv($matches[1], true))) { |
|
131
|
131
|
// Try local only environment variables first (variable not set by a SAPI) |
|
@@ -146,7 +146,7 @@ discard block |
|
|
block discarded – undo |
|
146
|
146
|
// It's a string! |
|
147
|
147
|
// Certain recursive stuff, like @[SelfReferencedPlaceholder.@[SomeStuff.a]] is what triggers this part. |
|
148
|
148
|
// Find the self referenced placeholders and fill them. |
|
149
|
|
- $data = preg_replace_callback('/@\[([a-zA-Z0-9_.-]*?)]/', function ($matches) { |
|
|
149
|
+ $data = preg_replace_callback('/@\[([a-zA-Z0-9_.-]*?)]/', function($matches) { |
|
150
|
150
|
// Does this key exist, is so fill this match, if not, just return the match intact. |
|
151
|
151
|
$ret = $this->get($matches[1]) ?: $matches[0]; |
|
152
|
152
|
|