[TEST] Regex to detect "stashed" values is not useful, throws false-positives

polyfractal · polyfractal · commit 7ff9b20fff72 · 2016-09-16T16:12:35.000-04:00
diff --git a/tests/Elasticsearch/Tests/YamlRunnerTest.php b/tests/Elasticsearch/Tests/YamlRunnerTest.php
@@ -651,12 +651,10 @@ private function replaceWithContext($data, $context)
             return $data;
         }
 
-        if (is_string($data) && preg_match('/\$.+?$/', $data)) {
-            if (!array_key_exists($data, $context)) {
-                static::fail(sprintf('Cannot find variable %s in context', $data));
+        if (is_string($data)) {
+            if (array_key_exists($data, $context)) {
+                return $context[$data];
             }
-
-            return $context[$data];
         }
 
         if (!is_array($data) && !$data instanceof \stdClass) {

Original file line number	Diff line number	Diff line change
`@@ -651,12 +651,10 @@ private function replaceWithContext($data, $context)`
`651`	`651`	`return $data;`
`652`	`652`	`}`
`653`	`653`
`654`		`- if (is_string($data) && preg_match('/\$.+?$/', $data)) {`
`655`		`- if (!array_key_exists($data, $context)) {`
`656`		`- static::fail(sprintf('Cannot find variable %s in context', $data));`
	`654`	`+ if (is_string($data)) {`
	`655`	`+ if (array_key_exists($data, $context)) {`
	`656`	`+ return $context[$data];`
`657`	`657`	`}`
`658`		`-`
`659`		`- return $context[$data];`
`660`	`658`	`}`
`661`	`659`
`662`	`660`	`if (!is_array($data) && !$data instanceof \stdClass) {`