Fixed issue with set in YAML specification + interpolation for PHP 8.2

elastic · Sep 28, 2023 · 8372de2 · 8372de2
1 parent fbf73de
commit 8372de2
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 6 deletions.
diff --git a/util/ActionTest.php b/util/ActionTest.php
@@ -175,12 +175,15 @@ private function transform_and_set(array $action): string
 
     private function set(array $action): string
     {
-        $key = key($action);
-        $this->variables[] = $action[$key];
-        return YamlTests::render(self::TEMPLATE_SET_VARIABLE, [
-            ':var'   => $action[$key],
-            ':value' => $this->convertResponseField($key)
-        ]);
+        $output = '';
+        foreach ($action as $key => $var) {
+            $this->variables[] = $var;
+            $output .= YamlTests::render(self::TEMPLATE_SET_VARIABLE, [
+                ':var'   => $var,
+                ':value' => $this->convertResponseField($key)
+            ]);
+        }
+        return $output;
     }
 
     private function warnings(array $action, array &$vars)

diff --git a/util/YamlTests.php b/util/YamlTests.php
@@ -291,6 +291,9 @@ public function build(): array
                     ]
                 );
             }
+            // Fix ${var} string interpolation deprecated for PHP 8.2
+            // @see https://php.watch/versions/8.2/$%7Bvar%7D-string-interpolation-deprecated
+            $test = $this->fixStringInterpolationInCurlyBracket($test);
             file_put_contents($testDirName . '/' . $testName . '.php', $test);
             try {
                 eval(substr($test, 5)); // remove <?php header
@@ -309,6 +312,16 @@ public function build(): array
         ];
     }
 
+    /**
+     * Convert ${var} in {$var} for PHP 8.2 deprecation notice
+     * 
+     * @see https://php.watch/versions/8.2/$%7Bvar%7D-string-interpolation-deprecated
+     */
+    private function fixStringInterpolationInCurlyBracket(string $code): string
+    {
+        return preg_replace('/\${([^}]+)}/', '{\$$1}', $code);
+    }
+
     private function extractTestNamespace(string $path)
     {
         $file = substr($path, strlen($this->testDir) + 1);