Merge branch '8.5' into 9.6

sebastianbergmann · sebastianbergmann · commit ecd0f087af1a · 2024-03-09T18:36:08.000+01:00
diff --git a/.editorconfig b/.editorconfig
@@ -12,3 +12,6 @@ indent_size = 2
 
 [tests/_files/*_result_cache.txt]
 insert_final_newline = false
+
+[*.phpt]
+trim_trailing_whitespace = false
