Fixed test in php8.4

laruence · Feb 24, 2025 · 056aa40 · 056aa40
1 parent 40e7bf3
commit 056aa40
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 6 deletions.
diff --git a/tests/038.phpt b/tests/038.phpt
@@ -1,7 +1,10 @@
 --TEST--
 Check for Yaf_View_Simple error message outputing
 --SKIPIF--
-<?php if (!extension_loaded("yaf")) print "skip"; ?>
+<?php
+if (!extension_loaded("yaf")) die("skip");
+if (version_compare(PHP_VERSION, "8.4", "ge")) print "skip only for <= 8.3";
+?>
 --INI--
 yaf.library="/php/global/dir"
 log_errors=0
@@ -34,4 +37,4 @@ require "build.inc";
 shutdown();
 ?>
 --EXPECTF--
-Parse error: syntax error, unexpected %s}%c in %sfoo.phtml on line %d
+Parse error: syntax error, unexpected %s}%c in %sfoo.phtml on line %d
diff --git a/tests/039.phpt b/tests/039.phpt
@@ -1,7 +1,9 @@
 --TEST--
 Check for Yaf_View_Simple recursive render error message outputing
 --SKIPIF--
-<?php if (!extension_loaded("yaf")) print "skip"; ?>
+<?php
+if (!extension_loaded("yaf")) die("skip");
+?>
 --INI--
 yaf.library="/php/global/dir"
 log_errors=0
@@ -35,7 +37,20 @@ HTML
 try {
 	echo $view->render($tpl, array('tpl' => $tpl2));
 } catch (Error $e) {
-	echo $e->getMessage();
+	$msg = $e->getMessage();
+	if (version_compare(PHP_VERSION, "8.4", "ge")) {
+		if (strcmp("syntax error, unexpected token \"{\"", $msg) == 0) {
+			echo "okey";
+        } else {
+			echo $msg;
+        }
+    } else {
+		if (strcmp("syntax error, unexpected token \"}\"", $msg) == 0) {
+			echo "okey";
+        } else {
+			echo $msg;
+		}
+	}
 }
 ?>
 --CLEAN--
@@ -44,5 +59,5 @@ try {
 require "build.inc"; 
 shutdown();
 ?>
---EXPECTF--
-syntax error, unexpected %s}%c
+--EXPECT--
+okey