Merge branch '9.6' into 10.5

sebastianbergmann · sebastianbergmann · commit 8a4600549028 · 2024-03-09T18:36:12.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
