Update CVarDumper::dumpAsString() for PHP 8.3

marcovtwout · marcovtwout · commit 64d827d9b9d2 · 2024-09-18T10:29:10.000+02:00
Taken from #4562
diff --git a/framework/utils/CVarDumper.php b/framework/utils/CVarDumper.php
@@ -60,7 +60,7 @@ public static function dumpAsString($var,$depth=10,$highlight=false)
 		if($highlight)
 		{
 			$result=highlight_string("<?php\n".self::$_output,true);
-			self::$_output=preg_replace('/&lt;\\?php<br \\/>/','',$result,1);
+			self::$_output=preg_replace('/&lt;\\?php(<br \\/>|\\n)/','',$result,1);
 		}
 		return self::$_output;
 	}

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ public static function dumpAsString($var,$depth=10,$highlight=false)`
`60`	`60`	`if($highlight)`
`61`	`61`	`{`
`62`	`62`	`$result=highlight_string("<?php\n".self::$_output,true);`
`63`		`- self::$_output=preg_replace('/<\\?php<br \\/>/','',$result,1);`
	`63`	`+ self::$_output=preg_replace('/<\\?php(<br \\/>\|\\n)/','',$result,1);`
`64`	`64`	`}`
`65`	`65`	`return self::$_output;`
`66`	`66`	`}`